diff options
| author | Mario Bertschler <bmario@google.com> | 2017-02-17 12:16:13 -0800 |
|---|---|---|
| committer | Mario Bertschler <bmario@google.com> | 2017-03-03 13:05:57 -0800 |
| commit | 0fc6f684e730b0137900fe317f2c759c1b3909c7 (patch) | |
| tree | 05b8a9aa9863127e6f9728c13a71968c9e5ab1c6 /src/com/android/launcher3/Launcher.java | |
| parent | 74480b7bca8451eaea64236cb4b4c8e31def6b9b (diff) | |
| download | android_packages_apps_Trebuchet-0fc6f684e730b0137900fe317f2c759c1b3909c7.tar.gz android_packages_apps_Trebuchet-0fc6f684e730b0137900fe317f2c759c1b3909c7.tar.bz2 android_packages_apps_Trebuchet-0fc6f684e730b0137900fe317f2c759c1b3909c7.zip | |
App discovery integration in All Apps search
This is the basis for app discovery integration while searching in all apps.
This does NOT include binding to the actual service and retrieving results,
but instead provides all the UI to show suggested instant apps and apps
from a store with star rating and pricing.
Change-Id: I1605b52848491acee4ac1d15c0112e6a768363f6
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 595e11ab9..f9e6f4b90 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1059,6 +1059,7 @@ public class Launcher extends BaseActivity if (mLauncherCallbacks != null) { mLauncherCallbacks.onResume(); } + } @Override @@ -2459,7 +2460,7 @@ public class Launcher extends BaseActivity throw new IllegalArgumentException("Input must have a valid intent"); } boolean success = startActivitySafely(v, intent, item); - getUserEventDispatcher().logAppLaunch(v, intent); + getUserEventDispatcher().logAppLaunch(v, intent); // TODO for discovered apps b/35802115 if (success && v instanceof BubbleTextView) { mWaitingForResume = (BubbleTextView) v; @@ -2708,9 +2709,10 @@ public class Launcher extends BaseActivity intent.setSourceBounds(getViewBounds(v)); } try { - if (Utilities.ATLEAST_MARSHMALLOW && item != null + if (Utilities.ATLEAST_MARSHMALLOW + && (item instanceof ShortcutInfo) && (item.itemType == Favorites.ITEM_TYPE_SHORTCUT - || item.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) + || item.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) && !((ShortcutInfo) item).isPromise()) { // Shortcuts need some special checks due to legacy reasons. startShortcutIntentSafely(intent, optsBundle, item); |