Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add extra padding to long screenshot crop

Browse Source 
Modify padding code to account for this handling properly.

Test: Test on full width and full height images, ensure touch area
expanded into padding, handles visible at edges.
Bug: 183278748

Change-Id: I083527467940206286ec485f92e56f0c19327219
This commit is contained in:
Matt Casey
2021-04-01 11:31:46 -04:00
parent f02ab42507
commit 1f757a98d8
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/long_screenshot.xml
View File

@@ -50,8 +50,9 @@
android:id="@+id/preview"
android:layout_width="0px"
android:layout_height="0px"
android:layout_marginBottom="42dp"
android:paddingHorizontal="48dp"
android:paddingTop="8dp"
android:paddingBottom="42dp"
app:layout_constrainedHeight="true"
app:layout_constrainedWidth="true"
app:layout_constraintTop_toBottomOf="@id/save"
@@ -66,7 +67,8 @@
android:id="@+id/crop_view"
android:layout_width="0px"
android:layout_height="0px"
android:layout_marginBottom="42dp"
android:paddingTop="8dp"
android:paddingBottom="42dp"
app:layout_constrainedHeight="true"
app:layout_constrainedWidth="true"
app:layout_constraintTop_toTopOf="@id/preview"

15
packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
View File

@@ -411,19 +411,22 @@ public class LongScreenshotActivity extends Activity {
float imageRatio = bounds.width() / (float) bounds.height();
int previewWidth = mPreview.getWidth() - mPreview.getPaddingLeft()
- mPreview.getPaddingRight();
float viewRatio = previewWidth / (float) mPreview.getHeight();
int previewHeight = mPreview.getHeight() - mPreview.getPaddingTop()
- mPreview.getPaddingBottom();
float viewRatio = previewWidth / (float) previewHeight;
if (imageRatio > viewRatio) {
// Image is full width and height is constrained, compute extra padding to inform
// CropView
float imageHeight = mPreview.getHeight() * viewRatio / imageRatio;
int extraPadding = (int) (mPreview.getHeight() - imageHeight) / 2;
mCropView.setExtraPadding(extraPadding, extraPadding);
float imageHeight = previewHeight * viewRatio / imageRatio;
int extraPadding = (int) (previewHeight - imageHeight) / 2;
mCropView.setExtraPadding(extraPadding + mPreview.getPaddingTop(),
extraPadding + mPreview.getPaddingBottom());
mCropView.setImageWidth(previewWidth);
} else {
// Image is full height
mCropView.setExtraPadding(0, 0);
mCropView.setImageWidth((int) (mPreview.getHeight() * imageRatio));
mCropView.setExtraPadding(mPreview.getPaddingTop(), mPreview.getPaddingBottom());
mCropView.setImageWidth((int) (previewHeight * imageRatio));
}
}