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

Commit c9be6ca8 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Update `container` for ItemInfo." into tm-qpr-dev

parents eaaf065b 03caf498

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

+14 −9
Original line number Diff line number Diff line
@@ -117,14 +117,15 @@ public class QuickstepModelDelegate extends ModelDelegate { 
        // TODO: Implement caching and preloading

        super.loadItems(ums, pinnedShortcuts);



        WorkspaceItemFactory allAppsFactory = new WorkspaceItemFactory(

                mApp, ums, pinnedShortcuts, mIDP.numDatabaseAllAppsColumns);

        FixedContainerItems allAppsItems = new FixedContainerItems(mAllAppsState.containerId,

                mAllAppsState.storage.read(mApp.getContext(), allAppsFactory, ums.allUsers::get));

        mDataModel.extraItems.put(mAllAppsState.containerId, allAppsItems);



        WorkspaceItemFactory hotseatFactory =

                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numDatabaseHotseatIcons);

        WorkspaceItemFactory allAppsFactory = new WorkspaceItemFactory(mApp, ums, pinnedShortcuts,

                mIDP.numDatabaseAllAppsColumns, mAllAppsState.containerId);

        FixedContainerItems allAppsPredictionItems = new FixedContainerItems(

                mAllAppsState.containerId, mAllAppsState.storage.read(mApp.getContext(),

                allAppsFactory, ums.allUsers::get));

        mDataModel.extraItems.put(mAllAppsState.containerId, allAppsPredictionItems);



        WorkspaceItemFactory hotseatFactory = new WorkspaceItemFactory(mApp, ums, pinnedShortcuts,

                mIDP.numDatabaseHotseatIcons, mHotseatState.containerId);

        FixedContainerItems hotseatItems = new FixedContainerItems(mHotseatState.containerId,

                mHotseatState.storage.read(mApp.getContext(), hotseatFactory, ums.allUsers::get));

        mDataModel.extraItems.put(mHotseatState.containerId, hotseatItems);
@@ -432,15 +433,17 @@ public class QuickstepModelDelegate extends ModelDelegate { 
        private final UserManagerState mUMS;

        private final Map<ShortcutKey, ShortcutInfo> mPinnedShortcuts;

        private final int mMaxCount;

        private final int mContainer;



        private int mReadCount = 0;



        protected WorkspaceItemFactory(LauncherAppState appState, UserManagerState ums,

                Map<ShortcutKey, ShortcutInfo> pinnedShortcuts, int maxCount) {

                Map<ShortcutKey, ShortcutInfo> pinnedShortcuts, int maxCount, int container) {

            mAppState = appState;

            mUMS = ums;

            mPinnedShortcuts = pinnedShortcuts;

            mMaxCount = maxCount;

            mContainer = container;

        }



        @Nullable
@@ -458,6 +461,7 @@ public class QuickstepModelDelegate extends ModelDelegate { 
                        return null;

                    }

                    AppInfo info = new AppInfo(lai, user, mUMS.isUserQuiet(user));

                    info.container = mContainer;

                    mAppState.getIconCache().getTitleAndIcon(info, lai, false);

                    mReadCount++;

                    return info.makeWorkspaceItem(mAppState.getContext());
@@ -472,6 +476,7 @@ public class QuickstepModelDelegate extends ModelDelegate { 
                        return null;

                    }

                    WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mAppState.getContext());

                    wii.container = mContainer;

                    mAppState.getIconCache().getShortcutIcon(wii, si);

                    mReadCount++;

                    return wii;