diff options
| author | Selim Cinek <cinek@google.com> | 2014-10-09 17:48:05 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-10-09 17:48:05 -0700 |
| commit | 6bb4a9b356bdb141e353a8115e100029bed3eb88 (patch) | |
| tree | c857ff326406bf3e8ef8fe23e5f20a3dd4d5bafb /packages | |
| parent | 59d9723dd77108b83d4b0b16ca3fafdc6a66f64b (diff) | |
| download | frameworks_base-6bb4a9b356bdb141e353a8115e100029bed3eb88.zip frameworks_base-6bb4a9b356bdb141e353a8115e100029bed3eb88.tar.gz frameworks_base-6bb4a9b356bdb141e353a8115e100029bed3eb88.tar.bz2 | |
Fixed a bug where the panel got into a wrong state
Bug: 17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
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 d0f73b1..a55ce15 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3733,7 +3733,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } private void instantCollapseNotificationPanel() { - mNotificationPanel.setExpandedFraction(0); + mNotificationPanel.instantCollapse(); } @Override |