diff --git a/api/current.txt b/api/current.txt index 67694334ec923..ad16e4e1c2f20 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27240,7 +27240,7 @@ package android.view.accessibility { method public java.lang.CharSequence getText(); method public int getTextSelectionEnd(); method public int getTextSelectionStart(); - method public java.lang.CharSequence getViewIdResourceName(); + method public java.lang.String getViewIdResourceName(); method public int getWindowId(); method public boolean isAccessibilityFocused(); method public boolean isCheckable(); @@ -27291,7 +27291,7 @@ package android.view.accessibility { method public void setSource(android.view.View, int); method public void setText(java.lang.CharSequence); method public void setTextSelection(int, int); - method public void setViewIdResourceName(java.lang.CharSequence); + method public void setViewIdResourceName(java.lang.String); 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/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index ad87fcbc6ce0a..d9c9b69bfcedd 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -473,7 +473,7 @@ public class AccessibilityNodeInfo implements Parcelable { private CharSequence mClassName; private CharSequence mText; private CharSequence mContentDescription; - private CharSequence mViewIdResourceName; + private String mViewIdResourceName; private final SparseLongArray mChildNodeIds = new SparseLongArray(); private int mActions; @@ -1541,7 +1541,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @param viewIdResName The id resource name. */ - public void setViewIdResourceName(CharSequence viewIdResName) { + public void setViewIdResourceName(String viewIdResName) { enforceNotSealed(); mViewIdResourceName = viewIdResName; } @@ -1558,7 +1558,7 @@ public class AccessibilityNodeInfo implements Parcelable { * @return The id resource name. */ - public CharSequence getViewIdResourceName() { + public String getViewIdResourceName() { return mViewIdResourceName; } @@ -1841,7 +1841,7 @@ public class AccessibilityNodeInfo implements Parcelable { parcel.writeCharSequence(mClassName); parcel.writeCharSequence(mText); parcel.writeCharSequence(mContentDescription); - parcel.writeCharSequence(mViewIdResourceName); + parcel.writeString(mViewIdResourceName); parcel.writeInt(mTextSelectionStart); parcel.writeInt(mTextSelectionEnd); @@ -1923,7 +1923,7 @@ public class AccessibilityNodeInfo implements Parcelable { mClassName = parcel.readCharSequence(); mText = parcel.readCharSequence(); mContentDescription = parcel.readCharSequence(); - mViewIdResourceName = parcel.readCharSequence(); + mViewIdResourceName = parcel.readString(); mTextSelectionStart = parcel.readInt(); mTextSelectionEnd = parcel.readInt();