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

Commit 6a6de2df authored by Winson Chung's avatar Winson Chung
Browse files

Migrate WorkspaceItemInfo non-resizeable flag to runtime status flag 

- This aligns with other app-level state that is read at runtime

Bug: 323112914
Test: atest NexusLauncherTests
Change-Id: I1e29583d1c0302646718473c8958d604c1a202a5
parent 21cf4439

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

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.launcher3.model.data.ItemInfo; 
import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.util.ApiWrapper;

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.IntSparseArrayMap;

import com.android.launcher3.util.PersistedItemArray;
@@ -557,6 +558,7 @@ public class QuickstepModelDelegate extends ModelDelegate { 
                    AppInfo info = new AppInfo(

                            lai,

                            UserCache.INSTANCE.get(mAppState.getContext()).getUserInfo(user),

                            ApiWrapper.INSTANCE.get(mAppState.getContext()),

                            mUMS.isUserQuiet(user));

                    info.container = mContainer;

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

quickstep/src/com/android/quickstep/util/AppPairsController.java

+1 −3
Original line number Diff line number Diff line
@@ -265,9 +265,7 @@ public class AppPairsController { 
        }



        if (ai != null) {

            wii.status = ai.resizeMode == ActivityInfo.RESIZE_MODE_UNRESIZEABLE

                    ? wii.status | WorkspaceItemInfo.FLAG_NON_RESIZEABLE

                    : wii.status & ~WorkspaceItemInfo.FLAG_NON_RESIZEABLE;

            wii.setNonResizeable(ai.resizeMode == ActivityInfo.RESIZE_MODE_UNRESIZEABLE);

        }

    }

src/com/android/launcher3/model/AllAppsList.java

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.launcher3.model.data.AppInfo; 
import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.pm.PackageInstallInfo;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.util.ApiWrapper;

import com.android.launcher3.util.FlagOp;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.SafeCloseable;
@@ -298,6 +299,7 @@ public class AllAppsList { 
     */

    public List<LauncherActivityInfo> updatePackage(

            Context context, String packageName, UserHandle user) {

        final ApiWrapper apiWrapper = ApiWrapper.INSTANCE.get(context);

        final UserCache userCache = UserCache.getInstance(context);

        final List<LauncherActivityInfo> matches = context.getSystemService(LauncherApps.class)

                .getActivityList(packageName, user);
@@ -328,7 +330,7 @@ public class AllAppsList { 
                    applicationInfo.sectionName = mIndex.computeSectionName(applicationInfo.title);

                    applicationInfo.intent = launchIntent;

                    AppInfo.updateRuntimeFlagsForActivityTarget(applicationInfo, info,

                            userCache.getUserInfo(user));

                            userCache.getUserInfo(user), apiWrapper);

                    mDataChanged = true;

                }

            }

src/com/android/launcher3/model/LoaderCursor.java

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.launcher3.model.data.ItemInfo; 
import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.util.ApiWrapper;

import com.android.launcher3.util.ContentWriter;

import com.android.launcher3.util.GridOccupancy;

import com.android.launcher3.util.IntArray;
@@ -366,7 +367,8 @@ public class LoaderCursor extends CursorWrapper { 
        }



        if (mActivityInfo != null) {

            AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo, userIconInfo);

            AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo, userIconInfo,

                    ApiWrapper.INSTANCE.get(mContext));

        }



        // from the db

src/com/android/launcher3/model/LoaderTask.java

+3 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import com.android.launcher3.pm.UserCache; 
import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.shortcuts.ShortcutRequest;

import com.android.launcher3.shortcuts.ShortcutRequest.QueryResult;

import com.android.launcher3.util.ApiWrapper;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.IOUtils;

import com.android.launcher3.util.IntArray;
@@ -694,7 +695,8 @@ public class LoaderTask implements Runnable { 
            // Create the ApplicationInfos

            for (int i = 0; i < apps.size(); i++) {

                LauncherActivityInfo app = apps.get(i);

                AppInfo appInfo = new AppInfo(app, mUserCache.getUserInfo(user), quietMode);

                AppInfo appInfo = new AppInfo(app, mUserCache.getUserInfo(user),

                        ApiWrapper.INSTANCE.get(mApp.getContext()), quietMode);

                if (Flags.enableSupportForArchiving() && app.getApplicationInfo().isArchived) {

                    // For archived apps, include progress info in case there is a pending

                    // install session post restart of device.