Merge "Fix package names of View Ids in cts test." into nyc-dev
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index 3f27cd7..cb2ae9a 100755
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -91,7 +91,7 @@
         // Find a button to click on.
         final AccessibilityNodeInfo button1 = uiAutomation.getRootInActiveWindow()
                 .findAccessibilityNodeInfosByViewId(
-                        "com.android.cts.accessibilityservice:id/button1").get(0);
+                        "android.accessibilityservice.cts:id/button1").get(0);
 
         // Argh...
         final List<AccessibilityEvent> events = new ArrayList<AccessibilityEvent>();
@@ -163,7 +163,7 @@
             // Find a button to click on.
             final AccessibilityNodeInfo button1 = uiAutomation.getRootInActiveWindow()
                     .findAccessibilityNodeInfosByViewId(
-                            "com.android.cts.accessibilityservice:id/button1").get(0);
+                            "android.accessibilityservice.cts:id/button1").get(0);
 
             // Argh...
             final List<AccessibilityEvent> events = new ArrayList<AccessibilityEvent>();
@@ -218,7 +218,7 @@
             // Find a button to click on.
             final AccessibilityNodeInfo button1 = uiAutomation.getRootInActiveWindow()
                     .findAccessibilityNodeInfosByViewId(
-                            "com.android.cts.accessibilityservice:id/button1").get(0);
+                            "android.accessibilityservice.cts:id/button1").get(0);
 
             // Argh...
             final List<AccessibilityEvent> events = new ArrayList<AccessibilityEvent>();
@@ -249,7 +249,7 @@
             // Find a another button from the event's window.
             final AccessibilityNodeInfo button2 = window.getRoot()
                     .findAccessibilityNodeInfosByViewId(
-                            "com.android.cts.accessibilityservice:id/button2").get(0);
+                            "android.accessibilityservice.cts:id/button2").get(0);
 
             // Click the second button.
             uiAutomation.executeAndWaitForEvent(new Runnable() {
@@ -858,7 +858,7 @@
             classNameAndTextList.add("android.widget.ButtonB8");
             classNameAndTextList.add("android.widget.ButtonB9");
 
-            String contentViewIdResName = "com.android.cts.accessibilityservice:id/added_content";
+            String contentViewIdResName = "android.accessibilityservice.cts:id/added_content";
             boolean verifyContent = false;
 
             Queue<AccessibilityNodeInfo> fringe = new LinkedList<AccessibilityNodeInfo>();