From 7e6d2de489f6c6521ed7ab3fb2558e31cc7c7f52 Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Fri, 21 May 2021 13:48:09 -0400 Subject: [PATCH] Fix margins & padding to align long screenshot + markup Button styling still doesn't match, but placement does. Bug: 183197012 Test: Screenshots of both activities, verified alignment of UI elements. Change-Id: I5d75999106672f03c93597e99fea3e2fdcf6df21 --- packages/SystemUI/res/layout/long_screenshot.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml index 9911242e74c6a..21250c4f4c267 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"