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

Ensure that force lock works with accessibility enabled

Browse Source 
Fixes a bug where the force lock gesture was not available
when an accessibility service was active, but touch exploration
wasn't.

Bug: 17514298
Change-Id: Ib42e28f643559040ad5f24d45456b0a41008c647
This commit is contained in:
Adrian Roos
2014-09-22 17:34:56 +02:00
parent ee3ef2b8af
commit 38fc7606b1
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());
}