diff options
| author | Adrian Roos <roosa@google.com> | 2015-08-28 16:49:59 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-08-28 23:54:43 +0000 |
| commit | 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7 (patch) | |
| tree | d4a46def19fe3cfd0833a3779266de638b388063 /packages | |
| parent | e774bdd6f09a65886429a2d84a6af7e4b6352280 (diff) | |
| download | frameworks_base-0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.zip frameworks_base-0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.tar.gz frameworks_base-0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.tar.bz2 | |
Disable fingerprint after force lock
Bug: 23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index 93ecb06..d0a7f8a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -166,10 +166,13 @@ public class LockIcon extends KeyguardAffordanceView { if (mAccessibilityController == null) { return; } + boolean trustManagedOrFingerprintAllowed = mUnlockMethodCache.isTrustManaged() + || KeyguardUpdateMonitor.getInstance(mContext).isUnlockingWithFingerprintAllowed(); + boolean clickToUnlock = mAccessibilityController.isTouchExplorationEnabled(); - boolean clickToForceLock = mUnlockMethodCache.isTrustManaged() + boolean clickToForceLock = trustManagedOrFingerprintAllowed && !mAccessibilityController.isAccessibilityEnabled(); - boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged() + boolean longClickToForceLock = trustManagedOrFingerprintAllowed && !clickToForceLock; setClickable(clickToForceLock || clickToUnlock); setLongClickable(longClickToForceLock); |