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

Commit b23980cc authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing duplicate/inconsistent definitions for model and callbacks 

> 2 implementations for filtering workspace items
> 2 implementations for binding widgets
> duplicate logic for add and update appInfo

Change-Id: Id68a49926af398478deca8ac85ab1f22341a9449
parent eeccd383

src/com/android/launcher3/Launcher.java

+20 −45
Original line number Diff line number Diff line
@@ -3249,13 +3249,13 @@ public class Launcher extends BaseActivity 
        }

    }



    @Override

    public void bindAppsAdded(final ArrayList<Long> newScreens,

                              final ArrayList<ItemInfo> addNotAnimated,

                              final ArrayList<ItemInfo> addAnimated,

                              final ArrayList<AppInfo> addedApps) {

                              final ArrayList<ItemInfo> addAnimated) {

        Runnable r = new Runnable() {

            public void run() {

                bindAppsAdded(newScreens, addNotAnimated, addAnimated, addedApps);

                bindAppsAdded(newScreens, addNotAnimated, addAnimated);

            }

        };

        if (waitUntilResume(r)) {
@@ -3270,20 +3270,14 @@ public class Launcher extends BaseActivity 
        // We add the items without animation on non-visible pages, and with

        // animations on the new page (which we will try and snap to).

        if (addNotAnimated != null && !addNotAnimated.isEmpty()) {

            bindItems(addNotAnimated, 0,

                    addNotAnimated.size(), false);

            bindItems(addNotAnimated, false);

        }

        if (addAnimated != null && !addAnimated.isEmpty()) {

            bindItems(addAnimated, 0,

                    addAnimated.size(), true);

            bindItems(addAnimated, true);

        }



        // Remove the extra empty screen

        mWorkspace.removeExtraEmptyScreen(false, false);



        if (addedApps != null && mAppsView != null) {

            mAppsView.addApps(addedApps);

        }

    }



    /**
@@ -3292,11 +3286,10 @@ public class Launcher extends BaseActivity 
     * Implementation of the method from LauncherModel.Callbacks.

     */

    @Override

    public void bindItems(final ArrayList<ItemInfo> items, final int start, final int end,

                          final boolean forceAnimateIcons) {

    public void bindItems(final List<ItemInfo> items, final boolean forceAnimateIcons) {

        Runnable r = new Runnable() {

            public void run() {

                bindItems(items, start, end, forceAnimateIcons);

                bindItems(items, forceAnimateIcons);

            }

        };

        if (waitUntilResume(r)) {
@@ -3309,7 +3302,8 @@ public class Launcher extends BaseActivity 
        final boolean animateIcons = forceAnimateIcons && canRunNewAppsAnimation();

        Workspace workspace = mWorkspace;

        long newItemsScreenId = -1;

        for (int i = start; i < end; i++) {

        int end = items.size();

        for (int i = 0; i < end; i++) {

            final ItemInfo item = items.get(i);



            // Short circuit if we are loading dock items for a configuration which has no dock
@@ -3334,19 +3328,10 @@ public class Launcher extends BaseActivity 
                    break;

                }

                case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET: {

                    LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) item;

                    if (mIsSafeModeEnabled) {

                        view = new PendingAppWidgetHostView(this, info, mIconCache, true);

                    } else {

                        LauncherAppWidgetProviderInfo providerInfo =

                                mAppWidgetManager.getLauncherAppWidgetInfo(info.appWidgetId);

                        if (providerInfo == null) {

                            deleteWidgetInfo(info);

                    view = bindAppWidget((LauncherAppWidgetInfo) item);

                    if (view == null) {

                        continue;

                    }

                        view = mAppWidgetHost.createView(this, info.appWidgetId, providerInfo);

                    }

                    prepareAppWidget((AppWidgetHostView) view, info);

                    break;

                }

                default:
@@ -3416,26 +3401,15 @@ public class Launcher extends BaseActivity 


    /**

     * Add the views for a widget to the workspace.

     *

     * Implementation of the method from LauncherModel.Callbacks.

     */

    public void bindAppWidget(final LauncherAppWidgetInfo item) {

        Runnable r = new Runnable() {

            public void run() {

                bindAppWidget(item);

            }

        };

        if (waitUntilResume(r)) {

            return;

        }



    public View bindAppWidget(LauncherAppWidgetInfo item) {

        if (mIsSafeModeEnabled) {

            PendingAppWidgetHostView view =

                    new PendingAppWidgetHostView(this, item, mIconCache, true);

            prepareAppWidget(view, item);

            mWorkspace.addInScreen(view, item);

            mWorkspace.requestLayout();

            return;

            return view;

        }



        final long start = DEBUG_WIDGETS ? SystemClock.uptimeMillis() : 0;
@@ -3465,7 +3439,7 @@ public class Launcher extends BaseActivity 
                            + ", as the provider is null");

                }

                getModelWriter().deleteItemFromDatabase(item);

                return;

                return null;

            }



            // If we do not have a valid id, try to bind an id.
@@ -3533,7 +3507,7 @@ public class Launcher extends BaseActivity 
            if (appWidgetInfo == null) {

                FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId);

                deleteWidgetInfo(item);

                return;

                return null;

            }



            item.minSpanX = appWidgetInfo.minSpanX;
@@ -3550,6 +3524,7 @@ public class Launcher extends BaseActivity 
            Log.d(TAG, "bound widget id="+item.appWidgetId+" in "

                    + (SystemClock.uptimeMillis()-start) + "ms");

        }

        return view;

    }



    /**
@@ -3744,10 +3719,10 @@ public class Launcher extends BaseActivity 
     *

     * Implementation of the method from LauncherModel.Callbacks.

     */

    public void bindAppsUpdated(final ArrayList<AppInfo> apps) {

    public void bindAppsAddedOrUpdated(final ArrayList<AppInfo> apps) {

        Runnable r = new Runnable() {

            public void run() {

                bindAppsUpdated(apps);

                bindAppsAddedOrUpdated(apps);

            }

        };

        if (waitUntilResume(r)) {
@@ -3755,7 +3730,7 @@ public class Launcher extends BaseActivity 
        }



        if (mAppsView != null) {

            mAppsView.updateApps(apps);

            mAppsView.addOrUpdateApps(apps);

        }

    }

src/com/android/launcher3/LauncherModel.java

+4 −7
Original line number Diff line number Diff line
@@ -138,18 +138,15 @@ public class LauncherModel extends BroadcastReceiver 
        public int getCurrentWorkspaceScreen();

        public void clearPendingBinds();

        public void startBinding();

        public void bindItems(ArrayList<ItemInfo> shortcuts, int start, int end,

                              boolean forceAnimateIcons);

        public void bindItems(List<ItemInfo> shortcuts, boolean forceAnimateIcons);

        public void bindScreens(ArrayList<Long> orderedScreenIds);

        public void finishFirstPageBind(ViewOnDrawExecutor executor);

        public void finishBindingItems();

        public void bindAppWidget(LauncherAppWidgetInfo info);

        public void bindAllApplications(ArrayList<AppInfo> apps);

        public void bindAppsAddedOrUpdated(ArrayList<AppInfo> apps);

        public void bindAppsAdded(ArrayList<Long> newScreens,

                                  ArrayList<ItemInfo> addNotAnimated,

                                  ArrayList<ItemInfo> addAnimated,

                                  ArrayList<AppInfo> addedApps);

        public void bindAppsUpdated(ArrayList<AppInfo> apps);

                                  ArrayList<ItemInfo> addAnimated);

        public void bindPromiseAppProgressUpdated(PromiseAppInfo app);

        public void bindShortcutsChanged(ArrayList<ShortcutInfo> updated,

                ArrayList<ShortcutInfo> removed, UserHandle user);
@@ -537,7 +534,7 @@ public class LauncherModel extends BroadcastReceiver 
                    scheduleCallbackTask(new CallbackTask() {

                        @Override

                        public void execute(Callbacks callbacks) {

                            callbacks.bindAppsAdded(null, null, null, arrayList);

                            callbacks.bindAppsAddedOrUpdated(arrayList);

                        }

                    });

                }

