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

Commit 89137e7b authored by Jon Miranda's avatar Jon Miranda
Browse files

Add support for adding promise icons for new install sessions by user. 

- Added flag PROMISE_APPS_NEW_INSTALLS
- Promise icons only added if flag (above) is on, as well as the setting
  for "Add icon to Home screen"
- Maintains a list of session ids of promise icons that have been added to the
  home screen, so that if the user manually removes the icon, we do not add
  it back to the home screen when the install is completed.
- Queues all applications as promise icons, and replaces with actual
  app info when its being added to the workspace.

Bug: 135633159
Change-Id: Idf2fc9033f890afef924628b76b89ad4692f529c
Merged-In: I411db59f9bd1b346d98b9bb73f5376a5983b8de5
parent d88f63bb

robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ public class PackageInstallStateChangedTaskTest extends BaseModelUpdateTaskTestC 


    private PackageInstallStateChangedTask newTask(String pkg, int progress) {

        int state = PackageInstallerCompat.STATUS_INSTALLING;

        PackageInstallInfo installInfo = new PackageInstallInfo(pkg, state, progress);

        PackageInstallInfo installInfo = new PackageInstallInfo(pkg, state, progress,

                android.os.Process.myUserHandle());

        return new PackageInstallStateChangedTask(installInfo);

    }

