summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/accessibility
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-10-09 17:48:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 17:48:10 -0700
commita393d6750ceb1b2508a77cedfd343d07bcebe43e (patch)
treeb11b09ebfdde8ae544ef7ea90bbe639769699d47 /core/java/android/view/accessibility
parenta13d62d6f166af2857fd60d1a482874bebded1a4 (diff)
parent1cac53fa63060ec3fa3b0249b941ccf8544b3333 (diff)
downloadframeworks_base-a393d6750ceb1b2508a77cedfd343d07bcebe43e.zip
frameworks_base-a393d6750ceb1b2508a77cedfd343d07bcebe43e.tar.gz
frameworks_base-a393d6750ceb1b2508a77cedfd343d07bcebe43e.tar.bz2
am 1cac53fa: am b8a140f3: am 1e2b6438: Merge "Fix accessibility state callbacks" into klp-dev
* commit '1cac53fa63060ec3fa3b0249b941ccf8544b3333': Fix accessibility state callbacks
Diffstat (limited to 'core/java/android/view/accessibility')
-rw-r--r--core/java/android/view/accessibility/AccessibilityManager.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index d8859e3..324ba77 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -451,14 +451,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();
}
}