Merge "Improve widget getters" (645d5405) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

core/java/android/widget/AbsListView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2821,7 +2821,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
	* @attr ref android.R.styleable#AbsListView_drawSelectorOnTop		* @attr ref android.R.styleable#AbsListView_drawSelectorOnTop
	*/		*/
	@InspectableProperty		@InspectableProperty
	public boolean getDrawSelectorOnTop() {		public boolean isDrawSelectorOnTop() {
	return mDrawSelectorOnTop;		return mDrawSelectorOnTop;
	}		}

core/java/android/widget/ToggleButton.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.widget;		package android.widget;

			import android.annotation.FloatRange;
	import android.content.Context;		import android.content.Context;
	import android.content.res.TypedArray;		import android.content.res.TypedArray;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	@@ -129,6 +130,7 @@ public class ToggleButton extends CompoundButton {
	* @return the alpha value, 0.0-1.0		* @return the alpha value, 0.0-1.0
	*/		*/
	@InspectableProperty		@InspectableProperty
			@FloatRange(from = 0.0, to = 1.0)
	public float getDisabledAlpha() {		public float getDisabledAlpha() {
	return mDisabledAlpha;		return mDisabledAlpha;
	}		}

core/java/android/widget/ViewFlipper.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.widget;		package android.widget;

			import android.annotation.IntRange;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	@@ -130,7 +131,7 @@ public class ViewFlipper extends ViewAnimator {
	* time in milliseconds		* time in milliseconds
	*/		*/
	@android.view.RemotableViewMethod		@android.view.RemotableViewMethod
	public void setFlipInterval(int milliseconds) {		public void setFlipInterval(@IntRange(from = 0) int milliseconds) {
	mFlipInterval = milliseconds;		mFlipInterval = milliseconds;
	}		}

	@@ -140,6 +141,7 @@ public class ViewFlipper extends ViewAnimator {
	* @return delay time in milliseconds		* @return delay time in milliseconds
	*/		*/
	@InspectableProperty		@InspectableProperty
			@IntRange(from = 0)
	public int getFlipInterval() {		public int getFlipInterval() {
	return mFlipInterval;		return mFlipInterval;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -54949,7 +54949,6 @@ package android.widget {
	method public int getCheckedItemPosition();		method public int getCheckedItemPosition();
	method public android.util.SparseBooleanArray getCheckedItemPositions();		method public android.util.SparseBooleanArray getCheckedItemPositions();
	method public int getChoiceMode();		method public int getChoiceMode();
	method public boolean getDrawSelectorOnTop();
	method public int getListPaddingBottom();		method public int getListPaddingBottom();
	method public int getListPaddingLeft();		method public int getListPaddingLeft();
	method public int getListPaddingRight();		method public int getListPaddingRight();
	@@ -54962,6 +54961,7 @@ package android.widget {
	method protected void handleDataChanged();		method protected void handleDataChanged();
	method public boolean hasTextFilter();		method public boolean hasTextFilter();
	method public void invalidateViews();		method public void invalidateViews();
			method public boolean isDrawSelectorOnTop();
	method public boolean isFastScrollAlwaysVisible();		method public boolean isFastScrollAlwaysVisible();
	method @android.view.ViewDebug.ExportedProperty public boolean isFastScrollEnabled();		method @android.view.ViewDebug.ExportedProperty public boolean isFastScrollEnabled();
	method protected boolean isInFilterMode();		method protected boolean isInFilterMode();
	@@ -57550,7 +57550,7 @@ package android.widget {
	ctor public ToggleButton(android.content.Context, android.util.AttributeSet, int);		ctor public ToggleButton(android.content.Context, android.util.AttributeSet, int);
	ctor public ToggleButton(android.content.Context, android.util.AttributeSet);		ctor public ToggleButton(android.content.Context, android.util.AttributeSet);
	ctor public ToggleButton(android.content.Context);		ctor public ToggleButton(android.content.Context);
	method public float getDisabledAlpha();		method @FloatRange(from=0.0, to=1.0) public float getDisabledAlpha();
	method public CharSequence getTextOff();		method public CharSequence getTextOff();
	method public CharSequence getTextOn();		method public CharSequence getTextOn();
	method public void setBackgroundDrawable(android.graphics.drawable.Drawable);		method public void setBackgroundDrawable(android.graphics.drawable.Drawable);
	@@ -57711,11 +57711,11 @@ package android.widget {
	@android.widget.RemoteViews.RemoteView public class ViewFlipper extends android.widget.ViewAnimator {		@android.widget.RemoteViews.RemoteView public class ViewFlipper extends android.widget.ViewAnimator {
	ctor public ViewFlipper(android.content.Context);		ctor public ViewFlipper(android.content.Context);
	ctor public ViewFlipper(android.content.Context, android.util.AttributeSet);		ctor public ViewFlipper(android.content.Context, android.util.AttributeSet);
	method public int getFlipInterval();		method @IntRange(from=0) public int getFlipInterval();
	method public boolean isAutoStart();		method public boolean isAutoStart();
	method public boolean isFlipping();		method public boolean isFlipping();
	method public void setAutoStart(boolean);		method public void setAutoStart(boolean);
	method public void setFlipInterval(int);		method public void setFlipInterval(@IntRange(from=0) int);
	method public void startFlipping();		method public void startFlipping();
	method public void stopFlipping();		method public void stopFlipping();
	}		}