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/ContextMenu.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/ContextMenu.java')
| -rw-r--r-- | core/java/android/view/ContextMenu.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/ContextMenu.java b/core/java/android/view/ContextMenu.java index decabcb..85fe421 100644 --- a/core/java/android/view/ContextMenu.java +++ b/core/java/android/view/ContextMenu.java @@ -16,6 +16,8 @@ package android.view; +import android.annotation.DrawableRes; +import android.annotation.StringRes; import android.app.Activity; import android.graphics.drawable.Drawable; import android.widget.AdapterView; @@ -44,7 +46,7 @@ public interface ContextMenu extends Menu { * @param titleRes The string resource identifier used for the title. * @return This ContextMenu so additional setters can be called. */ - public ContextMenu setHeaderTitle(int titleRes); + public ContextMenu setHeaderTitle(@StringRes int titleRes); /** * Sets the context menu header's title to the title given in <var>title</var>. @@ -61,7 +63,7 @@ public interface ContextMenu extends Menu { * @param iconRes The resource identifier used for the icon. * @return This ContextMenu so additional setters can be called. */ - public ContextMenu setHeaderIcon(int iconRes); + public ContextMenu setHeaderIcon(@DrawableRes int iconRes); /** * Sets the context menu header's icon to the icon given in <var>icon</var> |