summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-06-23 23:34:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-23 23:34:22 +0000
commitfcaed60650ed8e44a416e7ba05c281aae643b0c6 (patch)
tree579e05eca909fc443d655312e624b7a0656c4629 /api
parenta39fcc58753000435e963b473bad954a337604f2 (diff)
parent8ecf16d186fa8606571b75c01a21a528a7e55d23 (diff)
downloadframeworks_base-fcaed60650ed8e44a416e7ba05c281aae643b0c6.zip
frameworks_base-fcaed60650ed8e44a416e7ba05c281aae643b0c6.tar.gz
frameworks_base-fcaed60650ed8e44a416e7ba05c281aae643b0c6.tar.bz2
Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt8
-rw-r--r--api/system-current.txt8
2 files changed, 4 insertions, 12 deletions
diff --git a/api/current.txt b/api/current.txt
index ef8e26b..a19e3e9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36565,10 +36565,6 @@ package android.view {
method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
}
- public abstract deprecated class ViewAssistStructure extends android.view.ViewStructure {
- ctor public ViewAssistStructure();
- }
-
public class ViewConfiguration {
ctor public deprecated ViewConfiguration();
method public static android.view.ViewConfiguration get(android.content.Context);
@@ -36950,7 +36946,7 @@ package android.view {
ctor public ViewStructure();
method public abstract int addChildCount(int);
method public abstract void asyncCommit();
- method public abstract android.view.ViewAssistStructure asyncNewChild(int);
+ method public abstract android.view.ViewStructure asyncNewChild(int);
method public abstract int getChildCount();
method public abstract android.os.Bundle getExtras();
method public abstract java.lang.CharSequence getHint();
@@ -36958,7 +36954,7 @@ package android.view {
method public abstract int getTextSelectionEnd();
method public abstract int getTextSelectionStart();
method public abstract boolean hasExtras();
- method public abstract android.view.ViewAssistStructure newChild(int);
+ method public abstract android.view.ViewStructure newChild(int);
method public abstract void setAccessibilityFocused(boolean);
method public abstract void setActivated(boolean);
method public abstract void setCheckable(boolean);
diff --git a/api/system-current.txt b/api/system-current.txt
index ec3a65f..d1d4fe4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38846,10 +38846,6 @@ package android.view {
method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
}
- public abstract deprecated class ViewAssistStructure extends android.view.ViewStructure {
- ctor public ViewAssistStructure();
- }
-
public class ViewConfiguration {
ctor public deprecated ViewConfiguration();
method public static android.view.ViewConfiguration get(android.content.Context);
@@ -39231,7 +39227,7 @@ package android.view {
ctor public ViewStructure();
method public abstract int addChildCount(int);
method public abstract void asyncCommit();
- method public abstract android.view.ViewAssistStructure asyncNewChild(int);
+ method public abstract android.view.ViewStructure asyncNewChild(int);
method public abstract int getChildCount();
method public abstract android.os.Bundle getExtras();
method public abstract java.lang.CharSequence getHint();
@@ -39239,7 +39235,7 @@ package android.view {
method public abstract int getTextSelectionEnd();
method public abstract int getTextSelectionStart();
method public abstract boolean hasExtras();
- method public abstract android.view.ViewAssistStructure newChild(int);
+ method public abstract android.view.ViewStructure newChild(int);
method public abstract void setAccessibilityFocused(boolean);
method public abstract void setActivated(boolean);
method public abstract void setCheckable(boolean);