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

Commit e22fe8d3 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Hide CropView until the image is ready." into sc-dev am: ece5535c 

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

Change-Id: I5b8a6936b28a6ea65d1a6b7eda10bfefcf6050eb
parents 34f1c533 ece5535c

packages/SystemUI/res/layout/long_screenshot.xml

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
        android:layout_height="0px"

        android:paddingTop="8dp"

        android:paddingBottom="42dp"

        android:visibility="gone"

        app:layout_constrainedHeight="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintTop_toTopOf="@id/preview"

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

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ public class LongScreenshotActivity extends Activity { 
        mLongScreenshot = longScreenshot;

        mPreview.setImageDrawable(mLongScreenshot.getDrawable());

        updateImageDimensions();

        mCropView.setVisibility(View.VISIBLE);

        mMagnifierView.setDrawable(mLongScreenshot.getDrawable(),

                mLongScreenshot.getWidth(), mLongScreenshot.getHeight());

        // Original boundaries go from the image tile set's y=0 to y=pageSize, so
@@ -240,6 +241,7 @@ public class LongScreenshotActivity extends Activity { 
        mPreview.setImageDrawable(drawable);

        mMagnifierView.setDrawable(drawable, imageResult.bitmap.getWidth(),

                imageResult.bitmap.getHeight());

        mCropView.setVisibility(View.VISIBLE);

        mSavedImagePath = imageResult.fileName;



        setButtonsEnabled(true);