summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-09-02 15:07:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-02 15:07:37 +0000
commit2debc99efa952e2da912b459ec51c3264d3deccc (patch)
tree916d887a45a6569632e0b62352f0b10377a1ce2f /packages
parent56d3cb3013f06e3fd3f99a63d071dc0a72c92af9 (diff)
parente62d589bea54e58054ae16265c92e974a8250ff5 (diff)
downloadframeworks_base-2debc99efa952e2da912b459ec51c3264d3deccc.zip
frameworks_base-2debc99efa952e2da912b459ec51c3264d3deccc.tar.gz
frameworks_base-2debc99efa952e2da912b459ec51c3264d3deccc.tar.bz2
Merge "Fix expanded notifications on lockscreen" into lmp-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java2
1 files changed, 2 insertions, 0 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 e818d23..6127811 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -720,6 +720,8 @@ public abstract class PanelView extends FrameLayout {
abortAnimations();
if (mTracking) {
onTrackingStopped(true /* expands */); // The panel is expanded after this call.
+ }
+ if (mExpanding) {
notifyExpandingFinished();
}
setVisibility(VISIBLE);