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

am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev

Browse Source 
* commit '034d1d039b63d0d32d5d29313c354e351888b4b9':
  Ensure that force lock works with accessibility enabled
This commit is contained in:
Adrian Roos
2014-09-23 14:10:22 +00:00
committed by Android Git Automerger
parent 337553071a 18321f5337
commit 40f918f661
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
View File

@@ -497,4 +497,13 @@ public class KeyguardAffordanceView extends ImageView {
public void setIsLeft(boolean left) {
mIsLeft = left;
}
@Override
public boolean performClick() {
if (isClickable()) {
return super.performClick();
} else {
return false;
}
}
}

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -284,10 +284,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
if (mAccessibilityController == null) {
return;
}
mLockIcon.setClickable(mUnlockMethodCache.isTrustManaged()
|| mAccessibilityController.isTouchExplorationEnabled());
mLockIcon.setLongClickable(mAccessibilityController.isTouchExplorationEnabled()
&& mUnlockMethodCache.isTrustManaged());
boolean clickToUnlock = mAccessibilityController.isTouchExplorationEnabled();
boolean clickToForceLock = mUnlockMethodCache.isTrustManaged()
&& !mAccessibilityController.isAccessibilityEnabled();
boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged()
&& !clickToForceLock;
mLockIcon.setClickable(clickToForceLock || clickToUnlock);
mLockIcon.setLongClickable(longClickToForceLock);
mLockIcon.setFocusable(mAccessibilityController.isAccessibilityEnabled());
}