From dd4b3754be6ef1cec41df1a25e6baa6fcde8a1f2 Mon Sep 17 00:00:00 2001 From: Graciela Wissen Putri Date: Fri, 24 Feb 2023 17:48:14 +0000 Subject: [PATCH] Vertically center SCM restart dialog Only update margins based on taskbar insets since app bounds include status bar insets. Fix: 269102159 Test: Manual using `adb shell dumpsys activity service SystemUIService WMShell compatui restartDialogEnabled 1` Change-Id: I1e5648849277a94ddb8abf99d5a23b49a7b2a37c --- .../wm/shell/compatui/RestartDialogWindowManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/RestartDialogWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/RestartDialogWindowManager.java index aab123a843ea3..f5c7481d1fbca 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/RestartDialogWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/RestartDialogWindowManager.java @@ -170,10 +170,10 @@ class RestartDialogWindowManager extends CompatUIWindowManagerAbstract { final Rect taskBounds = getTaskBounds(); final Rect taskStableBounds = getTaskStableBounds(); - - marginParams.topMargin = taskStableBounds.top - taskBounds.top + mDialogVerticalMargin; - marginParams.bottomMargin = - taskBounds.bottom - taskStableBounds.bottom + mDialogVerticalMargin; + // only update margins based on taskbar insets + marginParams.topMargin = mDialogVerticalMargin; + marginParams.bottomMargin = taskBounds.bottom - taskStableBounds.bottom + + mDialogVerticalMargin; dialogContainer.setLayoutParams(marginParams); }