diff options
| author | Adrian Roos <roosa@google.com> | 2015-08-31 20:04:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-31 20:04:46 +0000 |
| commit | 781953123e5b0f0f85691eabc13b3430c3054a10 (patch) | |
| tree | 9f0ad45a2a34571d1c2b88b83ba51e3639473c28 /packages | |
| parent | 06fb3b2da8a57fdc5efe24ab9464e6e890740de6 (diff) | |
| parent | 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7 (diff) | |
| download | frameworks_base-781953123e5b0f0f85691eabc13b3430c3054a10.zip frameworks_base-781953123e5b0f0f85691eabc13b3430c3054a10.tar.gz frameworks_base-781953123e5b0f0f85691eabc13b3430c3054a10.tar.bz2 | |
Merge "Disable fingerprint after force lock" into mnc-dr-dev
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); |