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

Commit ac33d5eb authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Update screenshot and long screenshot UI to match mocks" into udc-dev... 

Merge "Update screenshot and long screenshot UI to match mocks" into udc-dev am: 2f80e5e1 am: 35229761

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



Change-Id: I4478d3bf3f586b5deb8660d47aa53333c417795c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a4bb496 35229761

packages/SystemUI/res/drawable/action_chip_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:color="@color/overlay_button_ripple">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

packages/SystemUI/res/drawable/action_chip_container_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
    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/materialColorSurfaceBright"/>

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

</shape>

packages/SystemUI/res/drawable/overlay_cancel.xml→packages/SystemUI/res/drawable/circular_background.xml

+7 −10
Original line number Diff line number Diff line
@@ -16,14 +16,11 @@ 
  -->

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

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

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0">

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

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

        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"/>

    <path

        android:fillColor="?attr/overlayButtonTextColor"

        android:pathData="M23,10.41L21.59,9 16,14.59 10.41,9 9,10.41 14.59,16 9,21.59 10.41,23 16,17.41 21.59,23 23,21.59 17.41,16z"/>

        android:fillColor="#ff000000"

        android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"/>

   </vector>

packages/SystemUI/res/drawable/overlay_border.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
    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"/>

    <corners android:radius="24dp"/>

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

    <corners android:radius="16dp"/>

</shape>

packages/SystemUI/res/drawable/overlay_button_background.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
<!-- Button background for activities downstream of overlays

     (clipboard text editor, long screenshots) -->

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

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

        android:color="@color/overlay_button_ripple">

    <item android:id="@android:id/background">

        <inset android:insetTop="4dp" android:insetBottom="4dp">

            <shape android:shape="rectangle">

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

                <solid android:color="#fff"/>

                <corners android:radius="20dp"/>

                <size android:height="40dp"/>

            </shape>
@@ -31,7 +30,7 @@ 
    <item android:id="@android:id/mask">

        <inset android:insetTop="4dp" android:insetBottom="4dp">

            <shape android:shape="rectangle">

                <solid android:color="?android:textColorPrimary"/>

                <solid android:color="#000"/>

                <corners android:radius="20dp"/>

                <size android:height="40dp"/>

            </shape>