From 8418b0ad88e0a1cb795e505258da54fa0b142b24 Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Fri, 2 Jul 2021 14:38:59 -0400 Subject: [PATCH 1/2] Fix LSS->Markup transition in RTL We were constraining the transition view to the start, but adjusting its location using paddingLeft, etc, which led to incorrect behavior in RTL. Instead constrain to left so that everything is consistent. Bug: 190757843 Fix: 190757843 Test: manual Change-Id: I07becea2ee0e11d74a1aac350aa7d0693d712bfb --- packages/SystemUI/res/layout/long_screenshot.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml index 8a2c8f09948d2..04bd7b9077aae 100644 --- a/packages/SystemUI/res/layout/long_screenshot.xml +++ b/packages/SystemUI/res/layout/long_screenshot.xml @@ -159,7 +159,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="@id/preview" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintLeft_toLeftOf="parent" android:scaleType="centerCrop" android:visibility="invisible" /> From b3306c275f9b18ea9171449f5cfe0cf3516974ea Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Fri, 2 Jul 2021 16:24:19 -0400 Subject: [PATCH 2/2] Fix screenshot->long screenshot transition in RTL The x-translation of the preview wasn't getting set correctly in RTL. Bug: 183197533 Test: manual Change-Id: I6b4df38854ea7c922697f3dcdacb7d11fbb0654d --- .../src/com/android/systemui/screenshot/ScreenshotView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index 804e299076068..e9e62f26a10e1 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -868,7 +868,8 @@ public class ScreenshotView extends FrameLayout implements matrix.setScale(scale, scale); matrix.postTranslate(-scrollableArea.left * scale, -scrollableArea.top * scale); - mScrollablePreview.setTranslationX(scale * scrollableArea.left); + mScrollablePreview.setTranslationX(scale + * (mDirectionLTR ? scrollableArea.left : scrollableArea.right - getWidth())); mScrollablePreview.setTranslationY(scale * scrollableArea.top); mScrollablePreview.setImageMatrix(matrix); mScrollablePreview.setImageBitmap(screenBitmap);