Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev (e25f6587) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -39662,7 +39662,7 @@ package android.widget {
		ctor public AnalogClock(android.content.Context, android.util.AttributeSet, int, int);
		}

		public class ArrayAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public class ArrayAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public ArrayAdapter(android.content.Context, int);
		ctor public ArrayAdapter(android.content.Context, int, int);
		ctor public ArrayAdapter(android.content.Context, int, T[]);
		@@ -39903,7 +39903,7 @@ package android.widget {
		method public abstract void onCheckedChanged(android.widget.CompoundButton, boolean);
		}

		public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public deprecated CursorAdapter(android.content.Context, android.database.Cursor);
		ctor public CursorAdapter(android.content.Context, android.database.Cursor, boolean);
		ctor public CursorAdapter(android.content.Context, android.database.Cursor, int);
		@@ -41168,7 +41168,7 @@ package android.widget {
		method public abstract boolean onShareTargetSelected(android.widget.ShareActionProvider, android.content.Intent);
		}

		public class SimpleAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public class SimpleAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public SimpleAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, java.lang.String[], int[]);
		method public int getCount();
		method public android.content.res.Resources.Theme getDropDownViewTheme();
		@@ -41297,7 +41297,7 @@ package android.widget {
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int, android.content.Context);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int, android.content.res.Resources.Theme);
		method public int getDropDownHorizontalOffset();
		method public int getDropDownVerticalOffset();
		method public int getDropDownWidth();
		@@ -41318,11 +41318,6 @@ package android.widget {
		field public static final int MODE_DROPDOWN = 1; // 0x1
		}

		public static abstract interface Spinner.ThemedSpinnerAdapter {
		method public abstract android.content.res.Resources.Theme getDropDownViewTheme();
		method public abstract void setDropDownViewTheme(android.content.res.Resources.Theme);
		}

		public abstract interface SpinnerAdapter implements android.widget.Adapter {
		method public abstract android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup);
		}
		@@ -41724,6 +41719,11 @@ package android.widget {
		field public static final android.os.Parcelable.Creator<android.widget.TextView.SavedState> CREATOR;
		}

		public abstract interface ThemedSpinnerAdapter implements android.widget.SpinnerAdapter {
		method public abstract android.content.res.Resources.Theme getDropDownViewTheme();
		method public abstract void setDropDownViewTheme(android.content.res.Resources.Theme);
		}

		public class TimePicker extends android.widget.FrameLayout {
		ctor public TimePicker(android.content.Context);
		ctor public TimePicker(android.content.Context, android.util.AttributeSet);

api/system-current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -42240,7 +42240,7 @@ package android.widget {
		ctor public AnalogClock(android.content.Context, android.util.AttributeSet, int, int);
		}

		public class ArrayAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public class ArrayAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public ArrayAdapter(android.content.Context, int);
		ctor public ArrayAdapter(android.content.Context, int, int);
		ctor public ArrayAdapter(android.content.Context, int, T[]);
		@@ -42481,7 +42481,7 @@ package android.widget {
		method public abstract void onCheckedChanged(android.widget.CompoundButton, boolean);
		}

		public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public deprecated CursorAdapter(android.content.Context, android.database.Cursor);
		ctor public CursorAdapter(android.content.Context, android.database.Cursor, boolean);
		ctor public CursorAdapter(android.content.Context, android.database.Cursor, int);
		@@ -43746,7 +43746,7 @@ package android.widget {
		method public abstract boolean onShareTargetSelected(android.widget.ShareActionProvider, android.content.Intent);
		}

		public class SimpleAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.Spinner.ThemedSpinnerAdapter {
		public class SimpleAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
		ctor public SimpleAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, java.lang.String[], int[]);
		method public int getCount();
		method public android.content.res.Resources.Theme getDropDownViewTheme();
		@@ -43875,7 +43875,7 @@ package android.widget {
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int, android.content.Context);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int, android.content.res.Resources.Theme);
		method public int getDropDownHorizontalOffset();
		method public int getDropDownVerticalOffset();
		method public int getDropDownWidth();
		@@ -43896,11 +43896,6 @@ package android.widget {
		field public static final int MODE_DROPDOWN = 1; // 0x1
		}

		public static abstract interface Spinner.ThemedSpinnerAdapter {
		method public abstract android.content.res.Resources.Theme getDropDownViewTheme();
		method public abstract void setDropDownViewTheme(android.content.res.Resources.Theme);
		}

		public abstract interface SpinnerAdapter implements android.widget.Adapter {
		method public abstract android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup);
		}
		@@ -44302,6 +44297,11 @@ package android.widget {
		field public static final android.os.Parcelable.Creator<android.widget.TextView.SavedState> CREATOR;
		}

		public abstract interface ThemedSpinnerAdapter implements android.widget.SpinnerAdapter {
		method public abstract android.content.res.Resources.Theme getDropDownViewTheme();
		method public abstract void setDropDownViewTheme(android.content.res.Resources.Theme);
		}

		public class TimePicker extends android.widget.FrameLayout {
		ctor public TimePicker(android.content.Context);
		ctor public TimePicker(android.content.Context, android.util.AttributeSet);

core/java/android/widget/ArrayAdapter.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,7 @@ import java.util.List;
		* or to have some of data besides toString() results fill the views,
		* override {@link #getView(int, View, ViewGroup)} to return the type of view you want.
		*/
		public class ArrayAdapter<T> extends BaseAdapter implements Filterable,
		Spinner.ThemedSpinnerAdapter {
		public class ArrayAdapter<T> extends BaseAdapter implements Filterable, ThemedSpinnerAdapter {
		/**
		* Contains the list of objects that represent the data of this ArrayAdapter.
		* The content of this list is referred to as "the array" in the documentation.

core/java/android/widget/CursorAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import android.view.ViewGroup;
		* columns.
		*/
		public abstract class CursorAdapter extends BaseAdapter implements Filterable,
		CursorFilter.CursorFilterClient, Spinner.ThemedSpinnerAdapter {
		CursorFilter.CursorFilterClient, ThemedSpinnerAdapter {
		/**
		* This field should be made private, so it is hidden from the SDK.
		* {@hide}

core/java/android/widget/SimpleAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ import java.util.Map;
		* </ul>
		* If no appropriate binding can be found, an {@link IllegalStateException} is thrown.
		*/
		public class SimpleAdapter extends BaseAdapter implements Filterable, Spinner.ThemedSpinnerAdapter {
		public class SimpleAdapter extends BaseAdapter implements Filterable, ThemedSpinnerAdapter {
		private int[] mTo;
		private String[] mFrom;
		private ViewBinder mViewBinder;