summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/accessibility
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-10-07 18:05:09 -0700
committerAlan Viverette <alanv@google.com>2013-10-07 18:05:09 -0700
commit516f953a82896a9b431ad87cb457277c62c75162 (patch)
treecf24ddb3d8d0d8403f16b4a70f624a7e20ad1dca /services/java/com/android/server/accessibility
parentf90299dfbcbae11415e81b78081f816b15f5b7a4 (diff)
parente4ccb864e8b16d31c158f7cd3bab7e6d8e346d3e (diff)
downloadframeworks_base-516f953a82896a9b431ad87cb457277c62c75162.zip
frameworks_base-516f953a82896a9b431ad87cb457277c62c75162.tar.gz
frameworks_base-516f953a82896a9b431ad87cb457277c62c75162.tar.bz2
resolved conflicts for merge of e4ccb864 to master
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
Diffstat (limited to 'services/java/com/android/server/accessibility')
-rw-r--r--services/java/com/android/server/accessibility/AccessibilityManagerService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index b1c625f..5e10d26 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1586,6 +1586,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
Settings.Secure.TOUCH_EXPLORATION_ENABLED, enabled ? 1 : 0,
userState.mUserId);
}
+ try {
+ mWindowManagerService.setTouchExplorationEnabled(enabled);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
}
private boolean canRequestAndRequestsTouchExplorationLocked(Service service) {