Renaming some APIs
Change-Id: I9e226d39648796f95dd0e86ffecbb3f93544243b
diff --git a/api/current.txt b/api/current.txt
index ac576b1..d1363db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26305,7 +26305,7 @@
method public java.lang.CharSequence getPackageName();
method public android.view.accessibility.AccessibilityNodeInfo getParent();
method public java.lang.CharSequence getText();
- method public java.lang.CharSequence getViewId();
+ method public java.lang.CharSequence getViewIdResourceName();
method public int getWindowId();
method public boolean isAccessibilityFocused();
method public boolean isCheckable();
@@ -26353,7 +26353,7 @@
method public void setSource(android.view.View);
method public void setSource(android.view.View, int);
method public void setText(java.lang.CharSequence);
- method public void setViewId(java.lang.CharSequence);
+ method public void setViewIdResourceName(java.lang.CharSequence);
method public void setVisibleToUser(boolean);
method public void writeToParcel(android.os.Parcel, int);
field public static final int ACTION_ACCESSIBILITY_FOCUS = 64; // 0x40
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index adefa5a..cbd0668 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5024,7 +5024,7 @@
/* ignore */
}
}
- info.setViewId(viewId);
+ info.setViewIdResourceName(viewId);
}
}
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index 4e7ff08..371aac0 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -1511,7 +1511,7 @@
*
* @param viewId The id resource name.
*/
- public void setViewId(CharSequence viewId) {
+ public void setViewIdResourceName(CharSequence viewId) {
enforceNotSealed();
mViewId = viewId;
}
@@ -1528,7 +1528,7 @@
* @return The id resource name.
*/
- public CharSequence getViewId() {
+ public CharSequence getViewIdResourceName() {
return mViewId;
}