Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev

Browse Source 
am: a528ee13bd

Change-Id: Ic5dddc98fc58abc7c813f58b79df6b2ab38e4f2e
This commit is contained in:
Adrian Roos
2017-08-18 17:45:14 +00:00
committed by android-build-merger
parent dd4e76b687 a528ee13bd
commit 44931559d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
View File

@@ -207,9 +207,9 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
if (mAccessibilityController == null) { if (mAccessibilityController == null) {
return; return;
} }
boolean clickToUnlock = mAccessibilityController.isTouchExplorationEnabled(); boolean clickToUnlock = mAccessibilityController.isAccessibilityEnabled();
boolean clickToForceLock = mUnlockMethodCache.isTrustManaged() boolean clickToForceLock = mUnlockMethodCache.isTrustManaged()
&& !mAccessibilityController.isAccessibilityEnabled(); && !clickToUnlock;
boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged() boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged()
&& !clickToForceLock; && !clickToForceLock;
setClickable(clickToForceLock || clickToUnlock); setClickable(clickToForceLock || clickToUnlock);