Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a308144 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia9bf58e09588b335e316fc1ca04d23b99cf08c89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2e00638 e70333a5

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+7 −7
Original line number Diff line number Diff line
@@ -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();

}