commit 972f20f3e355c8efd45f8044af3b8c45334e54af
author Tony Wickham <twickham@google.com> Mon Apr 03 23:45:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 23:45:48 2017 +0000
tree 2fb175c730003fd4dcccc0274fd7cdfb4048f965
parent 624e2b0083fe65cd4ed2bfc6d456eb3404a67004
parent 2f54a1625ae031ffbb2a99a00c7b25de3c677828

Small UI fix for widgets/app info shortcuts
am: 2f54a1625a

Change-Id: I3cdd215d4eca70c684ca88f763caeb829a7ce930

src/com/android/launcher3/popup/PopupDataProvider.java

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index b101bc5..c1a9ba1 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -50,8 +50,8 @@
 
     /** Note that these are in order of priority. */
     public static final SystemShortcut[] SYSTEM_SHORTCUTS = new SystemShortcut[] {
-            new SystemShortcut.Widgets(),
             new SystemShortcut.AppInfo(),
+            new SystemShortcut.Widgets(),
     };
 
     private final Launcher mLauncher;

src/com/android/launcher3/popup/PopupPopulator.java

diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java
index a9f219b..838b9b1 100644
--- a/src/com/android/launcher3/popup/PopupPopulator.java
+++ b/src/com/android/launcher3/popup/PopupPopulator.java
@@ -211,12 +211,17 @@
 
                 // This ensures that mLauncher.getWidgetsForPackageUser()
                 // doesn't return null (it puts all the widgets in memory).
-                launcher.notifyWidgetProvidersChanged(true /* force */);
                 for (int i = 0; i < PopupDataProvider.SYSTEM_SHORTCUTS.length; i++) {
                     final SystemShortcut systemShortcut = PopupDataProvider.SYSTEM_SHORTCUTS[i];
                     uiHandler.post(new UpdateSystemShortcutChild(container,
                             systemShortcutViews.get(i), systemShortcut, launcher, originalInfo));
                 }
+                uiHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        launcher.notifyWidgetProvidersChanged(true /* force */);
+                    }
+                });
             }
         };
     }