From 1af5e7f2c2d6d3d41694431fade7a12b51eb65be Mon Sep 17 00:00:00 2001 From: d34d Date: Fri, 22 Jul 2016 13:24:29 -0700 Subject: SysUI: Show hints if showing keyguard and provisioned Change-Id: Ifd8923e7eabc7b8fd9186dbf757272dec3a1a8b1 TICKET: NIGHTLIES-3199 NIGHTLIES-3202 NIGHTLIES-3204 --- .../systemui/statusbar/phone/NotificationPanelView.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'packages/SystemUI') 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; + } } -- cgit v1.1