From 5cc47e5383a472c96a4f6f029c5a4d41ab29b3d8 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Sat, 20 Mar 2021 17:11:14 -0400
Subject: [PATCH] Fix CropView sizing on full-width images

Full width images happen when the long screenshot isn't particularly
long, typically an error case.

- Ensure that ImageView and CropView take up the whole space defined by
constraints.
- Set padding on ImageView, factor that padding into the image size
computation for CropView.

Bug: 183278746
Test: Validate correct crop bounds display on a full height and a full
      width long screenshot.
Change-Id: I0f71ddc051f8cf6d295a348fe3cae3cbe00e4077
---
 packages/SystemUI/res/layout/long_screenshot.xml       | 10 +++++-----
 .../systemui/screenshot/LongScreenshotActivity.java    |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index 7ba28a8483c39..b2b99a78de6a0 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -72,10 +72,10 @@
 
     <ImageView
         android:id="@+id/preview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0px"
+        android:layout_height="0px"
         android:layout_marginBottom="42dp"
-        android:layout_marginHorizontal="48dp"
+        android:paddingHorizontal="48dp"
         app:layout_constrainedHeight="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintTop_toBottomOf="@id/guideline"
@@ -88,8 +88,8 @@
 
     <com.android.systemui.screenshot.CropView
         android:id="@+id/crop_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0px"
+        android:layout_height="0px"
         android:layout_marginBottom="42dp"
         app:layout_constrainedHeight="true"
         app:layout_constrainedWidth="true"
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
index 46091a68a591c..6e83c961a6c3b 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
@@ -415,7 +415,9 @@ public class LongScreenshotActivity extends Activity {
         }
         Rect bounds = drawable.getBounds();
         float imageRatio = bounds.width() / (float) bounds.height();
-        float viewRatio = mPreview.getWidth() / (float) mPreview.getHeight();
+        int previewWidth = mPreview.getWidth() - mPreview.getPaddingLeft()
+                - mPreview.getPaddingRight();
+        float viewRatio = previewWidth / (float) mPreview.getHeight();
 
         if (imageRatio > viewRatio) {
             // Image is full width and height is constrained, compute extra padding to inform
@@ -423,7 +425,7 @@ public class LongScreenshotActivity extends Activity {
             float imageHeight = mPreview.getHeight() * viewRatio / imageRatio;
             int extraPadding = (int) (mPreview.getHeight() - imageHeight) / 2;
             mCropView.setExtraPadding(extraPadding, extraPadding);
-            mCropView.setImageWidth(mPreview.getWidth());
+            mCropView.setImageWidth(previewWidth);
         } else {
             // Image is full height
             mCropView.setExtraPadding(0, 0);