commit fce063ad49a92396d3c5dd92f0fe1eb4ccb7f24e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 06 21:31:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 06 21:31:09 2022 +0000
tree 973f83556f09cc60379e5a7272bed77966bfd074
parent 12a5ffc5bd2d6ac33b26e6f792ec5180e605f881
parent c1ea2da7f3489d005357e74b7e8d5eb8cb62c714

Merge "Add DisplayController in PreviewContext's allowed objects" into tm-dev am: c1ea2da7f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198386

Change-Id: If14bdc8198bfe737e2c8ceff41d590469be75af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 a11bd4f..d5bcb0c 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -83,6 +83,7 @@
 import com.android.launcher3.uioverrides.PredictedAppIconInflater;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext;
@@ -129,7 +130,7 @@
             super(base, UserCache.INSTANCE, InstallSessionHelper.INSTANCE,
                     LauncherAppState.INSTANCE, InvariantDeviceProfile.INSTANCE,
                     CustomWidgetManager.INSTANCE, PluginManagerWrapper.INSTANCE,
-                    WindowManagerProxy.INSTANCE);
+                    WindowManagerProxy.INSTANCE, DisplayController.INSTANCE);
             mIdp = idp;
             mObjectMap.put(InvariantDeviceProfile.INSTANCE, idp);
             mObjectMap.put(LauncherAppState.INSTANCE,