Merge cherrypicks of ['googleplex-android-review.googlesource.com/34377367', 'googleplex-android-review.googlesource.com/34554706'] into 25Q3-release.

Change-Id: I9abcf149775d347aefe3d8aaa36cd0bf3f3895a1
This commit is contained in:
Android Build Coastguard Worker
2025-07-15 19:58:53 -07:00
2 changed files with 5 additions and 4 deletions
@@ -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
}
@@ -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)