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

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

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

* commit '1cac53fa':
  Fix accessibility state callbacks
parents a13d62d6 1cac53fa

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

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

        final boolean touchExplorationEnabled =

                (stateFlags & STATE_FLAG_TOUCH_EXPLORATION_ENABLED) != 0;

                (stateFlags & STATE_FLAG_TOUCH_EXPLORATION_ENABLED) != 0;

        synchronized (mHandler) {

        synchronized (mHandler) {

            final boolean wasEnabled = mIsEnabled;

            final boolean wasTouchExplorationEnabled = mIsTouchExplorationEnabled;



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

            mIsEnabled = enabled;

            mIsEnabled = enabled;

            mIsTouchExplorationEnabled = touchExplorationEnabled;

            mIsTouchExplorationEnabled = touchExplorationEnabled;





            if (enabled != mIsEnabled) {

            if (wasEnabled != enabled) {

                notifyAccessibilityStateChangedLh();

                notifyAccessibilityStateChangedLh();

            }

            }





            if (touchExplorationEnabled != mIsTouchExplorationEnabled) {

            if (wasTouchExplorationEnabled != touchExplorationEnabled) {

                notifyTouchExplorationStateChangedLh();

                notifyTouchExplorationStateChangedLh();

            }

            }

        }

        }