Merge "Fix wallpaper picker crash if folder is in hotseat" into sc-v2-dev am: 437e44810d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15779378 Change-Id: Ibc3b3979c98c2c7f92e32a58ab00495e4ee4e40d
2021-09-07 21:08:23 +00:00
parent 86356d71bd 437e44810d
commit 15c653c65c
1 changed files with 3 additions and 1 deletions
@@ -324,7 +324,9 @@ public class LauncherPreviewRenderer extends ContextWrapper
    }

    private void inflateAndAddFolder(FolderInfo info) {
-        CellLayout screen = mWorkspaceScreens.get(info.screenId);
+        CellLayout screen = info.container == Favorites.CONTAINER_DESKTOP
+                ? mWorkspaceScreens.get(info.screenId)
+                : mHotseat;
        FolderIcon folderIcon = FolderIcon.inflateIcon(R.layout.folder_icon, this, screen,
                info);
        addInScreenFromBind(folderIcon, info);