summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-10-07 17:54:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 17:54:42 -0700
commite4ccb864e8b16d31c158f7cd3bab7e6d8e346d3e (patch)
treedd147734f0f17282c638496d4f10cf0efc553539 /tools
parent47f698b88e8be919f3cc0400fa9f1076c1df037c (diff)
parent1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb (diff)
downloadframeworks_base-e4ccb864e8b16d31c158f7cd3bab7e6d8e346d3e.zip
frameworks_base-e4ccb864e8b16d31c158f7cd3bab7e6d8e346d3e.tar.gz
frameworks_base-e4ccb864e8b16d31c158f7cd3bab7e6d8e346d3e.tar.bz2
am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb': Ignore certain WindowManager flags when touch exploration is enabled
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 225b0c3..fd153af 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -494,4 +494,8 @@ public class IWindowManagerImpl implements IWindowManager {
// TODO Auto-generated method stub
return false;
}
+
+ @Override
+ public void setTouchExplorationEnabled(boolean enabled) {
+ }
}