diff options
Diffstat (limited to 'libs')
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 3a44eb9089dd..100ed18b6a66 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 bae009a0526f..776186c74737 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> |