diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-18 01:38:59 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2015-06-18 15:30:36 -0700 |
| commit | 3122fa85b2f18c0a89f5fe1ef0942c530a271843 (patch) | |
| tree | c2a826f9c0c87c3881f03d60254b75160898e043 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | b0a8d2c4aecb6dfe5f7a95f56ca739fbea6301e5 (diff) | |
| download | frameworks_base-3122fa85b2f18c0a89f5fe1ef0942c530a271843.zip frameworks_base-3122fa85b2f18c0a89f5fe1ef0942c530a271843.tar.gz frameworks_base-3122fa85b2f18c0a89f5fe1ef0942c530a271843.tar.bz2 | |
Added a message to the keyguard bouncer
A message can now be shown on the keyguard bouncer
explaining why the bouncer is being shown.
Bug: 21618072
Change-Id: I25aea9cc242abbf6a133fb42cc4407f5c2f3f688
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index c06b34f..80761d8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -62,6 +62,7 @@ import com.android.internal.telephony.IccCardConstants; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardConstants; import com.android.keyguard.KeyguardDisplayManager; +import com.android.keyguard.KeyguardSecurityView; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.ViewMediatorCallback; @@ -526,6 +527,17 @@ public class KeyguardViewMediator extends SystemUI { public boolean isScreenOn() { return mDeviceInteractive; } + + @Override + public int getBouncerPromptReason() { + int currentUser = ActivityManager.getCurrentUser(); + if ((mUpdateMonitor.getUserTrustIsManaged(currentUser) + || mUpdateMonitor.isUnlockWithFingerPrintPossible(currentUser)) + && !mTrustManager.hasUserAuthenticatedSinceBoot(currentUser)) { + return KeyguardSecurityView.PROMPT_REASON_RESTART; + } + return KeyguardSecurityView.PROMPT_REASON_NONE; + } }; public void userActivity() { |