Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717a9c2f authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Fix overdraw lint warnings in letterbox dialog 

Use same style for both letterbox restart and education dialog layout

Fix: 266288912
Test: Manual
Change-Id: Ib17fef05d035f87a8c5e6fb2814632caf19ae23f
parent 56f93f42

libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml

+1 −3
Original line number Diff line number Diff line
@@ -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. -->

libs/WindowManager/Shell/res/layout/letterbox_restart_dialog_layout.xml

+1 −5
Original line number Diff line number Diff line
@@ -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. -->

libs/WindowManager/Shell/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

libs/WindowManager/Shell/res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>