commit 17ebdec113d902c97b5b7acdd390b4892d90c8d1
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 21 17:27:57 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 21 17:27:57 2018 +0000
tree d96e6a7d80e42beccfb5b796b9b932a1d8bc7c53
parent 2de013874ff472898be4d7e38a848275cf128584
parent b83c71aa24983e1a8b7910cad32cb49133891e55

Merge "Refactor "spring" code into one method." into ub-launcher3-edmonton-polish

Android.mk

diff --git a/Android.mk b/Android.mk
index f3eb244..3945746 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,7 +109,7 @@
 LOCAL_MIN_SDK_VERSION := 21
 LOCAL_PACKAGE_NAME := Launcher3Go
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest.xml \
@@ -199,7 +199,7 @@
 LOCAL_MIN_SDK_VERSION := 26
 LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/go/AndroidManifest.xml \

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 04a32f7..37538ae 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -640,6 +640,7 @@
             @Override
             public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
                 ShortcutInfo info = shortcutProvider.get();
+                getModelWriter().updateItemInDatabase(info);
                 ArrayList<ShortcutInfo> update = new ArrayList<>();
                 update.add(info);
                 bindUpdatedShortcuts(update, info.user);