diff options
author | Casey Burkhardt <caseyburkhardt@google.com> | 2013-10-07 21:18:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-07 21:18:08 +0000 |
commit | cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c (patch) | |
tree | 29847f7d8c06f0ff09b2fb975dd6773c033ee2f3 /src | |
parent | 225ad9b7ff206b0beb1b448de38fa1b5679f2ed0 (diff) | |
parent | 0d9cbae4dd6603870d1cd26c9a7b547b5eea6b0c (diff) | |
download | android_packages_apps_Trebuchet-cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c.tar.gz android_packages_apps_Trebuchet-cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c.tar.bz2 android_packages_apps_Trebuchet-cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c.zip |
Merge "Disable clings when explore by touch is enabled. Bug: 11067870 Change-Id: If203f3a23de3bd3192ff748bbccc04d74b0a73fa" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d33080512..cfa554513 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -87,6 +87,7 @@ import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; +import android.view.accessibility.AccessibilityManager; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.inputmethod.InputMethodManager; @@ -4088,6 +4089,13 @@ public class Launcher extends Activity // disable clings when running in a test harness if(ActivityManager.isRunningInTestHarness()) return false; + // Disable clings for accessibility when explore by touch is enabled + final AccessibilityManager a11yManager = (AccessibilityManager) getSystemService( + ACCESSIBILITY_SERVICE); + if (a11yManager.isTouchExplorationEnabled()) { + return false; + } + // Restricted secondary users (child mode) will potentially have very few apps // seeded when they start up for the first time. Clings won't work well with that // boolean supportsLimitedUsers = |