diff options
author | Tor Norbye <tnorbye@google.com> | 2013-05-30 16:48:33 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2015-02-18 07:49:03 -0800 |
commit | 7b9c912f536925ac6ec43935d6e97506851b33d6 (patch) | |
tree | 8dd71557e2555fde0d506ef77c46dc29184e91c4 /core/java/android/widget | |
parent | 44bc07d8740058398d4009615681120168673dd8 (diff) | |
download | frameworks_base-7b9c912f536925ac6ec43935d6e97506851b33d6.zip frameworks_base-7b9c912f536925ac6ec43935d6e97506851b33d6.tar.gz frameworks_base-7b9c912f536925ac6ec43935d6e97506851b33d6.tar.bz2 |
Add @ResourceInt annotations on APIs
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
Diffstat (limited to 'core/java/android/widget')
-rw-r--r-- | core/java/android/widget/AbsListView.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/ActivityChooserView.java | 5 | ||||
-rw-r--r-- | core/java/android/widget/ArrayAdapter.java | 17 | ||||
-rw-r--r-- | core/java/android/widget/AutoCompleteTextView.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/CalendarView.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/CheckedTextView.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/CompoundButton.java | 1 | ||||
-rw-r--r-- | core/java/android/widget/ImageSwitcher.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/ImageView.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/ListView.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/PopupMenu.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/ProgressBar.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/RadioGroup.java | 8 | ||||
-rw-r--r-- | core/java/android/widget/Spinner.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/Switch.java | 8 | ||||
-rw-r--r-- | core/java/android/widget/TabWidget.java | 7 | ||||
-rw-r--r-- | core/java/android/widget/TextView.java | 21 | ||||
-rw-r--r-- | core/java/android/widget/Toast.java | 5 |
18 files changed, 64 insertions, 41 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index e87a117..164283d 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; @@ -2712,7 +2713,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te * * @attr ref android.R.styleable#AbsListView_listSelector */ - public void setSelector(int resID) { + public void setSelector(@DrawableRes int resID) { setSelector(getContext().getDrawable(resID)); } diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java index f9af2f9..f34ad71 100644 --- a/core/java/android/widget/ActivityChooserView.java +++ b/core/java/android/widget/ActivityChooserView.java @@ -18,6 +18,7 @@ package android.widget; import com.android.internal.R; +import android.annotation.StringRes; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -334,7 +335,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod * * @param resourceId The content description resource id. */ - public void setExpandActivityOverflowButtonContentDescription(int resourceId) { + public void setExpandActivityOverflowButtonContentDescription(@StringRes int resourceId) { CharSequence contentDescription = mContext.getString(resourceId); mExpandActivityOverflowButtonImage.setContentDescription(contentDescription); } @@ -514,7 +515,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod * * @param resourceId The resource id. */ - public void setDefaultActionButtonContentDescription(int resourceId) { + public void setDefaultActionButtonContentDescription(@StringRes int resourceId) { mDefaultActionButtonContentDescription = resourceId; } diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java index aff5e29..89e508f 100644 --- a/core/java/android/widget/ArrayAdapter.java +++ b/core/java/android/widget/ArrayAdapter.java @@ -16,6 +16,9 @@ package android.widget; +import android.annotation.ArrayRes; +import android.annotation.IdRes; +import android.annotation.LayoutRes; import android.content.Context; import android.content.res.Resources; import android.util.Log; @@ -106,7 +109,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * @param resource The resource ID for a layout file containing a TextView to use when * instantiating views. */ - public ArrayAdapter(Context context, int resource) { + public ArrayAdapter(Context context, @LayoutRes int resource) { this(context, resource, 0, new ArrayList<T>()); } @@ -118,7 +121,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * instantiating views. * @param textViewResourceId The id of the TextView within the layout resource to be populated */ - public ArrayAdapter(Context context, int resource, int textViewResourceId) { + public ArrayAdapter(Context context, @LayoutRes int resource, @IdRes int textViewResourceId) { this(context, resource, textViewResourceId, new ArrayList<T>()); } @@ -130,7 +133,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * instantiating views. * @param objects The objects to represent in the ListView. */ - public ArrayAdapter(Context context, int resource, T[] objects) { + public ArrayAdapter(Context context, @LayoutRes int resource, T[] objects) { this(context, resource, 0, Arrays.asList(objects)); } @@ -143,7 +146,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * @param textViewResourceId The id of the TextView within the layout resource to be populated * @param objects The objects to represent in the ListView. */ - public ArrayAdapter(Context context, int resource, int textViewResourceId, T[] objects) { + public ArrayAdapter(Context context, @LayoutRes int resource, @IdRes int textViewResourceId, T[] objects) { this(context, resource, textViewResourceId, Arrays.asList(objects)); } @@ -155,7 +158,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * instantiating views. * @param objects The objects to represent in the ListView. */ - public ArrayAdapter(Context context, int resource, List<T> objects) { + public ArrayAdapter(Context context, @LayoutRes int resource, List<T> objects) { this(context, resource, 0, objects); } @@ -405,7 +408,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * @param resource the layout resource defining the drop down views * @see #getDropDownView(int, android.view.View, android.view.ViewGroup) */ - public void setDropDownViewResource(int resource) { + public void setDropDownViewResource(@LayoutRes int resource) { this.mDropDownResource = resource; } @@ -457,7 +460,7 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, * @return An ArrayAdapter<CharSequence>. */ public static ArrayAdapter<CharSequence> createFromResource(Context context, - int textArrayResId, int textViewResId) { + @ArrayRes int textArrayResId, @LayoutRes int textViewResId) { CharSequence[] strings = context.getResources().getTextArray(textArrayResId); return new ArrayAdapter<CharSequence>(context, textViewResId, strings); } diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index e6392b9..01767d5 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.content.Context; import android.content.res.TypedArray; import android.database.DataSetObserver; @@ -356,7 +357,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @attr ref android.R.styleable#PopupWindow_popupBackground */ - public void setDropDownBackgroundResource(int id) { + public void setDropDownBackgroundResource(@DrawableRes int id) { mPopup.setBackgroundDrawable(getContext().getDrawable(id)); } diff --git a/core/java/android/widget/CalendarView.java b/core/java/android/widget/CalendarView.java index 5e43916..47fb8a7 100644 --- a/core/java/android/widget/CalendarView.java +++ b/core/java/android/widget/CalendarView.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.annotation.Widget; import android.content.Context; import android.content.res.Configuration; @@ -253,7 +254,7 @@ public class CalendarView extends FrameLayout { * * @attr ref android.R.styleable#CalendarView_selectedDateVerticalBar */ - public void setSelectedDateVerticalBar(int resourceId) { + public void setSelectedDateVerticalBar(@DrawableRes int resourceId) { mDelegate.setSelectedDateVerticalBar(resourceId); } diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java index 344d00a..84f0ee5 100644 --- a/core/java/android/widget/CheckedTextView.java +++ b/core/java/android/widget/CheckedTextView.java @@ -18,6 +18,7 @@ package android.widget; import com.android.internal.R; +import android.annotation.DrawableRes; import android.annotation.Nullable; import android.content.Context; import android.content.res.ColorStateList; @@ -32,7 +33,6 @@ import android.view.ViewDebug; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; - /** * An extension to TextView that supports the {@link android.widget.Checkable} interface. * This is useful when used in a {@link android.widget.ListView ListView} where the it's @@ -141,7 +141,7 @@ public class CheckedTextView extends TextView implements Checkable { * * @attr ref android.R.styleable#CheckedTextView_checkMark */ - public void setCheckMarkDrawable(int resid) { + public void setCheckMarkDrawable(@DrawableRes int resid) { if (resid != 0 && resid == mCheckMarkResource) { return; } diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java index f2afeeb..dbf82b6 100644 --- a/core/java/android/widget/CompoundButton.java +++ b/core/java/android/widget/CompoundButton.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.graphics.PorterDuff; import com.android.internal.R; +import android.annotation.DrawableRes; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; diff --git a/core/java/android/widget/ImageSwitcher.java b/core/java/android/widget/ImageSwitcher.java index 80e908a..81636a7 100644 --- a/core/java/android/widget/ImageSwitcher.java +++ b/core/java/android/widget/ImageSwitcher.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -23,7 +24,6 @@ import android.util.AttributeSet; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; - public class ImageSwitcher extends ViewSwitcher { public ImageSwitcher(Context context) @@ -35,7 +35,7 @@ public class ImageSwitcher extends ViewSwitcher super(context, attrs); } - public void setImageResource(int resid) + public void setImageResource(@DrawableRes int resid) { ImageView image = (ImageView)this.getNextView(); image.setImageResource(resid); diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index dd9bdb6..9831dca 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.annotation.Nullable; import android.content.ContentResolver; import android.content.Context; @@ -387,7 +388,7 @@ public class ImageView extends View { * @attr ref android.R.styleable#ImageView_src */ @android.view.RemotableViewMethod - public void setImageResource(int resId) { + public void setImageResource(@DrawableRes int resId) { // The resource configuration may have changed, so we should always // try to load the resource even if the resId hasn't changed. final int oldWidth = mDrawableWidth; diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 0aaef6d..f9c7faa 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -21,6 +21,7 @@ import com.android.internal.R; import com.android.internal.util.Predicate; import com.google.android.collect.Lists; +import android.annotation.IdRes; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; @@ -3630,7 +3631,7 @@ public class ListView extends AbsListView { * First look in our children, then in any header and footer views that may be scrolled off. */ @Override - protected View findViewTraversal(int id) { + protected View findViewTraversal(@IdRes int id) { View v; v = super.findViewTraversal(id); if (v == null) { diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java index 06ac1c3..1507dfb 100644 --- a/core/java/android/widget/PopupMenu.java +++ b/core/java/android/widget/PopupMenu.java @@ -22,6 +22,7 @@ import com.android.internal.view.menu.MenuPopupHelper; import com.android.internal.view.menu.MenuPresenter; import com.android.internal.view.menu.SubMenuBuilder; +import android.annotation.MenuRes; import android.content.Context; import android.view.Gravity; import android.view.Menu; @@ -205,7 +206,7 @@ public class PopupMenu implements MenuBuilder.Callback, MenuPresenter.Callback { * popupMenu.getMenuInflater().inflate(menuRes, popupMenu.getMenu()). * @param menuRes Menu resource to inflate */ - public void inflate(int menuRes) { + public void inflate(@MenuRes int menuRes) { getMenuInflater().inflate(menuRes, mMenu); } diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 5b0745e..406a274 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -21,6 +21,7 @@ import android.graphics.PorterDuff; import com.android.internal.R; +import android.annotation.InterpolatorRes; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; @@ -1508,7 +1509,7 @@ public class ProgressBar extends View { * @param context The application environment * @param resID The resource identifier of the interpolator to load */ - public void setInterpolator(Context context, int resID) { + public void setInterpolator(Context context, @InterpolatorRes int resID) { setInterpolator(AnimationUtils.loadInterpolator(context, resID)); } diff --git a/core/java/android/widget/RadioGroup.java b/core/java/android/widget/RadioGroup.java index f04bb3d..6586d11 100644 --- a/core/java/android/widget/RadioGroup.java +++ b/core/java/android/widget/RadioGroup.java @@ -18,6 +18,7 @@ package android.widget; import com.android.internal.R; +import android.annotation.IdRes; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -151,7 +152,7 @@ public class RadioGroup extends LinearLayout { * @see #getCheckedRadioButtonId() * @see #clearCheck() */ - public void check(int id) { + public void check(@IdRes int id) { // don't even bother if (id != -1 && (id == mCheckedId)) { return; @@ -168,7 +169,7 @@ public class RadioGroup extends LinearLayout { setCheckedId(id); } - private void setCheckedId(int id) { + private void setCheckedId(@IdRes int id) { mCheckedId = id; if (mOnCheckedChangeListener != null) { mOnCheckedChangeListener.onCheckedChanged(this, mCheckedId); @@ -193,6 +194,7 @@ public class RadioGroup extends LinearLayout { * * @attr ref android.R.styleable#RadioGroup_checkedButton */ + @IdRes public int getCheckedRadioButtonId() { return mCheckedId; } @@ -331,7 +333,7 @@ public class RadioGroup extends LinearLayout { * @param group the group in which the checked radio button has changed * @param checkedId the unique identifier of the newly checked radio button */ - public void onCheckedChanged(RadioGroup group, int checkedId); + public void onCheckedChanged(RadioGroup group, @IdRes int checkedId); } private class CheckedStateTracker implements CompoundButton.OnCheckedChangeListener { diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 6ee2b4c..f0bc303 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -18,6 +18,7 @@ package android.widget; import com.android.internal.R; +import android.annotation.DrawableRes; import android.annotation.Nullable; import android.annotation.Widget; import android.app.AlertDialog; @@ -46,7 +47,6 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ListPopupWindow.ForwardingListener; import android.widget.PopupWindow.OnDismissListener; - /** * A view that displays one child at a time and lets the user pick among them. * The items in the Spinner come from the {@link Adapter} associated with @@ -331,7 +331,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { * * @attr ref android.R.styleable#Spinner_popupBackground */ - public void setPopupBackgroundResource(int resId) { + public void setPopupBackgroundResource(@DrawableRes int resId) { setPopupBackgroundDrawable(getPopupContext().getDrawable(resId)); } diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index b959ddc..ce1834e 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -17,7 +17,9 @@ package android.widget; import android.animation.ObjectAnimator; +import android.annotation.DrawableRes; import android.annotation.Nullable; +import android.annotation.StyleRes; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -263,7 +265,7 @@ public class Switch extends CompoundButton { * * @attr ref android.R.styleable#Switch_switchTextAppearance */ - public void setSwitchTextAppearance(Context context, int resid) { + public void setSwitchTextAppearance(Context context, @StyleRes int resid) { TypedArray appearance = context.obtainStyledAttributes(resid, com.android.internal.R.styleable.TextAppearance); @@ -471,7 +473,7 @@ public class Switch extends CompoundButton { * * @attr ref android.R.styleable#Switch_track */ - public void setTrackResource(int resId) { + public void setTrackResource(@DrawableRes int resId) { setTrackDrawable(getContext().getDrawable(resId)); } @@ -593,7 +595,7 @@ public class Switch extends CompoundButton { * * @attr ref android.R.styleable#Switch_thumb */ - public void setThumbResource(int resId) { + public void setThumbResource(@DrawableRes int resId) { setThumbDrawable(getContext().getDrawable(resId)); } diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 88ecb13..f90a0a7 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -17,6 +17,7 @@ package android.widget; import android.R; +import android.annotation.DrawableRes; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -244,7 +245,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { * @param resId the resource identifier of the drawable to use as a * divider. */ - public void setDividerDrawable(int resId) { + public void setDividerDrawable(@DrawableRes int resId) { setDividerDrawable(mContext.getDrawable(resId)); } @@ -265,7 +266,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { * @param resId the resource identifier of the drawable to use as the * left strip drawable */ - public void setLeftStripDrawable(int resId) { + public void setLeftStripDrawable(@DrawableRes int resId) { setLeftStripDrawable(mContext.getDrawable(resId)); } @@ -286,7 +287,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { * @param resId the resource identifier of the drawable to use as the * right strip drawable */ - public void setRightStripDrawable(int resId) { + public void setRightStripDrawable(@DrawableRes int resId) { setRightStripDrawable(mContext.getDrawable(resId)); } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 848c1c0..f33ef75 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -17,8 +17,12 @@ package android.widget; import android.R; +import android.annotation.DrawableRes; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.StringRes; +import android.annotation.StyleRes; +import android.annotation.XmlRes; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; @@ -2173,7 +2177,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @attr ref android.R.styleable#TextView_drawableBottom */ @android.view.RemotableViewMethod - public void setCompoundDrawablesWithIntrinsicBounds(int left, int top, int right, int bottom) { + public void setCompoundDrawablesWithIntrinsicBounds(@DrawableRes int left, + @DrawableRes int top, @DrawableRes int right, @DrawableRes int bottom) { final Context context = getContext(); setCompoundDrawablesWithIntrinsicBounds(left != 0 ? context.getDrawable(left) : null, top != 0 ? context.getDrawable(top) : null, @@ -2374,8 +2379,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @attr ref android.R.styleable#TextView_drawableBottom */ @android.view.RemotableViewMethod - public void setCompoundDrawablesRelativeWithIntrinsicBounds(int start, int top, int end, - int bottom) { + public void setCompoundDrawablesRelativeWithIntrinsicBounds(@DrawableRes int start, + @DrawableRes int top, @DrawableRes int end, @DrawableRes int bottom) { final Context context = getContext(); setCompoundDrawablesRelativeWithIntrinsicBounds( start != 0 ? context.getDrawable(start) : null, @@ -2643,7 +2648,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * Sets the text color, size, style, hint color, and highlight color * from the specified TextAppearance resource. */ - public void setTextAppearance(Context context, int resid) { + public void setTextAppearance(Context context, @StyleRes int resid) { TypedArray appearance = context.obtainStyledAttributes(resid, com.android.internal.R.styleable.TextAppearance); @@ -4267,11 +4272,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } @android.view.RemotableViewMethod - public final void setText(int resid) { + public final void setText(@StringRes int resid) { setText(getContext().getResources().getText(resid)); } - public final void setText(int resid, BufferType type) { + public final void setText(@StringRes int resid, BufferType type) { setText(getContext().getResources().getText(resid), type); } @@ -4307,7 +4312,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @attr ref android.R.styleable#TextView_hint */ @android.view.RemotableViewMethod - public final void setHint(int resid) { + public final void setHint(@StringRes int resid) { setHint(getContext().getResources().getText(resid)); } @@ -4711,7 +4716,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @see EditorInfo#extras * @attr ref android.R.styleable#TextView_editorExtras */ - public void setInputExtras(int xmlResId) throws XmlPullParserException, IOException { + public void setInputExtras(@XmlRes int xmlResId) throws XmlPullParserException, IOException { createEditorIfNeeded(); XmlResourceParser parser = getResources().getXml(xmlResId); mEditor.createInputContentTypeIfNeeded(); diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java index be4cdc1..207f675 100644 --- a/core/java/android/widget/Toast.java +++ b/core/java/android/widget/Toast.java @@ -17,6 +17,7 @@ package android.widget; import android.annotation.IntDef; +import android.annotation.StringRes; import android.app.INotificationManager; import android.app.ITransientNotification; import android.content.Context; @@ -280,7 +281,7 @@ public class Toast { * * @throws Resources.NotFoundException if the resource can't be found. */ - public static Toast makeText(Context context, int resId, @Duration int duration) + public static Toast makeText(Context context, @StringRes int resId, @Duration int duration) throws Resources.NotFoundException { return makeText(context, context.getResources().getText(resId), duration); } @@ -289,7 +290,7 @@ public class Toast { * Update the text in a Toast that was previously created using one of the makeText() methods. * @param resId The new text for the Toast. */ - public void setText(int resId) { + public void setText(@StringRes int resId) { setText(mContext.getText(resId)); } |