Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mention <intent> can't have string resources." into oc-dev

Browse Source 
am: 6c3e92bbe9

Change-Id: I7f4a77fd3dd98955ad4f6e88b6471d72190a3977
This commit is contained in:
Makoto Onuki
2017-03-29 23:32:54 +00:00
committed by android-build-merger
parent 742d336461 6c3e92bbe9
commit d76076a103
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/ShortcutManager.java
View File

@@ -242,6 +242,7 @@ import java.util.List;
* You can provide multiple intents for a single shortcut so that the last defined activity is launched
* with the other activities in the <a href="/guide/components/tasks-and-back-stack.html">back stack</a>.
* See {@link android.app.TaskStackBuilder} for details.
* <p><b>Note:</b> String resources may not be used within an {@code <intent>} element.
* </dd>
* <dt>{@code categories}</dt>
* <dd>Specify shortcut categories. Currently only