summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-04-23 00:01:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-23 00:01:36 +0000
commita61464d7adc26c291a5f9de48c9aff8b76a56b1f (patch)
tree3b3a3defdf5d75920be82fe614160f14e3b0b4ed /api
parentfb0b6a817903b42dfc192dc8fa71f5dede024379 (diff)
parent9fa1ee563b5a9ca25554f1fa59d1222dcfdfc623 (diff)
downloadframeworks_base-a61464d7adc26c291a5f9de48c9aff8b76a56b1f.zip
frameworks_base-a61464d7adc26c291a5f9de48c9aff8b76a56b1f.tar.gz
frameworks_base-a61464d7adc26c291a5f9de48c9aff8b76a56b1f.tar.bz2
Merge "Making new node id APIs return strings." into jb-mr2-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 1ef6955..d71ab35 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