Merge "Fix docs build" into lmp-dev (76d149a5) · Commits · e / os / android_frameworks_base

core/java/android/widget/AutoCompleteTextView.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -84,8 +84,8 @@ import java.lang.ref.WeakReference;
		* @attr ref android.R.styleable#AutoCompleteTextView_dropDownAnchor
		* @attr ref android.R.styleable#AutoCompleteTextView_dropDownWidth
		* @attr ref android.R.styleable#AutoCompleteTextView_dropDownHeight
		* @attr ref android.R.styleable#AutoCompleteTextView_dropDownVerticalOffset
		* @attr ref android.R.styleable#AutoCompleteTextView_dropDownHorizontalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		public class AutoCompleteTextView extends EditText implements Filter.FilterListener {
		static final boolean DEBUG = false;
		@@ -364,6 +364,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		* <p>Sets the vertical offset used for the auto-complete drop-down list.</p>
		*
		* @param offset the vertical offset
		*
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		*/
		public void setDropDownVerticalOffset(int offset) {
		mPopup.setVerticalOffset(offset);
		@@ -373,6 +375,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		* <p>Gets the vertical offset used for the auto-complete drop-down list.</p>
		*
		* @return the vertical offset
		*
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		*/
		public int getDropDownVerticalOffset() {
		return mPopup.getVerticalOffset();
		@@ -382,6 +386,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		* <p>Sets the horizontal offset used for the auto-complete drop-down list.</p>
		*
		* @param offset the horizontal offset
		*
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		public void setDropDownHorizontalOffset(int offset) {
		mPopup.setHorizontalOffset(offset);
		@@ -391,6 +397,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		* <p>Gets the horizontal offset used for the auto-complete drop-down list.</p>
		*
		* @return the horizontal offset
		*
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		public int getDropDownHorizontalOffset() {
		return mPopup.getHorizontalOffset();

core/java/android/widget/Spinner.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -49,14 +49,14 @@ import android.widget.PopupWindow.OnDismissListener;
		*
		* <p>See the <a href="{@docRoot}guide/topics/ui/controls/spinner.html">Spinners</a> guide.</p>
		*
		* @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset
		* @attr ref android.R.styleable#Spinner_dropDownSelector
		* @attr ref android.R.styleable#Spinner_dropDownVerticalOffset
		* @attr ref android.R.styleable#Spinner_dropDownWidth
		* @attr ref android.R.styleable#Spinner_gravity
		* @attr ref android.R.styleable#Spinner_popupBackground
		* @attr ref android.R.styleable#Spinner_prompt
		* @attr ref android.R.styleable#Spinner_spinnerMode
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		@Widget
		public class Spinner extends AbsSpinner implements OnClickListener {
		@@ -292,7 +292,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		*
		* @param pixels Vertical offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownVerticalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		*/
		public void setDropDownVerticalOffset(int pixels) {
		mPopup.setVerticalOffset(pixels);
		@@ -304,7 +304,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		*
		* @return Vertical offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownVerticalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
		*/
		public int getDropDownVerticalOffset() {
		return mPopup.getVerticalOffset();
		@@ -316,7 +316,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		*
		* @param pixels Horizontal offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		public void setDropDownHorizontalOffset(int pixels) {
		mPopup.setHorizontalOffset(pixels);
		@@ -328,7 +328,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		*
		* @return Horizontal offset in pixels
		*
		* @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset
		* @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
		*/
		public int getDropDownHorizontalOffset() {
		return mPopup.getHorizontalOffset();

core/res/res/values/attrs.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -4219,7 +4219,6 @@
		<!-- Whether the popup window should overlap its anchor view. -->
		<attr name="overlapAnchor" format="boolean" />
		</declare-styleable>
		<!-- @hide -->
		<declare-styleable name="ListPopupWindow">
		<!-- Amount of pixels by which the drop down should be offset vertically. -->
		<attr name="dropDownVerticalOffset" format="dimension" />