src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 


                        ArrayList<ItemInfo> itemList = new ArrayList<>();

                        itemList.add(info);

                        mLauncher.bindItems(itemList, 0, itemList.size(), true);

                        mLauncher.bindItems(itemList, true);

                    } else if (item instanceof PendingAddItemInfo) {

                        PendingAddItemInfo info = (PendingAddItemInfo) item;

                        Workspace workspace = mLauncher.getWorkspace();
@@ -205,7 +205,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 
                public void run() {

                    ArrayList<ItemInfo> itemList = new ArrayList<>();

                    itemList.add(item);

                    mLauncher.bindItems(itemList, 0, itemList.size(), true);

                    mLauncher.bindItems(itemList, true);

                    announceConfirmation(R.string.item_moved);

                }

            });

src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele 
                            screenId, coordinates[0], coordinates[1]);

                    ArrayList<ItemInfo> itemList = new ArrayList<>();

                    itemList.add(info);

                    mLauncher.bindItems(itemList, 0, itemList.size(), true);

                    mLauncher.bindItems(itemList, true);

                    AbstractFloatingView.closeAllOpenViews(mLauncher);

                    announceConfirmation(R.string.item_added_to_workspace);

                }

src/com/android/launcher3/allapps/AllAppsContainerView.java

+3 −11
Original line number Diff line number Diff line
@@ -132,18 +132,10 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc 
    }



    /**

     * Adds new apps to the list.

     * Adds or updates existing apps in the list

     */

    public void addApps(List<AppInfo> apps) {

        mApps.addApps(apps);

        mSearchUiManager.refreshSearchResult();

    }



    /**

     * Updates existing apps in the list

     */

    public void updateApps(List<AppInfo> apps) {

        mApps.updateApps(apps);

    public void addOrUpdateApps(List<AppInfo> apps) {

        mApps.addOrUpdateApps(apps);

        mSearchUiManager.refreshSearchResult();

    }