From 5ff90cd057aff06da2fe103b4914346a67795bd2 Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Sat, 21 Oct 2023 22:17:24 -0700 Subject: [PATCH] Prevent app pairs rank from resetting on Launcher model reload This fixes a bug where app pairs rank was mistakenly reset upon Launcher reload, causing app pairs to launch with the wrong ratio. Bug: 274835596 Test: App pairs restore properly even after Launcher restart Flag: ENABLE_APP_PAIRS Change-Id: I5d37190cd994628886f77e089c71fc5e5dddc03e --- src/com/android/launcher3/model/LoaderTask.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 6ab8fc50a4..1ab0355bb8 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -18,6 +18,7 @@ package com.android.launcher3.model; import static com.android.launcher3.BuildConfig.WIDGET_ON_FIRST_SCREEN; import static com.android.launcher3.LauncherPrefs.SHOULD_SHOW_SMARTSPACE; +import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR; import static com.android.launcher3.LauncherSettings.Favorites.TABLE_NAME; import static com.android.launcher3.config.FeatureFlags.ENABLE_SMARTSPACE_REMOVAL; import static com.android.launcher3.config.FeatureFlags.SMARTSPACE_AS_A_WIDGET; @@ -480,7 +481,10 @@ public class LoaderTask implements Runnable { // for now. Database will be updated once user manually modifies folder. for (int rank = 0; rank < size; ++rank) { WorkspaceItemInfo info = folder.contents.get(rank); - info.rank = rank; + // rank is used differently in app pairs, so don't reset + if (folder.itemType != ITEM_TYPE_APP_PAIR) { + info.rank = rank; + } if (info.usingLowResIcon() && info.itemType == Favorites.ITEM_TYPE_APPLICATION