summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-04-25 15:14:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-25 15:14:51 -0700
commit34688bbf83f5e375a54f740b3476a97be86b6c99 (patch)
treee3b247ece2a087e161f31a6218f561940d1b9567
parent2c1de863c339f9b9a965d96dcb646bb31ff5207f (diff)
parentba0ee8fce6e62154593c5b5bad982f356b28d35e (diff)
downloadframeworks_base-34688bbf83f5e375a54f740b3476a97be86b6c99.zip
frameworks_base-34688bbf83f5e375a54f740b3476a97be86b6c99.tar.gz
frameworks_base-34688bbf83f5e375a54f740b3476a97be86b6c99.tar.bz2
Merge "Make Advanceable a public API." into jb-dev
-rw-r--r--api/current.txt7
-rw-r--r--core/java/android/widget/Advanceable.java1
2 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index f2b35a8..d04025c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26608,7 +26608,7 @@ package android.widget {
method public abstract void onNothingSelected(android.widget.AdapterView<?>);
}
- public abstract class AdapterViewAnimator extends android.widget.AdapterView {
+ public abstract class AdapterViewAnimator extends android.widget.AdapterView implements android.widget.Advanceable {
ctor public AdapterViewAnimator(android.content.Context);
ctor public AdapterViewAnimator(android.content.Context, android.util.AttributeSet);
ctor public AdapterViewAnimator(android.content.Context, android.util.AttributeSet, int);
@@ -26650,6 +26650,11 @@ package android.widget {
method public void stopFlipping();
}
+ public abstract interface Advanceable {
+ method public abstract void advance();
+ method public abstract void fyiWillBeAdvancedByHostKThx();
+ }
+
public class AlphabetIndexer extends android.database.DataSetObserver implements android.widget.SectionIndexer {
ctor public AlphabetIndexer(android.database.Cursor, int, java.lang.CharSequence);
method protected int compare(java.lang.String, java.lang.String);
diff --git a/core/java/android/widget/Advanceable.java b/core/java/android/widget/Advanceable.java
index dc13ebb7..ad8e101 100644
--- a/core/java/android/widget/Advanceable.java
+++ b/core/java/android/widget/Advanceable.java
@@ -21,7 +21,6 @@ package android.widget;
* progressing through its set of children. The interface exists to give AppWidgetHosts a way of
* taking responsibility for automatically advancing such collections.
*
- * @hide
*/
public interface Advanceable {