We already do this when loading, but now we also do it when getting callbacks that potentially change the shortcut icon. These callbacks first check the pinned shortcut info, but if there is no icon there we now fall back to the current icon instead of the default icon. Bug: 62814533 Change-Id: I777adedf4b7f93dbaddb98a993eda34d59dcc173
116 lines
4.8 KiB
Java
116 lines
4.8 KiB
Java
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.model;
|
|
|
|
import android.content.Context;
|
|
import android.os.UserHandle;
|
|
|
|
import com.android.launcher3.AllAppsList;
|
|
import com.android.launcher3.ItemInfo;
|
|
import com.android.launcher3.LauncherAppState;
|
|
import com.android.launcher3.LauncherSettings;
|
|
import com.android.launcher3.ShortcutInfo;
|
|
import com.android.launcher3.compat.UserManagerCompat;
|
|
import com.android.launcher3.graphics.LauncherIcons;
|
|
import com.android.launcher3.shortcuts.DeepShortcutManager;
|
|
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
|
|
import com.android.launcher3.shortcuts.ShortcutKey;
|
|
import com.android.launcher3.util.ComponentKey;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Task to handle changing of lock state of the user
|
|
*/
|
|
public class UserLockStateChangedTask extends BaseModelUpdateTask {
|
|
|
|
private final UserHandle mUser;
|
|
|
|
public UserLockStateChangedTask(UserHandle user) {
|
|
mUser = user;
|
|
}
|
|
|
|
@Override
|
|
public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
|
|
Context context = app.getContext();
|
|
boolean isUserUnlocked = UserManagerCompat.getInstance(context).isUserUnlocked(mUser);
|
|
DeepShortcutManager deepShortcutManager = DeepShortcutManager.getInstance(context);
|
|
|
|
HashMap<ShortcutKey, ShortcutInfoCompat> pinnedShortcuts = new HashMap<>();
|
|
if (isUserUnlocked) {
|
|
List<ShortcutInfoCompat> shortcuts =
|
|
deepShortcutManager.queryForPinnedShortcuts(null, mUser);
|
|
if (deepShortcutManager.wasLastCallSuccess()) {
|
|
for (ShortcutInfoCompat shortcut : shortcuts) {
|
|
pinnedShortcuts.put(ShortcutKey.fromInfo(shortcut), shortcut);
|
|
}
|
|
} else {
|
|
// Shortcut manager can fail due to some race condition when the lock state
|
|
// changes too frequently. For the purpose of the update,
|
|
// consider it as still locked.
|
|
isUserUnlocked = false;
|
|
}
|
|
}
|
|
|
|
// Update the workspace to reflect the changes to updated shortcuts residing on it.
|
|
ArrayList<ShortcutInfo> updatedShortcutInfos = new ArrayList<>();
|
|
ArrayList<ShortcutInfo> deletedShortcutInfos = new ArrayList<>();
|
|
for (ItemInfo itemInfo : dataModel.itemsIdMap) {
|
|
if (itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
|
|
&& mUser.equals(itemInfo.user)) {
|
|
ShortcutInfo si = (ShortcutInfo) itemInfo;
|
|
if (isUserUnlocked) {
|
|
ShortcutInfoCompat shortcut = pinnedShortcuts.get(ShortcutKey.fromItemInfo(si));
|
|
// We couldn't verify the shortcut during loader. If its no longer available
|
|
// (probably due to clear data), delete the workspace item as well
|
|
if (shortcut == null) {
|
|
deletedShortcutInfos.add(si);
|
|
continue;
|
|
}
|
|
si.isDisabled &= ~ShortcutInfo.FLAG_DISABLED_LOCKED_USER;
|
|
si.updateFromDeepShortcutInfo(shortcut, context);
|
|
si.iconBitmap = LauncherIcons.createShortcutIcon(shortcut, context,
|
|
si.iconBitmap);
|
|
} else {
|
|
si.isDisabled |= ShortcutInfo.FLAG_DISABLED_LOCKED_USER;
|
|
}
|
|
updatedShortcutInfos.add(si);
|
|
}
|
|
}
|
|
bindUpdatedShortcuts(updatedShortcutInfos, deletedShortcutInfos, mUser);
|
|
if (!deletedShortcutInfos.isEmpty()) {
|
|
getModelWriter().deleteItemsFromDatabase(deletedShortcutInfos);
|
|
}
|
|
|
|
// Remove shortcut id map for that user
|
|
Iterator<ComponentKey> keysIter = dataModel.deepShortcutMap.keySet().iterator();
|
|
while (keysIter.hasNext()) {
|
|
if (keysIter.next().user.equals(mUser)) {
|
|
keysIter.remove();
|
|
}
|
|
}
|
|
|
|
if (isUserUnlocked) {
|
|
dataModel.updateDeepShortcutMap(
|
|
null, mUser, deepShortcutManager.queryForAllShortcuts(mUser));
|
|
}
|
|
bindDeepShortcuts(dataModel);
|
|
}
|
|
}
|