Merge "Public API for android.widget.Spinner properties" (1ce891bc) · Commits · e / os / android_frameworks_base

api/current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -27495,9 +27495,19 @@ package android.widget {
		ctor public Spinner(android.content.Context, android.util.AttributeSet);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int);
		ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int);
		method public int getDropDownHorizontalOffset();
		method public int getDropDownVerticalOffset();
		method public int getDropDownWidth();
		method public int getGravity();
		method public android.graphics.drawable.Drawable getPopupBackground();
		method public java.lang.CharSequence getPrompt();
		method public void onClick(android.content.DialogInterface, int);
		method public void setDropDownHorizontalOffset(int);
		method public void setDropDownVerticalOffset(int);
		method public void setDropDownWidth(int);
		method public void setGravity(int);
		method public void setPopupBackgroundDrawable(android.graphics.drawable.Drawable);
		method public void setPopupBackgroundResource(int);
		method public void setPrompt(java.lang.CharSequence);
		method public void setPromptId(int);
		field public static final int MODE_DIALOG = 0; // 0x0
		@@ -27534,8 +27544,10 @@ package android.widget {
		method public void setTextOff(java.lang.CharSequence);
		method public void setTextOn(java.lang.CharSequence);
		method public void setThumbDrawable(android.graphics.drawable.Drawable);
		method public void setThumbResource(int);
		method public void setThumbTextPadding(int);
		method public void setTrackDrawable(android.graphics.drawable.Drawable);
		method public void setTrackResource(int);
		}

		public class TabHost extends android.widget.FrameLayout implements android.view.ViewTreeObserver.OnTouchModeChangeListener {

core/java/android/widget/Spinner.java

+172 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.database.DataSetObserver;
		import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.Gravity;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -202,6 +203,130 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		}
		}

		/**
		* Set the background drawable for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; this method is a no-op in other modes.
		*
		* @param background Background drawable
		*
		* @attr ref android.R.styleable#Spinner_popupBackground
		*/
		public void setPopupBackgroundDrawable(Drawable background) {
		if (!(mPopup instanceof DropdownPopup)) {
		Log.e(TAG, "setPopupBackgroundDrawable: incompatible spinner mode; ignoring...");
		return;
		}
		((DropdownPopup) mPopup).setBackgroundDrawable(background);
		}

		/**
		* Set the background drawable for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; this method is a no-op in other modes.
		*
		* @param background Resource ID of a background drawable
		*
		* @attr ref android.R.styleable#Spinner_popupBackground
		*/
		public void setPopupBackgroundResource(int resId) {
		setPopupBackgroundDrawable(getContext().getResources().getDrawable(resId));
		}

		/**
		* Get the background drawable for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; other modes will return null.
		*
		* @return background Background drawable
		*
		* @attr ref android.R.styleable#Spinner_popupBackground
		*/
		public Drawable getPopupBackground() {
		return mPopup.getBackground();
		}

		/**
		* Set a vertical offset in pixels for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; this method is a no-op in other modes.
		*
		* @param pixels Vertical offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownVerticalOffset
		*/
		public void setDropDownVerticalOffset(int pixels) {
		mPopup.setVerticalOffset(pixels);
		}

		/**
		* Get the configured vertical offset in pixels for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; other modes will return 0.
		*
		* @return Vertical offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownVerticalOffset
		*/
		public int getDropDownVerticalOffset() {
		return mPopup.getVerticalOffset();
		}

		/**
		* Set a horizontal offset in pixels for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; this method is a no-op in other modes.
		*
		* @param pixels Horizontal offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset
		*/
		public void setDropDownHorizontalOffset(int pixels) {
		mPopup.setHorizontalOffset(pixels);
		}

		/**
		* Get the configured horizontal offset in pixels for the spinner's popup window of choices.
		* Only valid in {@link #MODE_DROPDOWN}; other modes will return 0.
		*
		* @return Horizontal offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset
		*/
		public int getDropDownHorizontalOffset() {
		return mPopup.getHorizontalOffset();
		}

		/**
		* Set the width of the spinner's popup window of choices in pixels. This value
		* may also be set to {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}
		* to match the width of the Spinner itself, or
		* {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} to wrap to the measured size
		* of contained dropdown list items.
		*
		* <p>Only valid in {@link #MODE_DROPDOWN}; this method is a no-op in other modes.</p>
		*
		* @param pixels Width in pixels, WRAP_CONTENT, or MATCH_PARENT
		*
		* @attr ref android.R.styleable#Spinner_dropDownWidth
		*/
		public void setDropDownWidth(int pixels) {
		if (!(mPopup instanceof DropdownPopup)) {
		Log.e(TAG, "Cannot set dropdown width for MODE_DIALOG, ignoring");
		return;
		}
		mDropDownWidth = pixels;
		}

		/**
		* Get the configured width of the spinner's popup window of choices in pixels.
		* The returned value may also be {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}
		* meaning the popup window will match the width of the Spinner itself, or
		* {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} to wrap to the measured size
		* of contained dropdown list items.
		*
		* @return Width in pixels, WRAP_CONTENT, or MATCH_PARENT
		*
		* @attr ref android.R.styleable#Spinner_dropDownWidth
		*/
		public int getDropDownWidth() {
		return mDropDownWidth;
		}

		@Override
		public void setEnabled(boolean enabled) {
		super.setEnabled(enabled);
		@@ -231,6 +356,16 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		}
		}

		/**
		* Describes how the selected item view is positioned. The default is determined by the
		* current theme.
		*
		* @return A {@link android.view.Gravity Gravity} value
		*/
		public int getGravity() {
		return mGravity;
		}

		@Override
		public void setAdapter(SpinnerAdapter adapter) {
		super.setAdapter(adapter);
		@@ -675,6 +810,13 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		*/
		public void setPromptText(CharSequence hintText);
		public CharSequence getHintText();

		public void setBackgroundDrawable(Drawable bg);
		public void setVerticalOffset(int px);
		public void setHorizontalOffset(int px);
		public Drawable getBackground();
		public int getVerticalOffset();
		public int getHorizontalOffset();
		}

		private class DialogPopup implements SpinnerPopup, DialogInterface.OnClickListener {
		@@ -719,6 +861,36 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		}
		dismiss();
		}

		@Override
		public void setBackgroundDrawable(Drawable bg) {
		Log.e(TAG, "Cannot set popup background for MODE_DIALOG, ignoring");
		}

		@Override
		public void setVerticalOffset(int px) {
		Log.e(TAG, "Cannot set vertical offset for MODE_DIALOG, ignoring");
		}

		@Override
		public void setHorizontalOffset(int px) {
		Log.e(TAG, "Cannot set horizontal offset for MODE_DIALOG, ignoring");
		}

		@Override
		public Drawable getBackground() {
		return null;
		}

		@Override
		public int getVerticalOffset() {
		return 0;
		}

		@Override
		public int getHorizontalOffset() {
		return 0;
		}
		}

		private class DropdownPopup extends ListPopupWindow implements SpinnerPopup {

core/java/android/widget/Switch.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -358,6 +358,17 @@ public class Switch extends CompoundButton {
		requestLayout();
		}

		/**
		* Set the drawable used for the track that the switch slides within.
		*
		* @param track Resource ID of a track drawable
		*
		* @attr ref android.R.styleable#Switch_track
		*/
		public void setTrackResource(int resId) {
		setTrackDrawable(getContext().getResources().getDrawable(resId));
		}

		/**
		* Get the drawable used for the track that the switch slides within.
		*
		@@ -382,6 +393,18 @@ public class Switch extends CompoundButton {
		requestLayout();
		}

		/**
		* Set the drawable used for the switch "thumb" - the piece that the user
		* can physically touch and drag along the track.
		*
		* @param thumb Resource ID of a thumb drawable
		*
		* @attr ref android.R.styleable#Switch_thumb
		*/
		public void setThumbResource(int resId) {
		setThumbDrawable(getContext().getResources().getDrawable(resId));
		}

		/**
		* Get the drawable used for the switch "thumb" - the piece that the user
		* can physically touch and drag along the track.