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

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

Merge "Fix rounded borders of save/edit to match spec" into sc-dev am: 44ef70af 

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

Change-Id: I907fd0a816173d2682506bfc9fc673ce6dd34786
parents d06c110f 44ef70af

packages/SystemUI/res/drawable/screenshot_edit_background.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- Long screenshot edit FAB background -->

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

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

        android:color="?android:textColorPrimary">

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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/drawable/screenshot_save_background.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- Long screenshot save button background -->

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

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

        android:color="?android:textColorPrimary">

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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

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

        <shape android:shape="rectangle">

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SystemUI/res/layout/long_screenshot.xml

+3 −3
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 
        android:id="@+id/save"

        style="@android:style/Widget.DeviceDefault.Button.Colored"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="40dp"

        android:text="@string/save"

        android:layout_marginStart="8dp"

        android:layout_marginTop="4dp"

        android:backgroundTint="?androidprv:attr/colorAccentSecondary"

        android:background="@drawable/screenshot_save_background"

        android:textColor="?android:textColorSecondary"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"
@@ -114,7 +114,7 @@ 
        android:layout_marginBottom="16dp"

        android:layout_marginEnd="16dp"

        style="@android:style/Widget.DeviceDefault.Button.Colored"

        android:backgroundTint="?androidprv:attr/colorAccentSecondary"

        android:background="@drawable/screenshot_edit_background"

        android:src="@drawable/ic_screenshot_edit"

        android:contentDescription="@string/screenshot_edit_label"

        android:tint="?android:textColorSecondary"