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

Commit 6ad28a56 authored by Jakob Schneider's avatar Jakob Schneider Committed by Android (Google) Code Review
Browse files

Merge "Fix two flag usages that I missed the last time around when I... 

Merge "Fix two flag usages that I missed the last time around when I refactored it into the utilities class." into main
parents 3d7e1c29 f45d7f34

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

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.model; 


import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;



import static com.android.launcher3.Flags.enableSupportForArchiving;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
@@ -45,6 +44,7 @@ import com.android.launcher3.InvariantDeviceProfile; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.Utilities;

import com.android.launcher3.logging.FileLog;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -300,7 +300,8 @@ public class ItemInstallQueue { 
                    } else {

                        lai = laiList.get(0);

                        si.intent = makeLaunchIntent(lai);

                        if (enableSupportForArchiving() && lai.getActivityInfo().isArchived) {

                        if (Utilities.enableSupportForArchiving()

                                && lai.getActivityInfo().isArchived) {

                            si.runtimeStatusFlags |= FLAG_ARCHIVED;

                        }

                    }

src/com/android/launcher3/util/PackageManagerHelper.java

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3.util;



import static com.android.launcher3.Flags.enableSupportForArchiving;



import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.Context;
@@ -276,6 +274,6 @@ public class PackageManagerHelper { 
    @SuppressWarnings("NewApi")

    private boolean isPackageInstalledOrArchived(ApplicationInfo info) {

        return (info.flags & ApplicationInfo.FLAG_INSTALLED) != 0 || (

                enableSupportForArchiving() && info.isArchived);

                Utilities.enableSupportForArchiving() && info.isArchived);

    }

}