Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QuickSettings: Fix flash when expanding panel." into lmp-preview-dev

Browse Source
This commit is contained in:
John Spurlock
2014-05-30 20:29:17 +00:00
committed by Android (Google) Code Review
parent 1998daf1ee bc3a5e9469
commit 3a00419a13
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -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) {