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

Commit ce2ef29d authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Update Compat UI colours and padding 

Updated letterbox edu dialog icons and restart dialog icons. Used new
padding for letterbox edu dialog and right align buttons in restart
dialog.

Flag: EXEMPT resources only update
Fix: 365536132
Test: m
Change-Id: I1694926c55a5ef468a9cf77b0f70e9b13b1ea9da
parent 43dcc0ef

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

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<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="?androidprv:attr/colorSurface"/>

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

    <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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        </item>

        <item>

            <shape android:shape="rectangle">

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

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

                <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

+9 −6
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ 
        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">



        android:viewportWidth="32"

        android:viewportHeight="32">

    <group>

        <clip-path

            android:pathData="M0,0h32v32h-32z"/>

        <path

        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" />

            android:pathData="M5.867,22.667C4.489,21.844 3.389,20.733 2.567,19.333C1.744,17.933 1.333,16.378 1.333,14.667C1.333,12.067 2.233,9.867 4.033,8.067C5.856,6.244 8.067,5.333 10.667,5.333C13.267,5.333 15.467,6.244 17.267,8.067C19.089,9.867 20,12.067 20,14.667C20,16.378 19.589,17.933 18.767,19.333C17.944,20.733 16.844,21.844 15.467,22.667H5.867ZM6.667,20H14.667C15.511,19.356 16.167,18.578 16.633,17.667C17.1,16.733 17.333,15.733 17.333,14.667C17.333,12.822 16.678,11.256 15.367,9.967C14.078,8.656 12.511,8 10.667,8C8.822,8 7.244,8.656 5.933,9.967C4.644,11.256 4,12.822 4,14.667C4,15.733 4.233,16.733 4.7,17.667C5.167,18.578 5.822,19.356 6.667,20ZM7.2,26.667C6.822,26.667 6.5,26.544 6.233,26.3C5.989,26.033 5.867,25.711 5.867,25.333C5.867,24.956 5.989,24.644 6.233,24.4C6.5,24.133 6.822,24 7.2,24H14.133C14.511,24 14.822,24.133 15.067,24.4C15.333,24.644 15.467,24.956 15.467,25.333C15.467,25.711 15.333,26.033 15.067,26.3C14.822,26.544 14.511,26.667 14.133,26.667H7.2ZM10.667,30.667C9.933,30.667 9.3,30.411 8.767,29.9C8.256,29.367 8,28.733 8,28H13.333C13.333,28.733 13.067,29.367 12.533,29.9C12.022,30.411 11.4,30.667 10.667,30.667ZM24.667,13.367C24.667,11.7 24.078,10.278 22.9,9.1C21.722,7.922 20.3,7.333 18.633,7.333C20.3,7.333 21.722,6.756 22.9,5.6C24.078,4.422 24.667,3 24.667,1.333C24.667,3 25.244,4.422 26.4,5.6C27.578,6.756 29,7.333 30.667,7.333C29,7.333 27.578,7.922 26.4,9.1C25.244,10.278 24.667,11.7 24.667,13.367Z"

            android:fillColor="?androidprv:attr/materialColorPrimary"/>

    </group>

</vector>
 
 No newline at end of file

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

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

  -->

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

        android:width="@dimen/letterbox_education_dialog_icon_width"

        android:height="@dimen/letterbox_education_dialog_icon_height"

        android:viewportWidth="40"

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="32"

        android:viewportHeight="32">



    <path

        android:pathData="M4,4C2.527,4 1.333,5.194 1.333,6.667V25.333C1.333,26.806 2.527,28 4,28H28C29.472,28 30.666,26.806 30.666,25.333V6.667C30.666,5.194 29.472,4 28,4H4ZM28,6.667H4V25.333H28V6.667Z"

        android:fillColor="@color/letterbox_education_text_secondary"

        android:fillType="evenOdd"

        android:pathData="M4 0C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H36C38.2091 32 40 30.2091 40 28V4C40 1.79086 38.2091 0 36 0H4ZM36 4H4V28H36V4Z" />

        android:fillType="evenOdd" />

    <path

        android:fillColor="@color/letterbox_education_text_secondary"

        android:pathData="M19.98 8L17.16 10.82L20.32 14L12 14V18H20.32L17.14 21.18L19.98 24L28 16.02L19.98 8Z" />

        android:pathData="M17.32,10.667L15.44,12.547L17.546,14.667L9.333,14.667L9.333,17.333H17.546L15.426,19.453L17.32,21.333L22.666,16.013L17.32,10.667Z"

        android:fillColor="@color/letterbox_education_text_secondary" />

</vector>

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

+3 −3
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="@dimen/letterbox_education_dialog_icon_width"

        android:height="@dimen/letterbox_education_dialog_icon_height"

        android:viewportWidth="40"

        android:viewportHeight="32">

        android:viewportWidth="28"

        android:viewportHeight="22">



    <path

        android:fillColor="@color/letterbox_education_text_secondary"

        android:pathData="M40 28L40 4C40 1.8 38.2 -7.86805e-08 36 -1.74846e-07L26 -6.11959e-07C23.8 -7.08124e-07 22 1.8 22 4L22 28C22 30.2 23.8 32 26 32L36 32C38.2 32 40 30.2 40 28ZM14 28L4 28L4 4L14 4L14 28ZM18 28L18 4C18 1.8 16.2 -1.04033e-06 14 -1.1365e-06L4 -1.57361e-06C1.8 -1.66978e-06 -7.86805e-08 1.8 -1.74846e-07 4L-1.22392e-06 28C-1.32008e-06 30.2 1.8 32 4 32L14 32C16.2 32 18 30.2 18 28Z" />

        android:pathData="M27.333,19L27.333,3C27.333,1.533 26.133,0.333 24.666,0.333L18,0.333C16.533,0.333 15.333,1.533 15.333,3L15.333,19C15.333,20.467 16.533,21.667 18,21.667L24.666,21.667C26.133,21.667 27.333,20.467 27.333,19ZM10,19L3.333,19L3.333,3L10,3L10,19ZM12.666,19L12.666,3C12.666,1.533 11.466,0.333 10,0.333L3.333,0.333C1.866,0.333 0.666,1.533 0.666,3L0.666,19C0.666,20.467 1.866,21.667 3.333,21.667L10,21.667C11.466,21.667 12.666,20.467 12.666,19Z" />

</vector>
 
 No newline at end of file