Revert^2 "Restore Archived Pinned Shortcuts instead of removing them."
This reverts commit f5cb1b664b.
Reason for revert: adding test fix and reverting
Change-Id: I2fc8dc83259b2ee7992ac2291df6ee4246a2e9d5
This commit is contained in:
1 parent
126566a096
commit
ceb401c3e7
7 files changed
+252
-71
No files matched your search
@@ -24,6 +24,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SH
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.TABLE_NAME;
|
||||
import static com.android.launcher3.Utilities.SHOULD_SHOW_FIRST_PAGE_WIDGET;
|
||||
import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG;
|
||||
import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ARCHIVED;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.ContentValues;
|
||||
@@ -307,7 +308,7 @@ public class LoaderCursor extends CursorWrapper {
|
||||
* Make an WorkspaceItemInfo object for a restored application or shortcut item that points
|
||||
* to a package that is not yet installed on the system.
|
||||
*/
|
||||
public WorkspaceItemInfo getRestoredItemInfo(Intent intent) {
|
||||
public WorkspaceItemInfo getRestoredItemInfo(Intent intent, boolean isArchived) {
|
||||
final WorkspaceItemInfo info = new WorkspaceItemInfo();
|
||||
info.user = user;
|
||||
info.intent = intent;
|
||||
@@ -317,7 +318,7 @@ public class LoaderCursor extends CursorWrapper {
|
||||
mIconCache.getTitleAndIcon(info, DEFAULT_LOOKUP_FLAG);
|
||||
}
|
||||
|
||||
if (hasRestoreFlag(WorkspaceItemInfo.FLAG_RESTORED_ICON)) {
|
||||
if (hasRestoreFlag(WorkspaceItemInfo.FLAG_RESTORED_ICON) || isArchived) {
|
||||
String title = getTitle();
|
||||
if (!TextUtils.isEmpty(title)) {
|
||||
info.title = Utilities.trim(title);
|
||||
@@ -333,6 +334,7 @@ public class LoaderCursor extends CursorWrapper {
|
||||
info.contentDescription = mIconCache.getUserBadgedLabel(info.title, info.user);
|
||||
info.itemType = itemType;
|
||||
info.status = restoreFlag;
|
||||
if (isArchived) info.runtimeStatusFlags |= FLAG_ARCHIVED;
|
||||
return info;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user