diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 119a6b122b..1e80d03727 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -159,9 +159,15 @@ public class IconCache extends BaseIconCache { */ public synchronized void updateIconsForPkg(@NonNull final String packageName, @NonNull final UserHandle user) { + List apps = mLauncherApps.getActivityList(packageName, user); + if (Flags.restoreArchivedAppIconsFromDb() + && apps.stream().anyMatch(app -> app.getApplicationInfo().isArchived)) { + // When archiving app icon, don't delete old icon so it can be re-used. + return; + } removeIconsForPkg(packageName, user); long userSerial = mUserManager.getSerialNumberForUser(user); - for (LauncherActivityInfo app : mLauncherApps.getActivityList(packageName, user)) { + for (LauncherActivityInfo app : apps) { addIconToDBAndMemCache(app, LauncherActivityCachingLogic.INSTANCE, userSerial); } } diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index efe61572fe..8f116bbd6b 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -326,6 +326,7 @@ public class LoaderCursor extends CursorWrapper { // the fallback icon if (!loadIconFromDb(info)) { + FileLog.d(TAG, "loadIconFromDb failed, getting from cache - intent=" + intent); mIconCache.getTitleAndIcon(info, DEFAULT_LOOKUP_FLAG); } diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 78e5d898cd..6dc20de490 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -762,7 +762,7 @@ public class LoaderTask implements Runnable { } IconRequestInfo iconRequestInfo = getAppInfoIconRequestInfo( - appInfo, app, mWorkspaceIconRequestInfos); + appInfo, app, mWorkspaceIconRequestInfos, mIsRestoreFromBackup); allAppsItemRequestInfos.add(iconRequestInfo); mBgAllAppsList.add(appInfo, app, false); } @@ -831,9 +831,10 @@ public class LoaderTask implements Runnable { IconRequestInfo getAppInfoIconRequestInfo( AppInfo appInfo, LauncherActivityInfo activityInfo, - List> workspaceRequestInfos + List> workspaceRequestInfos, + boolean isRestoreFromBackup ) { - if (Flags.restoreArchivedAppIconsFromDb()) { + if (Flags.restoreArchivedAppIconsFromDb() && isRestoreFromBackup) { Optional> workspaceIconRequest = workspaceRequestInfos.stream() .filter(request -> appInfo.getTargetComponent().equals( diff --git a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt index 7b8f21866a..bf71099f41 100644 --- a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt +++ b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt @@ -524,15 +524,14 @@ class WorkspaceItemProcessor( WidgetInflater.TYPE_PENDING -> { tempPackageKey.update(component.packageName, c.user) val si = installingPkgs[tempPackageKey] - + val isArchived = + ApplicationInfoWrapper(context, component.packageName, c.user).isArchived() if ( !c.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_RESTORE_STARTED) && !isSafeMode && (si == null) && (lapi == null) && - !(Flags.enableSupportForArchiving() && - ApplicationInfoWrapper(context, component.packageName, c.user) - .isArchived()) + !isArchived ) { // Restore never started c.markDeleted( @@ -559,7 +558,13 @@ class WorkspaceItemProcessor( appWidgetInfo.providerName, appWidgetInfo.user, ) - iconCache.getTitleAndIconForApp(appWidgetInfo.pendingItemInfo, DEFAULT_LOOKUP_FLAG) + val iconLookupFlag = + if (isArchived && Flags.restoreArchivedAppIconsFromDb()) { + DEFAULT_LOOKUP_FLAG.withSkipAddToMemCache() + } else { + DEFAULT_LOOKUP_FLAG + } + iconCache.getTitleAndIconForApp(appWidgetInfo.pendingItemInfo, iconLookupFlag) } WidgetInflater.TYPE_REAL -> WidgetSizes.updateWidgetSizeRangesAsync( diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt index 560d306244..f9c4a1704e 100644 --- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt +++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt @@ -466,8 +466,7 @@ class LoaderTaskTest { @Test @EnableFlags(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB) - fun `When flag on then archived AllApps icons found on Workspace loaded from db`() { - // Given + fun `When flag on and restore then archived AllApps icons on Workspace load from db`() { // Given val activityInfo: LauncherActivityInfo = mock() val applicationInfo: ApplicationInfo = mock().apply { isArchived = true } @@ -490,7 +489,12 @@ class LoaderTaskTest { val loader = testComponent.getLoaderTaskFactory().newLoaderTask(launcherBinder, userManagerState) val actualIconRequest = - loader.getAppInfoIconRequestInfo(expectedAppInfo, activityInfo, workspaceIconRequests) + loader.getAppInfoIconRequestInfo( + expectedAppInfo, + activityInfo, + workspaceIconRequests, + /* isRestoreFromBackup */ true, + ) // Then assertThat(actualIconRequest.iconBlob).isEqualTo(expectedIconBlob) assertThat(actualIconRequest.itemInfo).isEqualTo(expectedAppInfo) @@ -498,7 +502,43 @@ class LoaderTaskTest { @Test @EnableFlags(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB) - fun `When flag on then unarchived AllApps icons not loaded from db`() { + fun `When flag on and not restore then archived AllApps icons do not load from db`() { + // Given + val activityInfo: LauncherActivityInfo = mock() + val applicationInfo: ApplicationInfo = mock().apply { isArchived = true } + whenever(activityInfo.applicationInfo).thenReturn(applicationInfo) + val expectedIconBlob = byteArrayOf(0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08) + val expectedComponent = ComponentName("package", "class") + val workspaceIconRequests = + listOf( + IconRequestInfo( + WorkspaceItemInfo().apply { + intent = Intent().apply { component = expectedComponent } + }, + activityInfo, + expectedIconBlob, + false, /* useLowResIcon */ + ) + ) + val expectedAppInfo = AppInfo().apply { componentName = expectedComponent } + // When + val loader = + testComponent.getLoaderTaskFactory().newLoaderTask(launcherBinder, userManagerState) + val actualIconRequest = + loader.getAppInfoIconRequestInfo( + expectedAppInfo, + activityInfo, + workspaceIconRequests, + /* isRestoreFromBackup */ false, + ) + // Then + assertThat(actualIconRequest.iconBlob).isNull() + assertThat(actualIconRequest.itemInfo).isEqualTo(expectedAppInfo) + } + + @Test + @EnableFlags(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB) + fun `When flag on and restore then unarchived AllApps icons not loaded from db`() { // Given val activityInfo: LauncherActivityInfo = mock() val applicationInfo: ApplicationInfo = mock().apply { isArchived = false } @@ -521,7 +561,12 @@ class LoaderTaskTest { val loader = testComponent.getLoaderTaskFactory().newLoaderTask(launcherBinder, userManagerState) val actualIconRequest = - loader.getAppInfoIconRequestInfo(expectedAppInfo, activityInfo, workspaceIconRequests) + loader.getAppInfoIconRequestInfo( + expectedAppInfo, + activityInfo, + workspaceIconRequests, + /* isRestoreFromBackup */ true, + ) // Then assertThat(actualIconRequest.iconBlob).isNull() assertThat(actualIconRequest.itemInfo).isEqualTo(expectedAppInfo) @@ -529,7 +574,7 @@ class LoaderTaskTest { @Test @EnableFlags(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB) - fun `When flag on then archived AllApps icon not found on Workspace not loaded from db`() { + fun `When flag on and restore then all apps icon not on workspace is not loaded from db`() { // Given val activityInfo: LauncherActivityInfo = mock() val applicationInfo: ApplicationInfo = mock().apply { isArchived = true } @@ -553,7 +598,12 @@ class LoaderTaskTest { val loader = testComponent.getLoaderTaskFactory().newLoaderTask(launcherBinder, userManagerState) val actualIconRequest = - loader.getAppInfoIconRequestInfo(expectedAppInfo, activityInfo, workspaceIconRequests) + loader.getAppInfoIconRequestInfo( + expectedAppInfo, + activityInfo, + workspaceIconRequests, + /* isRestoreFromBackup */ true, + ) // Then assertThat(actualIconRequest.iconBlob).isNull() assertThat(actualIconRequest.itemInfo).isEqualTo(expectedAppInfo) @@ -561,7 +611,7 @@ class LoaderTaskTest { @Test @DisableFlags(Flags.FLAG_RESTORE_ARCHIVED_APP_ICONS_FROM_DB) - fun `When flag off then archived AllApps icons not loaded from db`() { + fun `When flag off and restore then archived AllApps icons not loaded from db`() { // Given val activityInfo: LauncherActivityInfo = mock() val applicationInfo: ApplicationInfo = mock().apply { isArchived = true } @@ -581,7 +631,12 @@ class LoaderTaskTest { val loader = testComponent.getLoaderTaskFactory().newLoaderTask(launcherBinder, userManagerState) val actualIconRequest = - loader.getAppInfoIconRequestInfo(expectedAppInfo, activityInfo, workspaceIconRequests) + loader.getAppInfoIconRequestInfo( + expectedAppInfo, + activityInfo, + workspaceIconRequests, + /* isRestoreFromBackup */ true, + ) // Then assertThat(actualIconRequest.iconBlob).isNull() assertThat(actualIconRequest.itemInfo).isEqualTo(expectedAppInfo)