diff options
| -rw-r--r-- | api/current.txt | 8 | ||||
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ToggleButton.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ViewFlipper.java | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 8c8160120c6d..8debaa5c2f0d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -54949,7 +54949,6 @@ package android.widget { method public int getCheckedItemPosition(); method public android.util.SparseBooleanArray getCheckedItemPositions(); method public int getChoiceMode(); - method public boolean getDrawSelectorOnTop(); method public int getListPaddingBottom(); method public int getListPaddingLeft(); method public int getListPaddingRight(); @@ -54962,6 +54961,7 @@ package android.widget { method protected void handleDataChanged(); method public boolean hasTextFilter(); method public void invalidateViews(); + method public boolean isDrawSelectorOnTop(); method public boolean isFastScrollAlwaysVisible(); method @android.view.ViewDebug.ExportedProperty public boolean isFastScrollEnabled(); 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); 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 getTextOn(); 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 { ctor public ViewFlipper(android.content.Context); 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 isFlipping(); 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 stopFlipping(); } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 7ca2304f6d9f..6eceb00308e1 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2821,7 +2821,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te * @attr ref android.R.styleable#AbsListView_drawSelectorOnTop */ @InspectableProperty - public boolean getDrawSelectorOnTop() { + public boolean isDrawSelectorOnTop() { return mDrawSelectorOnTop; } diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java index b76c2cafd912..9255ccb5cda7 100644 --- a/core/java/android/widget/ToggleButton.java +++ b/core/java/android/widget/ToggleButton.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.FloatRange; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; @@ -129,6 +130,7 @@ public class ToggleButton extends CompoundButton { * @return the alpha value, 0.0-1.0 */ @InspectableProperty + @FloatRange(from = 0.0, to = 1.0) public float getDisabledAlpha() { return mDisabledAlpha; } diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 414b1369d23e..b962298e3d46 100644 --- a/core/java/android/widget/ViewFlipper.java +++ b/core/java/android/widget/ViewFlipper.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.IntRange; import android.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; import android.content.Context; @@ -130,7 +131,7 @@ public class ViewFlipper extends ViewAnimator { * time in milliseconds */ @android.view.RemotableViewMethod - public void setFlipInterval(int milliseconds) { + public void setFlipInterval(@IntRange(from = 0) int milliseconds) { mFlipInterval = milliseconds; } @@ -140,6 +141,7 @@ public class ViewFlipper extends ViewAnimator { * @return delay time in milliseconds */ @InspectableProperty + @IntRange(from = 0) public int getFlipInterval() { return mFlipInterval; } |