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

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

Merge "Update lock icon a11y click handler on a11y change" into tm-dev am: f6cfe35b 

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

Change-Id: Ic18d91fc0a9d3e4fcacbe409bfdb7e8dbd19ee9a
parents d2a84023 f6cfe35b

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

+18 −16
Original line number Diff line number Diff line
@@ -212,19 +212,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        updateBurnInOffsets();

        updateVisibility();



        mAccessibilityManager.addTouchExplorationStateChangeListener(

                mTouchExplorationStateChangeListener);

        updateAccessibility();

    }



    private void updateAccessibility() {

        if (mAccessibilityManager.isTouchExplorationEnabled()) {

            mView.setOnClickListener(

                    new View.OnClickListener() {

                        @Override

                        public void onClick(View v) {

                            onLongPress();

                        }

                    }

            );

            mView.setOnClickListener(mA11yClickListener);

        } else {

            mView.setOnClickListener(null);

        }
@@ -242,6 +237,9 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
            mCancelDelayedUpdateVisibilityRunnable.run();

            mCancelDelayedUpdateVisibilityRunnable = null;

        }



        mAccessibilityManager.removeTouchExplorationStateChangeListener(

                mTouchExplorationStateChangeListener);

    }



    public float getTop() {
@@ -267,7 +265,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
            return;

        }



        boolean wasShowingUnlock = mShowUnlockIcon;

        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon

                && !mShowAodUnlockedIcon && !mShowAodLockIcon;

        mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen()
@@ -702,6 +699,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        mView.setAlpha(alpha);

    }



    private void updateUdfpsConfig() {

        // must be called from the main thread since it may update the views

        mExecutor.execute(() -> {

            updateIsUdfpsEnrolled();

            updateConfiguration();

        });

    }



    private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() {

        @Override

        public void onAllAuthenticatorsRegistered() {
@@ -714,11 +719,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        }

    };



    private void updateUdfpsConfig() {

        // must be called from the main thread since it may update the views

        mExecutor.execute(() -> {

            updateIsUdfpsEnrolled();

            updateConfiguration();

        });

    }

    private final View.OnClickListener mA11yClickListener = v -> onLongPress();



    private final AccessibilityManager.TouchExplorationStateChangeListener

            mTouchExplorationStateChangeListener = enabled -> updateAccessibility();

}