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

Merge changes I6b4df388,I07becea2 into sc-dev am: ce8ca17d89

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191539

Change-Id: I2e9c40b3400cfacc99af7acd8ea232b2fa04a1e2
This commit is contained in:
Miranda Kephart
2021-07-06 22:11:25 +00:00
committed by Automerger Merge Worker
parent 97c91cdd6f ce8ca17d89
commit 609717560a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/preview" app:layout_constraintTop_toTopOf="@id/preview"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:visibility="invisible" android:visibility="invisible"
/> />

3
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -868,7 +868,8 @@ public class ScreenshotView extends FrameLayout implements
matrix.setScale(scale, scale); matrix.setScale(scale, scale);
matrix.postTranslate(-scrollableArea.left * scale, -scrollableArea.top * 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.setTranslationY(scale * scrollableArea.top);
mScrollablePreview.setImageMatrix(matrix); mScrollablePreview.setImageMatrix(matrix);
mScrollablePreview.setImageBitmap(screenBitmap); mScrollablePreview.setImageBitmap(screenBitmap);