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

Commit eac03af4 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge "Fix incremental download progress of workspaceiteminfos." into sc-dev

parents 162ed05a eedab487

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

+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.launcher3.model;



import android.content.Intent;

import android.os.UserHandle;



import com.android.launcher3.LauncherAppState;
@@ -66,8 +65,7 @@ public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask { 
        final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();

        synchronized (dataModel) {

            dataModel.forAllWorkspaceItemInfos(mUser, si -> {

                Intent intent = si.getIntent();

                if ((intent != null) && mPackageName.equals(intent.getPackage())) {

                if (mPackageName.equals(si.getTargetPackage())) {

                    si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;

                    si.setProgressLevel(downloadInfo);

                    updatedWorkspaceItems.add(si);

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

+2 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.launcher3.model;



import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;
@@ -72,9 +71,8 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask { 
        synchronized (dataModel) {

            final HashSet<ItemInfo> updates = new HashSet<>();

            dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {

                Intent intent = si.getIntent();

                if (si.hasPromiseIconUi() && (intent != null)

                        && mInstallInfo.packageName.equals(intent.getPackage())) {

                if (si.hasPromiseIconUi()

                        && mInstallInfo.packageName.equals(si.getTargetPackage())) {

                    int installProgress = mInstallInfo.progress;



                    si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);

src/com/android/launcher3/model/data/ItemInfo.java

+18 −0
Original line number Diff line number Diff line
@@ -184,6 +184,24 @@ public class ItemInfo { 
        return Optional.ofNullable(getIntent()).map(Intent::getComponent).orElse(mComponentName);

    }



    /**

     * Returns this item's package name.

     *

     * Prioritizes the component package name, then uses the intent package name as a fallback.

     * This ensures deep shortcuts are supported.

     */

    @Nullable

    public String getTargetPackage() {

        ComponentName component = getTargetComponent();

        Intent intent = getIntent();



        return component != null

                ? component.getPackageName()

                : intent != null

                        ? intent.getPackage()

                        : null;

    }



    public void writeToValues(ContentWriter writer) {

        writer.put(LauncherSettings.Favorites.ITEM_TYPE, itemType)

                .put(LauncherSettings.Favorites.CONTAINER, container)