summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/ActionMode.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-02-18 19:23:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-18 19:24:01 +0000
commita42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3 (patch)
treea8f93f9b6c9727807af4749b7a2bcad51e360efd /core/java/android/view/ActionMode.java
parentfbf255125bbab3c8a2753a9001cc2cf373120a0f (diff)
parent7b9c912f536925ac6ec43935d6e97506851b33d6 (diff)
downloadframeworks_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/ActionMode.java')
-rw-r--r--core/java/android/view/ActionMode.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/ActionMode.java b/core/java/android/view/ActionMode.java
index ae4b60f..a018138 100644
--- a/core/java/android/view/ActionMode.java
+++ b/core/java/android/view/ActionMode.java
@@ -17,6 +17,8 @@
package android.view;
+import android.annotation.StringRes;
+
/**
* Represents a contextual mode of the user interface. Action modes can be used to provide
* alternative interaction modes and replace parts of the normal UI until finished.
@@ -93,7 +95,7 @@ public abstract class ActionMode {
* @see #setTitle(CharSequence)
* @see #setCustomView(View)
*/
- public abstract void setTitle(int resId);
+ public abstract void setTitle(@StringRes int resId);
/**
* Set the subtitle of the action mode. This method will have no visible effect if
@@ -115,7 +117,7 @@ public abstract class ActionMode {
* @see #setSubtitle(CharSequence)
* @see #setCustomView(View)
*/
- public abstract void setSubtitle(int resId);
+ public abstract void setSubtitle(@StringRes int resId);
/**
* Set whether or not the title/subtitle display for this action mode