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/widget/ActivityChooserView.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/widget/ActivityChooserView.java')
| -rw-r--r-- | core/java/android/widget/ActivityChooserView.java | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |