| commit | 15c653c65c695b10fb389dad5a4e8cc77c530165 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue Sep 07 21:08:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 07 21:08:23 2021 +0000 |
| tree | 89328372fb5e95595f5fb32411f6f848a55cc753 | |
| parent | 86356d71bd0cfd7cf82f9411dd59850b17f93b7c [diff] | |
| parent | 437e44810dcc69daf00edd56ef8ac52aeef580a3 [diff] |
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
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);