aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed a bug where restored promise icons stay promise icons." into ub-launcher3-qt-future-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-24 20:15:51 +00:00
committed by Android (Google) Code Review
parent bba8c98de3 3944746fb6
commit 32a3421f1a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/WorkspaceItemInfo.java
View File

@@ -212,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 | FLAG_AUTOINSTALL_ICON))) {
|| hasStatusFlag(FLAG_SUPPORTS_WEB_UI|FLAG_AUTOINSTALL_ICON|FLAG_RESTORED_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.

5
src/com/android/launcher3/model/PackageUpdatedTask.java
View File

@@ -55,6 +55,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import static com.android.launcher3.WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
import static com.android.launcher3.WorkspaceItemInfo.FLAG_RESTORED_ICON;
/**
* Handles updates due to changes in package manager (app installed/updated/removed)
* or when a user availability changes.
@@ -221,7 +224,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
isTargetValid = LauncherAppsCompat.getInstance(context)
.isActivityEnabledForProfile(cn, mUser);
}
if (si.hasStatusFlag(FLAG_AUTOINSTALL_ICON)) {
if (si.hasStatusFlag(FLAG_RESTORED_ICON | FLAG_AUTOINSTALL_ICON)) {
if (updateWorkspaceItemIntent(context, si, packageName)) {
infoUpdated = true;
} else if (si.hasPromiseIconUi()) {