diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-30 20:29:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 20:29:19 +0000 |
| commit | 3a00419a137291f045f559eb9dbfcbb3edfa22ca (patch) | |
| tree | 2d97c621feb44ef6f2ce1823bcf8d63970833a66 /packages | |
| parent | 1998daf1ee43712c3c9798f13792e03780c09bf8 (diff) | |
| parent | bc3a5e946989701f05ea28d596f8710e011887be (diff) | |
| download | frameworks_base-3a00419a137291f045f559eb9dbfcbb3edfa22ca.zip frameworks_base-3a00419a137291f045f559eb9dbfcbb3edfa22ca.tar.gz frameworks_base-3a00419a137291f045f559eb9dbfcbb3edfa22ca.tar.bz2 | |
Merge "QuickSettings: Fix flash when expanding panel." into lmp-preview-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 2f36e0e..c8f185c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -72,6 +72,7 @@ public class NotificationPanelView extends PanelView implements */ private boolean mIntercepting; private boolean mQsExpanded; + private boolean mQsFullyExpanded; private boolean mKeyguardShowing; private float mInitialHeightOnTouch; private float mInitialTouchX; @@ -167,7 +168,9 @@ public class NotificationPanelView extends PanelView implements mQsMinExpansionHeight = mHeader.getCollapsedHeight() + mQsPeekHeight; mQsMaxExpansionHeight = mHeader.getExpandedHeight() + mQsContainer.getHeight(); if (mQsExpanded) { - setQsStackScrollerPadding(mQsMaxExpansionHeight); + if (mQsFullyExpanded) { + setQsStackScrollerPadding(mQsMaxExpansionHeight); + } } else { setQsExpansion(mQsMinExpansionHeight); positionClockAndNotifications(); @@ -524,6 +527,7 @@ public class NotificationPanelView extends PanelView implements private void setQsExpansion(float height) { height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight); + mQsFullyExpanded = height == mQsMaxExpansionHeight; if (height > mQsMinExpansionHeight && !mQsExpanded) { setQsExpanded(true); } else if (height <= mQsMinExpansionHeight && mQsExpanded) { |