commit 56a7ae5d4fb91af7a8f4fb4ebbb778073be6feb3
author Svetoslav <svetoslavganov@google.com> Tue Feb 05 14:39:57 2013 -0800
committer Svetoslav <svetoslavganov@google.com> Tue Feb 05 14:40:25 2013 -0800
tree 5581e1bcd417020dc3c7b18d9304e0783ed2d9e0
parent ebb34d471480ae1d170985ea4a14cdf867220c08

Update for renamed APIs

Change-Id: I4703830d6554f16abfd03c2e162a317f278cc005

uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java

diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java b/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
index 295bc06..aae9cf2 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
@@ -100,7 +100,7 @@
             serializer.attribute("", "NAF", Boolean.toString(true));
         serializer.attribute("", "index", Integer.toString(index));
         serializer.attribute("", "text", safeCharSeqToString(node.getText()));
-        serializer.attribute("", "resource-id", safeCharSeqToString(node.getViewId()));
+        serializer.attribute("", "resource-id", safeCharSeqToString(node.getViewIdResourceName()));
         serializer.attribute("", "class", safeCharSeqToString(node.getClassName()));
         serializer.attribute("", "package", safeCharSeqToString(node.getPackageName()));
         serializer.attribute("", "content-desc", safeCharSeqToString(node.getContentDescription()));

uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java

diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java b/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
index 68f37e4..d16aff7 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
@@ -772,7 +772,7 @@
                 }
                 break;
             case UiSelector.SELECTOR_RESOURCE_ID:
-                if (node.getViewId() != getString(criterion)) {
+                if (node.getViewIdResourceName() != getString(criterion)) {
                     return false;
                 }
                 break;