diff options
| author | Kevin Hufnagle <khufnagle@google.com> | 2016-11-11 22:44:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-11 22:44:06 +0000 |
| commit | 867d09fe181312f745523afe00ec0039b06cdb6d (patch) | |
| tree | 45f404cb6668fd1e9cfa8ce3dd62594ac5a8c4a5 | |
| parent | 7cd6c3a084149131fca58894f3177c0717a15059 (diff) | |
| parent | 104f8053370f9e01ac2e8e23bc31d128e5fcc00b (diff) | |
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
| -rw-r--r-- | core/java/android/content/pm/ShortcutManager.java | 21 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/settings.jd | 4 |
2 files changed, 20 insertions, 5 deletions
diff --git a/core/java/android/content/pm/ShortcutManager.java b/core/java/android/content/pm/ShortcutManager.java index a93870ece823..f7c4d592b3a9 100644 --- a/core/java/android/content/pm/ShortcutManager.java +++ b/core/java/android/content/pm/ShortcutManager.java @@ -193,7 +193,11 @@ import java.util.List; * The following list includes descriptions for the different attributes within a static shortcut: * <dl> * <dt>{@code android:shortcutId}</dt> - * <dd>Mandatory shortcut ID</dd> + * <dd>Mandatory shortcut ID. + * <p> + * This must be a string literal. + * A resource string, such as <code>@string/foo</code>, cannot be used. + * </dd> * * <dt>{@code android:enabled}</dt> * <dd>Default is {@code true}. Can be set to {@code false} in order @@ -206,15 +210,24 @@ import java.util.List; * * <dt>{@code android:shortcutShortLabel}</dt> * <dd>Mandatory shortcut short label. - * See {@link ShortcutInfo.Builder#setShortLabel(CharSequence)}.</dd> + * See {@link ShortcutInfo.Builder#setShortLabel(CharSequence)}. + * <p> + * This must be a resource string, such as <code>@string/shortcut_label</code>. + * </dd> * * <dt>{@code android:shortcutLongLabel}</dt> * <dd>Shortcut long label. - * See {@link ShortcutInfo.Builder#setLongLabel(CharSequence)}.</dd> + * See {@link ShortcutInfo.Builder#setLongLabel(CharSequence)}. + * <p> + * This must be a resource string, such as <code>@string/shortcut_long_label</code>. + * </dd> * * <dt>{@code android:shortcutDisabledMessage}</dt> * <dd>When {@code android:enabled} is set to - * {@code false}, this attribute is used to display a custom disabled message.</dd> + * {@code false}, this attribute is used to display a custom disabled message. + * <p> + * This must be a resource string, such as <code>@string/shortcut_disabled_message</code>. + * </dd> * * <dt>{@code intent}</dt> * <dd>Intent to launch when the user selects the shortcut. diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd index 619fd268aef9..b51e6d97ae0a 100644 --- a/docs/html/guide/topics/ui/settings.jd +++ b/docs/html/guide/topics/ui/settings.jd @@ -390,7 +390,9 @@ setComponent()} method.</dd> <dd>The package part of the component name, as per the {@link android.content.Intent#setComponent setComponent()} method.</dd> </dl> - +<p class="note"><strong>Note: </strong>You must use string literals as the values for these +intent attributes. You cannot use resource strings, such as <code>@string/foo</code>, to define the attributes. +</p> <h2 id="Activity">Creating a Preference Activity</h2> |