App Shortcut: Clarify which attributes must be resources

am: 104f805337

Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7
This commit is contained in:
Makoto Onuki
2016-11-11 23:14:22 +00:00
committed by android-build-merger
2 changed files with 20 additions and 5 deletions

View File

@@ -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.

View File

@@ -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>