Merge "DefaultGestureHandlingHelperService should not include non-important views." into jb-dev

core/java/android/accessibilityservice/UiTestAutomationBridge.java

@@ -189,6 +189,7 @@ public class UiTestAutomationBridge {
         final AccessibilityServiceInfo info = new AccessibilityServiceInfo();
         info.eventTypes = AccessibilityEvent.TYPES_ALL_MASK;
         info.feedbackType = AccessibilityServiceInfo.FEEDBACK_GENERIC;
+        info.flags |= AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS;
 
         try {
             manager.registerUiTestAutomationService(mListener, info);

services/java/com/android/server/accessibility/AccessibilityManagerService.java

@@ -1251,7 +1251,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
                         mContext, 0, new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), 0));
             } else {
                 mCanRetrieveScreenContent = true;
-                mIncludeNotImportantViews = true;
                 mCanHandleGestures = true;
             }
             setDynamicallyConfigurableProperties(accessibilityServiceInfo);