diff options
| author | Mario Bertschler <bmario@google.com> | 2017-08-08 16:26:18 -0700 |
|---|---|---|
| committer | Mario Bertschler <bmario@google.com> | 2017-08-24 12:23:06 -0700 |
| commit | 8ff9e1d6790d64eb5f8ad9e9721e607978b50583 (patch) | |
| tree | 20f615100c3abb597c7946baf546eaaa667fde7e /src/com/android/launcher3/Launcher.java | |
| parent | 9b745a82bf5cf8bf9383b63179d0a750e9ab9ab6 (diff) | |
| download | android_packages_apps_Trebuchet-8ff9e1d6790d64eb5f8ad9e9721e607978b50583.tar.gz android_packages_apps_Trebuchet-8ff9e1d6790d64eb5f8ad9e9721e607978b50583.tar.bz2 android_packages_apps_Trebuchet-8ff9e1d6790d64eb5f8ad9e9721e607978b50583.zip | |
Integrating suggested app by handling new status flags for shortcut items.
Guarded via feature flag SUGGESTED_APP.
Bug: 62483883
Change-Id: I7e0c8a9875bc37c435aa4316b44322a628cd4826
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8492a7985..614d08669 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -113,7 +113,6 @@ import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.shortcuts.DeepShortcutManager; -import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; @@ -121,6 +120,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType; import com.android.launcher3.util.ActivityResultInfo; import com.android.launcher3.util.RunnableWithId; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.ComponentKeyMapper; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.MultiHashMap; import com.android.launcher3.util.PackageManagerHelper; @@ -2424,7 +2424,7 @@ public class Launcher extends BaseActivity } // Check for abandoned promise - if ((v instanceof BubbleTextView) && shortcut.isPromise()) { + if ((v instanceof BubbleTextView) && shortcut.hasPromiseIconUi()) { String packageName = shortcut.intent.getComponent() != null ? shortcut.intent.getComponent().getPackageName() : shortcut.intent.getPackage(); if (!TextUtils.isEmpty(packageName)) { @@ -3068,7 +3068,7 @@ public class Launcher extends BaseActivity */ public void tryAndUpdatePredictedApps() { if (mLauncherCallbacks != null) { - List<ComponentKey> apps = mLauncherCallbacks.getPredictedApps(); + List<ComponentKeyMapper<AppInfo>> apps = mLauncherCallbacks.getPredictedApps(); if (apps != null) { mAppsView.setPredictedApps(apps); } |