Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f54a162 authored by Tony Wickham's avatar Tony Wickham
Browse files

Small UI fix for widgets/app info shortcuts 

- Switch order of widgets & more and app info.
- Start binding widgets after starting to update these shortcuts on the
  UI thread, so that they will show up without waiting for the bind
  logic, which can take a while. We already have a callback mechanism
  for enabling widgets & more after widgets are bound, so this was how
  it was supposed to work already.

Change-Id: I5f702f9c0814d30acf6298be309c6dc30727316e
parent 9b5a9758

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

+1 −1
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan 


    /** 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

+6 −1
Original line number Diff line number Diff line
@@ -211,12 +211,17 @@ public class PopupPopulator { 


                // 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 */);

                    }

                });

            }

        };

    }