4d6b87ffdf06df3303239130ced685bc1a3fae50 - SHIFTPHONES/android_frameworks_base

commit	4d6b87ffdf06df3303239130ced685bc1a3fae50	[log] [tgz]
author	Makoto Onuki <omakoto@google.com>	Fri Jun 17 13:47:40 2016 -0700
committer	Makoto Onuki <omakoto@google.com>	Mon Jun 20 09:28:05 2016 -0700
tree	72c2c443ee212712c5381398b13690c1a7d22dfd
parent	a65d8b660986520a8d7b6ec4c363ce13e4560667 [diff]

Launcher shortcut callback should deliver manifest shortcuts too

- Also include "activity" in the key fields, as this is now an
important field.

- Also optimize ShortcutInfo parceling for the "key field only" case.

Bug 29394043
Bug 29451629

Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0

core/java/android/content/pm/LauncherApps.java[diff]
core/java/android/content/pm/ShortcutInfo.java[diff]
services/core/java/com/android/server/pm/LauncherAppsService.java[diff]
services/tests/servicestests/res/xml/shortcut_3.xml[Added - diff]
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java[diff]
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java[diff]
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java[diff]

8 files changed

tree: 72c2c443ee212712c5381398b13690c1a7d22dfd