From dedee5c526e4b520b63a9c48960453ab54d3b838 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Wed, 26 May 2021 19:31:33 -0400
Subject: [PATCH] Fix rounded borders of save/edit to match spec

Save should be fully rounded, edit with a 16dp radius.

Drawable based upon frameworks/base/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml

Bug: 189279910
Test: Visual inspection, observing transition into markup.
Change-Id: I5428d69e4c30479fd16474a4f66ebefbc1dd3564
---
 .../drawable/screenshot_edit_background.xml   | 33 +++++++++++++++++++
 .../drawable/screenshot_save_background.xml   | 33 +++++++++++++++++++
 .../SystemUI/res/layout/long_screenshot.xml   |  6 ++--
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable/screenshot_edit_background.xml
 create mode 100644 packages/SystemUI/res/drawable/screenshot_save_background.xml

diff --git a/packages/SystemUI/res/drawable/screenshot_edit_background.xml b/packages/SystemUI/res/drawable/screenshot_edit_background.xml
new file mode 100644
index 0000000000000..5c3c12c572f68
--- /dev/null
+++ b/packages/SystemUI/res/drawable/screenshot_edit_background.xml
@@ -0,0 +1,33 @@
+<?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
diff --git a/packages/SystemUI/res/drawable/screenshot_save_background.xml b/packages/SystemUI/res/drawable/screenshot_save_background.xml
new file mode 100644
index 0000000000000..cfd2dc2144776
--- /dev/null
+++ b/packages/SystemUI/res/drawable/screenshot_save_background.xml
@@ -0,0 +1,33 @@
+<?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
diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index de3384657d9d7..8e30aecd6a279 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -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"