From 158fbd3ab80eb75241fda9ada84eea43016d40ed Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sat, 5 Oct 2013 19:01:00 -0700 Subject: [PATCH] Fix bug where pebble app triggers accessibility mode in navbar camera Apparently the Pebble application uses accessibility. This was triggering the navbar to resort to accessibility mode for launching the camera. The fix is to also require touch exploration to be enabled. Fixes bug 11061505 Change-Id: I2245bd37eef9e68911862ce86147b1343816f1a4 --- .../com/android/systemui/statusbar/phone/NavigationBarView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 04885f0b076f2..6e5336384d44a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -391,7 +391,7 @@ public class NavigationBarView extends LinearLayout { final AccessibilityManager accessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); - if (accessibilityManager.isEnabled()) { + if (accessibilityManager.isEnabled() && accessibilityManager.isTouchExplorationEnabled()) { // In accessibility mode, we add a simple click handler since swipe is tough to // trigger near screen edges. View camera = getCameraButton();