commit 437e44810dcc69daf00edd56ef8ac52aeef580a3
author Tony Wickham <twickham@google.com> Tue Sep 07 20:52:44 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 07 20:52:44 2021 +0000
tree 0ac05235fe7995b847b1138dc2e3cbd33bb078dd
parent bfaf09ebef3f0dbcac75b81cfa22e5de504cbbc8
parent 302eff9c84cd8d9e2b41e69d3feeff3925936d3d

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

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 43ac8f9..7a8b5d8 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -324,7 +324,9 @@
     }
 
     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);