Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix overdraw lint warnings in letterbox dialog" into tm-qpr-dev

Browse Source
This commit is contained in:
Graciela Putri
2023-03-01 09:28:50 +00:00
committed by Android (Google) Code Review
parent edd748ea3e 717a9c2fa6
commit c7355639a0
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml
View File

@@ -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. -->

6
libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml
View File

@@ -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. -->

3
libs/WindowManager/Shell/res/values/colors.xml
View File

@@ -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>

6
libs/WindowManager/Shell/res/values/styles.xml
View File

@@ -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>