src/com/android/launcher3/AllAppsList.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class AllAppsList { 
    public void addPromiseApp(Context context,

                              PackageInstallerCompat.PackageInstallInfo installInfo) {

        ApplicationInfo applicationInfo = LauncherAppsCompat.getInstance(context)

                .getApplicationInfo(installInfo.packageName, 0, Process.myUserHandle());

                .getApplicationInfo(installInfo.packageName, 0, installInfo.user);

        // only if not yet installed

        if (applicationInfo == null) {

            PromiseAppInfo info = new PromiseAppInfo(installInfo);

src/com/android/launcher3/InstallShortcutReceiver.java

+54 −49
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.launcher3; 
import android.appwidget.AppWidgetManager;

import android.appwidget.AppWidgetProviderInfo;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;
@@ -29,7 +30,6 @@ import android.content.pm.ShortcutInfo; 
import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Parcelable;

import android.os.Process;
@@ -141,7 +141,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 


                        String pkg = getIntentPackage(info.launchIntent);

                        if (!TextUtils.isEmpty(pkg)

                                && !launcherApps.isPackageEnabledForProfile(pkg, info.user)) {

                                && !launcherApps.isPackageEnabledForProfile(pkg, info.user)

                                && !info.isActivity) {

                            if (DBG) Log.d(TAG, "Ignoring shortcut for absent package: "

                                    + info.launchIntent);

                            continue;
@@ -250,7 +251,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
    }



    public static WorkspaceItemInfo fromActivityInfo(LauncherActivityInfo info, Context context) {

        return (WorkspaceItemInfo) (new PendingInstallShortcutInfo(info, context).getItemInfo().first);

        return (WorkspaceItemInfo)

                new PendingInstallShortcutInfo(info, context).getItemInfo().first;

    }



    public static void queueShortcut(ShortcutInfo info, Context context) {
@@ -261,8 +263,9 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId, context), context);

    }



    public static void queueActivityInfo(LauncherActivityInfo activity, Context context) {

        queuePendingShortcutInfo(new PendingInstallShortcutInfo(activity, context), context);

    public static void queueApplication(Intent data, UserHandle user, Context context) {

        queuePendingShortcutInfo(new PendingInstallShortcutInfo(data, context, user),

                context);

    }



    public static HashSet<ShortcutKey> getPendingShortcuts(Context context) {
@@ -326,7 +329,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 


    private static class PendingInstallShortcutInfo {



        final LauncherActivityInfo activityInfo;

        final boolean isActivity;

        final ShortcutInfo shortcutInfo;

        final AppWidgetProviderInfo providerInfo;
@@ -340,7 +343,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
         * Initializes a PendingInstallShortcutInfo received from a different app.

         */

        public PendingInstallShortcutInfo(Intent data, UserHandle user, Context context) {

            activityInfo = null;

            isActivity = false;

            shortcutInfo = null;

            providerInfo = null;
@@ -350,14 +353,13 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 


            launchIntent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);

            label = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);



        }



        /**

         * Initializes a PendingInstallShortcutInfo to represent a launcher target.

         */

        public PendingInstallShortcutInfo(LauncherActivityInfo info, Context context) {

            activityInfo = info;

            isActivity = true;

            shortcutInfo = null;

            providerInfo = null;
@@ -369,11 +371,27 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
            label = info.getLabel().toString();

        }



        /**

         * Initializes a PendingInstallShortcutInfo to represent a launcher target.

         */

        public PendingInstallShortcutInfo(Intent data, Context context, UserHandle user) {

            isActivity = true;

            shortcutInfo = null;

            providerInfo = null;



            this.data = data;

            this.user = user;

            mContext = context;



            launchIntent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);

            label = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);

        }



        /**

         * Initializes a PendingInstallShortcutInfo to represent a launcher target.

         */

        public PendingInstallShortcutInfo(ShortcutInfo info, Context context) {

            activityInfo = null;

            isActivity = false;

            shortcutInfo = info;

            providerInfo = null;
@@ -390,7 +408,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
         */

        public PendingInstallShortcutInfo(

                AppWidgetProviderInfo info, int widgetId, Context context) {

            activityInfo = null;

            isActivity = false;

            shortcutInfo = null;

            providerInfo = info;
@@ -405,17 +423,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 


        public String encodeToString() {

            try {

                if (activityInfo != null) {

                    // If it a launcher target, we only need component name, and user to

                    // recreate this.

                    return new JSONStringer()

                        .object()

                        .key(LAUNCH_INTENT_KEY).value(launchIntent.toUri(0))

                        .key(APP_SHORTCUT_TYPE_KEY).value(true)

                        .key(USER_HANDLE_KEY).value(UserManagerCompat.getInstance(mContext)

                                .getSerialNumberForUser(user))

                        .endObject().toString();

                } else if (shortcutInfo != null) {

                if (shortcutInfo != null) {

                    // If it a launcher target, we only need component name, and user to

                    // recreate this.

                    return new JSONStringer()
@@ -457,7 +465,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                JSONStringer json = new JSONStringer()

                    .object()

                    .key(LAUNCH_INTENT_KEY).value(launchIntent.toUri(0))

                    .key(NAME_KEY).value(name);

                    .key(NAME_KEY).value(name)

                    .key(APP_SHORTCUT_TYPE_KEY).value(isActivity);

                if (icon != null) {

                    byte[] iconByteArray = GraphicsUtils.flattenBitmap(icon);

                    json = json.key(ICON_KEY).value(
@@ -477,29 +486,18 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
        }



        public Pair<ItemInfo, Object> getItemInfo() {

            if (activityInfo != null) {

                AppInfo appInfo = new AppInfo(mContext, activityInfo, user);

                final LauncherAppState app = LauncherAppState.getInstance(mContext);

                // Set default values until proper values is loaded.

                appInfo.title = "";

                appInfo.applyFrom(app.getIconCache().getDefaultIcon(user));

                final WorkspaceItemInfo si = appInfo.makeWorkspaceItem();

                if (Looper.myLooper() == LauncherModel.getWorkerLooper()) {

                    app.getIconCache().getTitleAndIcon(si, activityInfo, false /* useLowResIcon */);

                } else {

                    app.getModel().updateAndBindWorkspaceItem(() -> {

                        app.getIconCache().getTitleAndIcon(

                                si, activityInfo, false /* useLowResIcon */);

                        return si;

                    });

                }

                return Pair.create((ItemInfo) si, (Object) activityInfo);

            if (isActivity) {

                WorkspaceItemInfo si = createWorkspaceItemInfo(data,

                        LauncherAppState.getInstance(mContext));

                si.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;

                si.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;

                return Pair.create(si, null);

            } else if (shortcutInfo != null) {

                WorkspaceItemInfo si = new WorkspaceItemInfo(shortcutInfo, mContext);

                WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(shortcutInfo, mContext);

                LauncherIcons li = LauncherIcons.obtain(mContext);

                si.applyFrom(li.createShortcutIcon(shortcutInfo));

                itemInfo.applyFrom(li.createShortcutIcon(shortcutInfo));

                li.recycle();

                return Pair.create((ItemInfo) si, (Object) shortcutInfo);

                return Pair.create(itemInfo, shortcutInfo);

            } else if (providerInfo != null) {

                LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo

                        .fromProviderInfo(mContext, providerInfo);
@@ -511,15 +509,16 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                widgetInfo.minSpanY = info.minSpanY;

                widgetInfo.spanX = Math.min(info.spanX, idp.numColumns);

                widgetInfo.spanY = Math.min(info.spanY, idp.numRows);

                return Pair.create((ItemInfo) widgetInfo, (Object) providerInfo);

                return Pair.create(widgetInfo, providerInfo);

            } else {

                WorkspaceItemInfo si = createWorkspaceItemInfo(data, LauncherAppState.getInstance(mContext));

                return Pair.create((ItemInfo) si, null);

                WorkspaceItemInfo itemInfo =

                        createWorkspaceItemInfo(data, LauncherAppState.getInstance(mContext));

                return Pair.create(itemInfo, null);

            }

        }



        public boolean isLauncherActivity() {

            return activityInfo != null;

            return isActivity;

        }

    }
@@ -534,7 +533,9 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
            if (decoder.optBoolean(APP_SHORTCUT_TYPE_KEY)) {

                LauncherActivityInfo info = LauncherAppsCompat.getInstance(context)

                        .resolveActivity(decoder.launcherIntent, decoder.user);

                return info == null ? null : new PendingInstallShortcutInfo(info, context);

                if (info != null) {

                    return new PendingInstallShortcutInfo(info, context);

                }

            } else if (decoder.optBoolean(DEEPSHORTCUT_TYPE_KEY)) {

                DeepShortcutManager sm = DeepShortcutManager.getInstance(context);

                List<ShortcutInfo> si = sm.queryForFullDetails(
@@ -578,7 +579,11 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                data.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);

            }



            if (decoder.optBoolean(APP_SHORTCUT_TYPE_KEY)) {

                return new PendingInstallShortcutInfo(data, context, decoder.user);

            } else {

                return new PendingInstallShortcutInfo(data, decoder.user, context);

            }

        } catch (JSONException | URISyntaxException e) {

            Log.d(TAG, "Exception reading shortcut to add: " + e);

        }

src/com/android/launcher3/SessionCommitReceiver.java

+34 −4
Original line number Diff line number Diff line
@@ -18,28 +18,33 @@ package com.android.launcher3; 


import android.annotation.TargetApi;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ApplicationInfo;

import android.content.pm.LauncherActivityInfo;

import android.content.pm.PackageInstaller;

import android.content.pm.PackageInstaller.SessionInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Build;

import android.os.Process;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;



import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.PackageInstallerCompat;



import java.util.List;



import static com.android.launcher3.compat.PackageInstallerCompat.getUserHandle;



/**

 * BroadcastReceiver to handle session commit intent.

 */
@@ -66,15 +71,29 @@ public class SessionCommitReceiver extends BroadcastReceiver { 


        SessionInfo info = intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);

        UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);

        PackageInstallerCompat packageInstallerCompat = PackageInstallerCompat.getInstance(context);



        if (TextUtils.isEmpty(info.getAppPackageName()) ||

                info.getInstallReason() != PackageManager.INSTALL_REASON_USER) {

        if (TextUtils.isEmpty(info.getAppPackageName())

                || info.getInstallReason() != PackageManager.INSTALL_REASON_USER

                || packageInstallerCompat.promiseIconAddedForId(info.getSessionId())) {

            packageInstallerCompat.removePromiseIconId(info.getSessionId());

            return;

        }



        queueAppIconAddition(context, info.getAppPackageName(), user);

    }



    public static void queuePromiseAppIconAddition(Context context, SessionInfo sessionInfo) {

        String packageName = sessionInfo.getAppPackageName();

        List<LauncherActivityInfo> activities = LauncherAppsCompat.getInstance(context)

                .getActivityList(packageName, getUserHandle(sessionInfo));

        if (activities == null || activities.isEmpty()) {

            // Ensure application isn't already installed.

            queueAppIconAddition(context, packageName, sessionInfo.getAppLabel(),

                    sessionInfo.getAppIcon(), getUserHandle(sessionInfo));

        }

    }



    public static void queueAppIconAddition(Context context, String packageName, UserHandle user) {

        List<LauncherActivityInfo> activities = LauncherAppsCompat.getInstance(context)

                .getActivityList(packageName, user);
@@ -82,7 +101,18 @@ public class SessionCommitReceiver extends BroadcastReceiver { 
            // no activity found

            return;

        }

        InstallShortcutReceiver.queueActivityInfo(activities.get(0), context);

        queueAppIconAddition(context, packageName, activities.get(0).getLabel(), null, user);

    }



    private static void queueAppIconAddition(Context context, String packageName,

            CharSequence label, Bitmap icon, UserHandle user) {

        Intent data = new Intent();

        data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(

                new ComponentName(packageName, "")).setPackage(packageName));

        data.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);

        data.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);



        InstallShortcutReceiver.queueApplication(data, user, context);

    }



    public static boolean isEnabled(Context context) {

src/com/android/launcher3/WorkspaceItemInfo.java

+7 −5
Original line number Diff line number Diff line
@@ -50,24 +50,26 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon { 
     * The icon was added as an auto-install app, and is not ready to be used. This flag can't

     * be present along with {@link #FLAG_RESTORED_ICON}, and is set during default layout

     * parsing.

     *

     * OR this icon was added due to it being an active install session created by the user.

     */

    public static final int FLAG_AUTOINSTALL_ICON = 2; //0B10;

    public static final int FLAG_AUTOINSTALL_ICON = 1 << 1;



    /**

     * The icon is being installed. If {@link #FLAG_RESTORED_ICON} or {@link #FLAG_AUTOINSTALL_ICON}

     * is set, then the icon is either being installed or is in a broken state.

     */

    public static final int FLAG_INSTALL_SESSION_ACTIVE = 4; // 0B100;

    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 2;



    /**

     * Indicates that the widget restore has started.

     */

    public static final int FLAG_RESTORE_STARTED = 8; //0B1000;

    public static final int FLAG_RESTORE_STARTED = 1 << 3;



    /**

     * Web UI supported.

     */

    public static final int FLAG_SUPPORTS_WEB_UI = 16; //0B10000;

    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 4;



    /**

     * The intent used to start the application.
@@ -210,7 +212,7 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon { 
    public ComponentName getTargetComponent() {

        ComponentName cn = super.getTargetComponent();

        if (cn == null && (itemType == Favorites.ITEM_TYPE_SHORTCUT

                || hasStatusFlag(FLAG_SUPPORTS_WEB_UI))) {

                || hasStatusFlag(FLAG_SUPPORTS_WEB_UI | FLAG_AUTOINSTALL_ICON))) {

            // Legacy shortcuts and promise icons with web UI may not have a componentName but just

            // a packageName. In that case create a dummy componentName instead of adding additional

            // check everywhere.