Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853"
Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" Revert submission 12190253-merge_ub-launcher3-rvc-qpr-dev_6690853 Reason for revert: Build ID picked from ub-launcher3-master and not ub-launcher3-rvc-qpr-dev Reverted Changes: I9e658ece0:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... I2a47fe180:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Ie86b0a2e0:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Id3ca76da6:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Ib6a63da0f:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Bug: 162366734 Change-Id: Ie81853a34c9a48d5b3fd922c65483a9ff639e0ce Merged-In: Ibff46b3ef7ff89accb459db323f31179adb4ef21
This commit is contained in:
1 parent
65b16d6db2
commit
0a4a4d920e
102 files changed
+1228
-1498
No files matched your search
@@ -21,6 +21,7 @@ import android.os.UserHandle;
|
||||
|
||||
import com.android.launcher3.LauncherAppState;
|
||||
import com.android.launcher3.LauncherSettings;
|
||||
import com.android.launcher3.model.data.ItemInfo;
|
||||
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
||||
import com.android.launcher3.shortcuts.ShortcutKey;
|
||||
import com.android.launcher3.shortcuts.ShortcutRequest;
|
||||
@@ -57,14 +58,14 @@ public class ShortcutsChangedTask extends BaseModelUpdateTask {
|
||||
MultiHashMap<ShortcutKey, WorkspaceItemInfo> keyToShortcutInfo = new MultiHashMap<>();
|
||||
HashSet<String> allIds = new HashSet<>();
|
||||
|
||||
synchronized (dataModel) {
|
||||
dataModel.forAllWorkspaceItemInfos(mUser, si -> {
|
||||
if ((si.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT)
|
||||
&& mPackageName.equals(si.getIntent().getPackage())) {
|
||||
for (ItemInfo itemInfo : dataModel.itemsIdMap) {
|
||||
if (itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
|
||||
WorkspaceItemInfo si = (WorkspaceItemInfo) itemInfo;
|
||||
if (mPackageName.equals(si.getIntent().getPackage()) && si.user.equals(mUser)) {
|
||||
keyToShortcutInfo.addToList(ShortcutKey.fromItemInfo(si), si);
|
||||
allIds.add(si.getDeepShortcutId());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
final ArrayList<WorkspaceItemInfo> updatedWorkspaceItemInfos = new ArrayList<>();
|
||||
|
||||
Reference in new issue
Block a user