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

Commit b8a140f3 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 1e2b6438: Merge "Fix accessibility state callbacks" into klp-dev 

* commit '1e2b6438':
  Fix accessibility state callbacks
parents 0daa9b92 1e2b6438

core/java/android/view/accessibility/AccessibilityManager.java

+6 −2
Original line number Diff line number Diff line
@@ -415,14 +415,18 @@ public final class AccessibilityManager { 
        final boolean touchExplorationEnabled =

                (stateFlags & STATE_FLAG_TOUCH_EXPLORATION_ENABLED) != 0;

        synchronized (mHandler) {

            final boolean wasEnabled = mIsEnabled;

            final boolean wasTouchExplorationEnabled = mIsTouchExplorationEnabled;



            // Ensure listeners get current state from isZzzEnabled() calls.

            mIsEnabled = enabled;

            mIsTouchExplorationEnabled = touchExplorationEnabled;



            if (enabled != mIsEnabled) {

            if (wasEnabled != enabled) {

                notifyAccessibilityStateChangedLh();

            }



            if (touchExplorationEnabled != mIsTouchExplorationEnabled) {

            if (wasTouchExplorationEnabled != touchExplorationEnabled) {

                notifyTouchExplorationStateChangedLh();

            }

        }