summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-05-05 23:53:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 23:54:04 +0000
commit1690ec8e72876459da198a7228c6591df321df64 (patch)
tree839b454c3f08339dc086ce83e31c8b1c2b22fdf0 /packages
parente9194b98a2098a1d94957e4723eaaf7399ecf3be (diff)
parent8d5727f6e93bec98f7de622583d0c2b70fa750b6 (diff)
downloadframeworks_base-1690ec8e72876459da198a7228c6591df321df64.zip
frameworks_base-1690ec8e72876459da198a7228c6591df321df64.tar.gz
frameworks_base-1690ec8e72876459da198a7228c6591df321df64.tar.bz2
Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index 202063a..de28ac7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -582,7 +582,7 @@ public class StackScrollAlgorithm {
return row.getIntrinsicHeight();
} else if (child instanceof ExpandableView) {
ExpandableView expandableView = (ExpandableView) child;
- return expandableView.getActualHeight();
+ return expandableView.getIntrinsicHeight();
}
return child == null? mCollapsedSize : child.getHeight();
}