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

am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev

Browse Source 
* commit 'a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
  Making new node id APIs return strings.
This commit is contained in:
Svetoslav
2013-04-23 03:51:50 -07:00
committed by Android Git Automerger
parent cb315af34b a61464d7ad
commit 7bf02d1255
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -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

10
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -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();