From ff0e4ec6bb42299e63e15381cdbcb2b3ef5ed87c Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Mon, 7 Jul 2025 13:16:56 -0700 Subject: [PATCH 1/2] Log event when windowInsetsController is null Set up ww logging for this case. bug: 425502603 Test: presubmit and made sure its loggable by setting null Flag: EXEMPT adding log for ww (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32ac0c244589cedd65320d68c0c7bcbe3f5939f1) Merged-In: I800bfc4c902bbdedee770507624b7628489ccc3b Change-Id: I800bfc4c902bbdedee770507624b7628489ccc3b --- src/com/android/launcher3/logging/StatsLogManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/launcher3/logging/StatsLogManager.kt b/src/com/android/launcher3/logging/StatsLogManager.kt index 61e947ebcc..fd0ef49408 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.kt +++ b/src/com/android/launcher3/logging/StatsLogManager.kt @@ -623,6 +623,8 @@ open class StatsLogManager protected constructor(@JvmField protected val mContex LAUNCHER_DESKTOP_MODE_TASKBAR_PINNED(2241), @UiEvent(doc = "User has unpinned taskbar in desktop mode using taskbar divider menu") LAUNCHER_DESKTOP_MODE_TASKBAR_UNPINNED(2242), + @UiEvent(doc = "Launcher window insets controller reportedly null") + LAUNCHER_WINDOW_INSETS_CONTROLLER_NULL(2400), // ADD MORE } From 346f5d789063d51f90e5212d96646a6168355af5 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Mon, 14 Jul 2025 12:11:06 -0700 Subject: [PATCH 2/2] Actually updating the LayoutParams in the LauncherPreview When cleaning the code for ag/34436200 I accidentally removed the fixing line which was removing the old setLayoutParams for the new one. Fix: 431696619 Fix: 429081966 Test: Manul test Flag: EXEMPT bug fix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fa233150bace5dc6a23272301065d0b35080c215) Merged-In: I2cca194064b30a61eeacb6a376989c71b3522e87 Change-Id: I2cca194064b30a61eeacb6a376989c71b3522e87 --- .../android/launcher3/preview/PreviewSurfaceRenderer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java b/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java index 9acac237a4..07a29bcd04 100644 --- a/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java +++ b/src/com/android/launcher3/preview/PreviewSurfaceRenderer.java @@ -350,9 +350,6 @@ public class PreviewSurfaceRenderer { mHeight / (float) view.getMeasuredHeight()); view.setScaleX(scale); view.setScaleY(scale); - LayoutParams lp = new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight()); - lp.gravity = Gravity.CENTER; - view.setLayoutParams(lp); if (!Flags.newCustomizationPickerUi()) { view.setAlpha(mSkipAnimations ? 1 : 0); @@ -368,7 +365,9 @@ public class PreviewSurfaceRenderer { return; } - view.setLayoutParams(new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight())); + LayoutParams lp = new LayoutParams(view.getMeasuredWidth(), view.getMeasuredHeight()); + lp.gravity = Gravity.CENTER; + view.setLayoutParams(lp); if (mViewRoot.getChildCount() == 0) { mViewRoot.addView(view); mViewRoot.animate().alpha(1)