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

Commit 4030a4bc authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Swith long screenshot UI to colorAccentPrimary" into sc-dev am: 29ce722f 

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

Change-Id: I409f58775be8e2ddf565c8936d5e547afc4592c6
parents 45b878ed 29ce722f

packages/SystemUI/res/drawable/screenshot_edit_background.xml

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

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

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

packages/SystemUI/res/drawable/screenshot_save_background.xml

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

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

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

packages/SystemUI/res/layout/long_screenshot.xml

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:handleThickness="@dimen/screenshot_crop_handle_thickness"

        app:handleColor="?androidprv:attr/colorAccentSecondary"

        app:handleColor="?androidprv:attr/colorAccentPrimary"

        app:scrimColor="@color/screenshot_crop_scrim"

        tools:background="?android:colorBackground"

        tools:minHeight="100dp"