Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0fa15291: Merge "Make UiTestAutomationBridge see non-important views again" into jb-dev

Browse Source 
* commit '0fa152912e55f2d08f0a8d1260332a81e5706694':
  Make UiTestAutomationBridge see non-important views again
This commit is contained in:
Guang Zhu
2012-05-10 09:24:19 -07:00
committed by Android Git Automerger
parent 7156645c58 0fa152912e
commit cc441aba8a
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/accessibilityservice/UiTestAutomationBridge.java
View File

@@ -83,7 +83,7 @@ public class UiTestAutomationBridge {
* @return The event.
*/
public AccessibilityEvent getLastAccessibilityEvent() {
return mLastEvent;
return mLastEvent;
}
/**
@@ -142,7 +142,7 @@ public class UiTestAutomationBridge {
@Override
public void onInterrupt() {
UiTestAutomationBridge.this.onInterrupt();
UiTestAutomationBridge.this.onInterrupt();
}
@Override
@@ -189,7 +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;
info.flags |= AccessibilityServiceInfo.INCLUDE_NOT_IMPORTANT_VIEWS;
try {
manager.registerUiTestAutomationService(mListener, info);

19
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -259,7 +259,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
updateInputFilterLocked();
sendStateToClientsLocked();
}
return;
}
@@ -1266,16 +1266,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
mNotificationTimeout = info.notificationTimeout;
mIsDefault = (info.flags & DEFAULT) != 0;
if (!mIsAutomation) {
final int targetSdkVersion =
info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion;
// TODO: Uncomment this line and remove the line below when JellyBean
// SDK version is finalized.
// if (targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN) {
if (targetSdkVersion > Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
mIncludeNotImportantViews =
(info.flags & INCLUDE_NOT_IMPORTANT_VIEWS) != 0;
}
if (mIsAutomation || info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion
// TODO: Uncomment this line and remove the line below when JellyBean
// SDK version is finalized.
// >= Build.VERSION_CODES.JELLY_BEAN) {
> Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
mIncludeNotImportantViews =
(info.flags & INCLUDE_NOT_IMPORTANT_VIEWS) != 0;
}
synchronized (mLock) {