Add lock icon click handler when a11y is enabled

Previously it was only enabled if the user had
touch exploration enabled.

Test: manually enable voice access and
interact with lock & unlock icon with voice
Fixes: 215294494

Change-Id: I5e40b3c78ad73c4d726584199a1577d01c3cdc19
This commit is contained in:
Beverly
2022-03-25 15:28:29 +00:00
parent 553068e973
commit 12f6eb565a

View File

@@ -212,13 +212,13 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
updateBurnInOffsets();
updateVisibility();
mAccessibilityManager.addTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
mAccessibilityManager.addAccessibilityStateChangeListener(
mAccessibilityStateChangeListener);
updateAccessibility();
}
private void updateAccessibility() {
if (mAccessibilityManager.isTouchExplorationEnabled()) {
if (mAccessibilityManager.isEnabled()) {
mView.setOnClickListener(mA11yClickListener);
} else {
mView.setOnClickListener(null);
@@ -238,8 +238,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mCancelDelayedUpdateVisibilityRunnable = null;
}
mAccessibilityManager.removeTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
mAccessibilityManager.removeAccessibilityStateChangeListener(
mAccessibilityStateChangeListener);
}
public float getTop() {
@@ -721,6 +721,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private final View.OnClickListener mA11yClickListener = v -> onLongPress();
private final AccessibilityManager.TouchExplorationStateChangeListener
mTouchExplorationStateChangeListener = enabled -> updateAccessibility();
private final AccessibilityManager.AccessibilityStateChangeListener
mAccessibilityStateChangeListener = enabled -> updateAccessibility();
}