Merge "Add lock icon click handler when a11y is enabled" into tm-dev am: e70333a546

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408925

Change-Id: I8227d5bde6d3a69dd0f7acfedd1fe5cb0d9ab6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-03-25 22:25:42 +00:00
committed by Automerger Merge Worker

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();
}