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

Commit 7de0ae35 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Automerger Merge Worker
Browse files

Merge "Make letterbox education dialog react to dark/light themes" into... 

Merge "Make letterbox education dialog react to dark/light themes" into udc-dev am: 89106926 am: 21b3e879

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22930896



Change-Id: Ie90397508b39132ca641416c4dbb763bd8552da2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a51ce2d0 21b3e879

libs/WindowManager/Shell/res/drawable/letterbox_education_dialog_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
  ~ limitations under the License.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <solid android:color="@color/compat_controls_background"/>

    <solid android:color="?androidprv:attr/colorSurface"/>

    <corners android:radius="@dimen/letterbox_education_dialog_corner_radius"/>

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/letterbox_education_dismiss_button_background_ripple.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  ~ limitations under the License.

  -->

<inset xmlns:android="http://schemas.android.com/apk/res/android"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:insetTop="@dimen/letterbox_education_dialog_vertical_inset"

       android:insetBottom="@dimen/letterbox_education_dialog_vertical_inset">

    <ripple android:color="@color/letterbox_education_dismiss_button_background_ripple">
@@ -31,7 +32,7 @@ 
        </item>

        <item>

            <shape android:shape="rectangle">

                <solid android:color="@color/letterbox_education_accent_primary"/>

                <solid android:color="?androidprv:attr/colorAccentPrimaryVariant"/>

                <corners android:radius="@dimen/letterbox_education_dialog_button_radius"/>

                <padding android:left="@dimen/letterbox_education_dialog_horizontal_padding"

                         android:top="@dimen/letterbox_education_dialog_vertical_padding"

libs/WindowManager/Shell/res/drawable/letterbox_education_ic_light_bulb.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,12 +15,13 @@ 
  ~ limitations under the License.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        android:width="@dimen/letterbox_education_dialog_title_icon_width"

        android:height="@dimen/letterbox_education_dialog_title_icon_height"

        android:viewportWidth="45"

        android:viewportHeight="44">



    <path

        android:fillColor="@color/letterbox_education_accent_primary"

        android:fillColor="?androidprv:attr/colorAccentPrimaryVariant"

        android:pathData="M11 40H19C19 42.2 17.2 44 15 44C12.8 44 11 42.2 11 40ZM7 38L23 38V34L7 34L7 38ZM30 19C30 26.64 24.68 30.72 22.46 32L7.54 32C5.32 30.72 0 26.64 0 19C0 10.72 6.72 4 15 4C23.28 4 30 10.72 30 19ZM26 19C26 12.94 21.06 8 15 8C8.94 8 4 12.94 4 19C4 23.94 6.98 26.78 8.7 28L21.3 28C23.02 26.78 26 23.94 26 19ZM39.74 14.74L37 16L39.74 17.26L41 20L42.26 17.26L45 16L42.26 14.74L41 12L39.74 14.74ZM35 12L36.88 7.88L41 6L36.88 4.12L35 0L33.12 4.12L29 6L33.12 7.88L35 12Z" />

</vector>
 
 No newline at end of file

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="@dimen/letterbox_education_dialog_action_width"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"
@@ -36,7 +37,7 @@ 
        android:layout_height="wrap_content"

        android:lineSpacingExtra="4sp"

        android:textAlignment="center"

        android:textColor="@color/compat_controls_text"

        android:textColor="?android:attr/textColorSecondary"

        android:textSize="14sp"/>



</LinearLayout>
 
 No newline at end of file

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

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->

<com.android.wm.shell.compatui.LetterboxEduDialogLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    style="@style/LetterboxDialog">
@@ -66,7 +67,7 @@ 
                    android:lineSpacingExtra="4sp"

                    android:text="@string/letterbox_education_dialog_title"

                    android:textAlignment="center"

                    android:textColor="@color/compat_controls_text"

                    android:textColor="?android:attr/textColorPrimary"

                    android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"

                    android:textSize="24sp"/>
@@ -108,7 +109,7 @@ 
                    android:background=

                        "@drawable/letterbox_education_dismiss_button_background_ripple"

                    android:text="@string/letterbox_education_got_it"

                    android:textColor="@android:color/system_neutral1_900"

                    android:textColor="?android:attr/textColorPrimaryInverse"

                    android:textAlignment="center"

                    android:contentDescription="@string/letterbox_education_got_it"/>