diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-18 19:23:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-18 19:24:01 +0000 |
| commit | a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3 (patch) | |
| tree | a8f93f9b6c9727807af4749b7a2bcad51e360efd /core/java/android/view/MenuItem.java | |
| parent | fbf255125bbab3c8a2753a9001cc2cf373120a0f (diff) | |
| parent | 7b9c912f536925ac6ec43935d6e97506851b33d6 (diff) | |
| download | frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.zip frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.gz frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.bz2 | |
Merge "Add @ResourceInt annotations on APIs"
Diffstat (limited to 'core/java/android/view/MenuItem.java')
| -rw-r--r-- | core/java/android/view/MenuItem.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/view/MenuItem.java b/core/java/android/view/MenuItem.java index e706c9c..9e8b97e 100644 --- a/core/java/android/view/MenuItem.java +++ b/core/java/android/view/MenuItem.java @@ -16,6 +16,9 @@ package android.view; +import android.annotation.DrawableRes; +import android.annotation.LayoutRes; +import android.annotation.StringRes; import android.app.Activity; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -165,7 +168,7 @@ public interface MenuItem { * @see #setTitleCondensed(CharSequence) */ - public MenuItem setTitle(int title); + public MenuItem setTitle(@StringRes int title); /** * Retrieve the current title of the item. @@ -214,7 +217,7 @@ public interface MenuItem { * @param iconRes The new icon (as a resource ID) to be displayed. * @return This Item so additional setters can be called. */ - public MenuItem setIcon(int iconRes); + public MenuItem setIcon(@DrawableRes int iconRes); /** * Returns the icon for this item as a Drawable (getting it from resources if it hasn't been @@ -511,7 +514,7 @@ public interface MenuItem { * * @see #setShowAsAction(int) */ - public MenuItem setActionView(int resId); + public MenuItem setActionView(@LayoutRes int resId); /** * Returns the currently set action view for this menu item. |