Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60971756 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2e9c40b3400cfacc99af7acd8ea232b2fa04a1e2
parents 97c91cdd ce8ca17d

packages/SystemUI/res/layout/long_screenshot.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

        />

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

+2 −1
Original line number Diff line number Diff line
@@ -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);