summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-05-19 15:42:59 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-20 08:58:03 -0700
commit7a3ef4f88997118ffb5b1527e8c9635ffca75893 (patch)
tree51dba186ba40368b374a3405ea7f98a3a07916cd /packages
parent1974da956454698f551ebbe243b193467b284c41 (diff)
downloadframeworks_base-7a3ef4f88997118ffb5b1527e8c9635ffca75893.zip
frameworks_base-7a3ef4f88997118ffb5b1527e8c9635ffca75893.tar.gz
frameworks_base-7a3ef4f88997118ffb5b1527e8c9635ffca75893.tar.bz2
Revert "SystemUI: fix clock jumping when expanding QS from lockscreen"
No longer needed. This reverts commit 8dffc8688628e9e633717f35dbbd12ac633a9f34. Change-Id: I889364790a01433596b7e97e2be971ff68205acb
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java4
1 files changed, 1 insertions, 3 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 561885e..2178dfe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2541,9 +2541,7 @@ public class NotificationPanelView extends PanelView implements
// Hide "No notifications" in QS.
mNotificationStackScroller.updateEmptyShadeView(mShadeEmpty && !mQsExpanded);
- if (mStatusBarState == StatusBarState.KEYGUARD
- && (!mQsExpanded || mQsExpandImmediate || mIsExpanding
- && mQsExpandedWhenExpandingStarted)) {
+ if (mStatusBarState == StatusBarState.KEYGUARD) {
positionClockAndNotifications();
}
}