diff options
| author | 2023-03-01 18:51:26 +0000 | |
|---|---|---|
| committer | 2023-03-01 18:51:26 +0000 | |
| commit | 98cc6ca03e4c6582d65fc4c6eceb8bdd4c5b8d8c (patch) | |
| tree | f3d6f5727ee500fc018d6d49dae0f215b9c225ff | |
| parent | c79b31e372dd83b5b4df3ab2fcaacd90140628b5 (diff) | |
| parent | c7355639a03fa732448b92b4955b196899a9da38 (diff) | |
Merge "Fix overdraw lint warnings in letterbox dialog" into tm-qpr-dev am: c7355639a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21612779
Change-Id: I4fbde6105ebfdea9d3cdd225ffbce7699d007d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 11 insertions, 8 deletions
diff --git a/libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml b/libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml index e8edad15dfc3..413cfd78fd91 100644 --- a/libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml +++ b/libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml @@ -16,9 +16,7 @@ <com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@android:color/system_neutral1_900"> + style="@style/LetterboxDialog"> <!-- The background of the top-level layout acts as the background dim. --> diff --git a/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml b/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml index ba9852c4dd6b..5aff4159e135 100644 --- a/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml +++ b/libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml @@ -16,14 +16,10 @@ <com.android.wm.shell.compatui.RestartDialogLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@android:color/system_neutral1_900"> + style="@style/LetterboxDialog"> <!-- The background of the top-level layout acts as the background dim. --> - <!--TODO (b/266288912): Resolve overdraw warning --> - <!-- Vertical margin will be set dynamically since it depends on task bounds. Setting the alpha of the dialog container to 0, since it shouldn't be visible until the enter animation starts. --> diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml index 6e750a3d5e34..965ab1519df4 100644 --- a/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml @@ -41,6 +41,9 @@ <color name="letterbox_education_accent_primary">@android:color/system_accent1_100</color> <color name="letterbox_education_text_secondary">@android:color/system_neutral2_200</color> + <!-- Letterbox Dialog --> + <color name="letterbox_dialog_background">@android:color/system_neutral1_900</color> + <!-- GM2 colors --> <color name="GM2_grey_200">#E8EAED</color> <color name="GM2_grey_700">#5F6368</color> diff --git a/libs/WindowManager/Shell/res/values/styles.xml b/libs/WindowManager/Shell/res/values/styles.xml index 0a0c49f2d93f..39d3deb683f0 100644 --- a/libs/WindowManager/Shell/res/values/styles.xml +++ b/libs/WindowManager/Shell/res/values/styles.xml @@ -80,6 +80,12 @@ <item name="android:textColor">@color/tv_pip_edu_text</item> </style> + <style name="LetterboxDialog" parent="@android:style/Theme.Holo"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@color/letterbox_dialog_background</item> + </style> + <style name="RestartDialogTitleText"> <item name="android:textSize">24sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> |