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

Commit ece5535c authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

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

parents fc4bb78d 7b63f6f1

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);