commit 33512be4112241b9f7f8d427f40909c41f3a980b
author Matt Casey <mrcasey@google.com> Fri May 21 20:53:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 21 20:53:02 2021 +0000
tree 9c93f0b1f91c97caa27c01a2660f0c064d199ec1
parent dd8b94557dd0020b683bd5ff2b2ca72dc79cfd0f
parent 7e6d2de489f6c6521ed7ab3fb2558e31cc7c7f52

Merge "Fix margins & padding to align long screenshot + markup" into sc-dev

packages/SystemUI/res/layout/long_screenshot.xml

diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index 18a468e..9b3b39d 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -30,7 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/save"
-        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
         android:backgroundTint="?androidprv:attr/colorAccentSecondary"
         android:textColor="?androidprv:attr/textColorSecondary"
         app:layout_constraintStart_toStartOf="parent"
@@ -43,9 +44,11 @@
         android:tint="?android:textColorPrimary"
         android:layout_width="48dp"
         android:layout_height="48dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="4dp"
         android:padding="12dp"
         android:src="@drawable/ic_screenshot_share"
-        android:layout_marginRight="8dp"
+        android:scaleType="fitCenter"
         android:contentDescription="@*android:string/share"
         android:tooltipText="@*android:string/share"
         app:layout_constraintEnd_toEndOf="parent"