summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-07-22 13:24:29 -0700
committerd34d <clark@cyngn.com>2016-07-22 18:26:14 -0700
commit1af5e7f2c2d6d3d41694431fade7a12b51eb65be (patch)
tree8aeff716968dc9f8df8d29a9b308032fe473da9b /packages/SystemUI
parent2c050b3ffdc688f0f9c7e436657550cd19332ea0 (diff)
downloadframeworks_base-1af5e7f2c2d6d3d41694431fade7a12b51eb65be.zip
frameworks_base-1af5e7f2c2d6d3d41694431fade7a12b51eb65be.tar.gz
frameworks_base-1af5e7f2c2d6d3d41694431fade7a12b51eb65be.tar.bz2
SysUI: Show hints if showing keyguard and provisioned
Change-Id: Ifd8923e7eabc7b8fd9186dbf757272dec3a1a8b1 TICKET: NIGHTLIES-3199 NIGHTLIES-3202 NIGHTLIES-3204
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java12
1 files changed, 9 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 6992379..736fd7d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2629,9 +2629,11 @@ public class NotificationPanelView extends PanelView implements
public void onScreenTurningOn() {
mKeyguardStatusView.refreshTime();
- startScreenOnHintAnimation(mLiveLockscreenController.isLiveLockScreenInteractive() &&
- !mUserInteractedWithLiveLockScreen,
- !mUserUnlocked, !mUserExpandedNotifications);
+ if (shouldShowScreenOnHints()) {
+ startScreenOnHintAnimation(mLiveLockscreenController.isLiveLockScreenInteractive() &&
+ !mUserInteractedWithLiveLockScreen,
+ !mUserUnlocked, !mUserExpandedNotifications);
+ }
}
@Override
@@ -3065,4 +3067,8 @@ public class NotificationPanelView extends PanelView implements
private boolean getUserReturnedFromLls() {
return getSharedPreferenceBoolean(KEY_USER_RETURNED_FROM_LLS, false);
}
+
+ private boolean shouldShowScreenOnHints() {
+ return mStatusBar.isDeviceProvisioned() && mStatusBarState == StatusBarState.KEYGUARD;
+ }
}