PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Adding in missing changes to ub-launcher3-master." into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-17 20:06:10 +00:00
committed by Android (Google) Code Review
parent 935cfb8633 088b9c2f87
commit 1ac3640c86
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherModel.java
+26
View File
@@ -53,6 +53,8 @@ import com.android.launcher3.model.PackageUpdatedTask;
import com.android.launcher3.model.ShortcutsChangedTask;
import com.android.launcher3.model.UserLockStateChangedTask;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.util.IntSparseArrayMap;
import com.android.launcher3.util.ItemInfoMatcher;
import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.Thunk;
@@ -171,6 +173,30 @@ public class LauncherModel extends BroadcastReceiver
enqueueModelUpdateTask(new PackageUpdatedTask(op, user, packageName));
}
public void onSessionFailure(String packageName, UserHandle user) {
enqueueModelUpdateTask(new BaseModelUpdateTask() {
@Override
public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
final IntSparseArrayMap<Boolean> removedIds = new IntSparseArrayMap<>();
synchronized (dataModel) {
for (ItemInfo info : dataModel.itemsIdMap) {
if (info instanceof WorkspaceItemInfo
&& ((WorkspaceItemInfo) info).hasPromiseIconUi()
&& user.equals(info.user)
&& info.getIntent() != null
&& TextUtils.equals(packageName, info.getIntent().getPackage())) {
removedIds.put(info.id, true /* remove */);
}
}
}
if (!removedIds.isEmpty()) {
deleteAndBindComponentsRemoved(ItemInfoMatcher.ofItemIds(removedIds, false));
}
}
});
}
@Override
public void onPackageRemoved(String packageName, UserHandle user) {
onPackagesRemoved(user, packageName);
src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+10 -4
View File
@@ -140,6 +140,8 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
* - The settings for it are enabled
* - The user installed the app
* - There is an app icon and label (For apps with no launching activity, no icon is provided).
* - The app is not already installed
* - A promise icon for the session has not already been created
*/
private void tryQueuePromiseAppIcon(SessionInfo sessionInfo) {
if (Utilities.ATLEAST_OREO && FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
@@ -148,7 +150,9 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
&& sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
&& sessionInfo.getAppIcon() != null
&& !TextUtils.isEmpty(sessionInfo.getAppLabel())
&& !mPromiseIconIds.contains(sessionInfo.getSessionId())) {
&& !mPromiseIconIds.contains(sessionInfo.getSessionId())
&& mLauncherApps.getApplicationInfo(sessionInfo.getAppPackageName(), 0,
getUserHandle(sessionInfo)) == null) {
SessionCommitReceiver.queuePromiseAppIconAddition(mAppContext, sessionInfo);
mPromiseIconIds.add(sessionInfo.getSessionId());
updatePromiseIconPrefs();
@@ -183,12 +187,14 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
sendUpdate(PackageInstallInfo.fromState(success ? STATUS_INSTALLED : STATUS_FAILED,
packageName, key.mUser));
if (!success && FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()) {
if (!success && FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
&& mPromiseIconIds.contains(sessionId)) {
LauncherAppState appState = LauncherAppState.getInstanceNoCreate();
if (appState != null) {
LauncherModel model = appState.getModel();
model.onPackageRemoved(packageName, key.mUser);
appState.getModel().onSessionFailure(packageName, key.mUser);
}
// If it is successful, the id is removed in the the package added flow.
removePromiseIconId(sessionId);
}
}
}