From 7674c1fa6b27fe89e7635e7c4950ffba9ae91e35 Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Wed, 9 Jun 2021 19:01:26 +0000
Subject: [PATCH 1/2] Fix screenshot preview border in RTL

The constraints were pulling the border "in" from the preview edge
instead of extending "out" around it, in RTL. This change makes it
show up correctly in both LTR/RTL layouts.

Bug: 190629016
Fix: 190629016
Test: visual verification
Change-Id: I89e88479f3a268a73da444c55b54db6cfe8f2781
---
 .../SystemUI/res/layout/global_screenshot_static.xml     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/global_screenshot_static.xml b/packages/SystemUI/res/layout/global_screenshot_static.xml
index 60dbaf97b7f7b..4eb47401fdacd 100644
--- a/packages/SystemUI/res/layout/global_screenshot_static.xml
+++ b/packages/SystemUI/res/layout/global_screenshot_static.xml
@@ -71,7 +71,7 @@
         android:background="@drawable/screenshot_border"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/screenshot_preview_end"
+        app:layout_constraintEnd_toEndOf="@+id/screenshot_preview_end"
         app:layout_constraintTop_toTopOf="@+id/screenshot_preview_top"/>
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/screenshot_preview_end"
@@ -91,8 +91,7 @@
         android:id="@+id/global_screenshot_preview"
         android:visibility="invisible"
         android:layout_width="@dimen/global_screenshot_x_scale"
-        android:layout_marginStart="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_margin="4dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:elevation="@dimen/screenshot_preview_elevation"
@@ -101,7 +100,9 @@
         android:background="@drawable/screenshot_preview_background"
         android:adjustViewBounds="true"
         app:layout_constraintBottom_toBottomOf="@+id/global_screenshot_preview_border"
-        app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border">
+        app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border"
+        app:layout_constraintEnd_toEndOf="@+id/global_screenshot_preview_border"
+        app:layout_constraintTop_toTopOf="@+id/global_screenshot_preview_border">
     </ImageView>
     <FrameLayout
         android:id="@+id/global_screenshot_dismiss_button"

From b99d9af1dcd5d9f11b97c08b3b53d137a48f6c1a Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Wed, 9 Jun 2021 19:05:42 +0000
Subject: [PATCH 2/2] Fix screenshot preview border radii

Currently the corner radii are the same (20dp) for both the preview
and the border around it. However, this looks wrong because the
border is larger. To match the curve it needs to have 24dp radii
corners (=20 + 4dp border).

Old: https://screenshot.googleplex.com/5SLGsc4Erqus9r6
New: https://screenshot.googleplex.com/Cz7w72BzjgqfqbV

Bug: 190630434
Fix: 190630434
Test: visual verification
Change-Id: I737c4091a607ffdf854d5b7418634f1bdcba75a0
---
 packages/SystemUI/res/drawable/screenshot_border.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/drawable/screenshot_border.xml b/packages/SystemUI/res/drawable/screenshot_border.xml
index bb858dbc795ad..c1accdc7063a9 100644
--- a/packages/SystemUI/res/drawable/screenshot_border.xml
+++ b/packages/SystemUI/res/drawable/screenshot_border.xml
@@ -19,5 +19,5 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
     <solid android:color="?androidprv:attr/colorSurface"/>
-    <corners android:radius="20dp"/>
+    <corners android:radius="24dp"/>
 </shape>