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

* commit 'b8a140f3e081f1040ed2d4a0f928d142bdb0e580':
  Fix accessibility state callbacks
This commit is contained in:
Alan Viverette
2013-10-09 17:45:09 -07:00
committed by Android Git Automerger

View File

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