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

This commit is contained in:
Schneider Victor-tulias authored and Android (Google) Code Review committed 2021-03-03 21:19:44 +00:00
commit eac03af4a1
3 files changed
+21 -7

No files matched your search

@@ -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);
@@ -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);
@@ -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)