diff options
| author | Selim Cinek <cinek@google.com> | 2014-10-10 18:49:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-10 18:49:12 +0000 |
| commit | 3e683b6a0f40e176ba9ffce652939ecef23b9dc2 (patch) | |
| tree | 239547f29e113ab520e53c7db9071e2ed127ab76 /packages | |
| parent | 1133e29f22252cc36102f41204c3de35779e49d2 (diff) | |
| parent | 6bb4a9b356bdb141e353a8115e100029bed3eb88 (diff) | |
| download | frameworks_base-3e683b6a0f40e176ba9ffce652939ecef23b9dc2.zip frameworks_base-3e683b6a0f40e176ba9ffce652939ecef23b9dc2.tar.gz frameworks_base-3e683b6a0f40e176ba9ffce652939ecef23b9dc2.tar.bz2 | |
Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 8 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index c612e4c..d8c99f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -774,6 +774,14 @@ public abstract class PanelView extends FrameLayout { requestLayout(); } + public void instantCollapse() { + abortAnimations(); + setExpandedFraction(0f); + if (mExpanding) { + notifyExpandingFinished(); + } + } + private void abortAnimations() { cancelPeek(); if (mHeightAnimator != null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 3b05ef1..9e3f0f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3746,7 +3746,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } private void instantCollapseNotificationPanel() { - mNotificationPanel.setExpandedFraction(0); + mNotificationPanel.instantCollapse(); } @Override |