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

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

Merge "Fix LongScreenshotActivity rotation" into sc-dev am: 11aac847 am: bd35fc74 

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

Change-Id: Ie1c788537b6c33a11e20d8d42fe143d962c5228e
parents 5c5f973a bd35fc74

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

+17 −14
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ public class LongScreenshotActivity extends Activity { 
        Log.d(TAG, "onCachedImageLoaded(imageResult=" + imageResult + ")");

        BitmapDrawable drawable = new BitmapDrawable(getResources(), imageResult.bitmap);

        mPreview.setImageDrawable(drawable);

        mPreview.setAlpha(1f);

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

                imageResult.bitmap.getHeight());

        mCropView.setVisibility(View.VISIBLE);
@@ -476,6 +477,7 @@ public class LongScreenshotActivity extends Activity { 
        params.height = boundaries.height();

        mTransitionView.setLayoutParams(params);



        if (mLongScreenshot != null) {

            ConstraintLayout.LayoutParams enterTransitionParams =

                    (ConstraintLayout.LayoutParams) mEnterTransitionView.getLayoutParams();

            float topFraction = Math.max(0,
@@ -492,3 +494,4 @@ public class LongScreenshotActivity extends Activity { 
                    topFraction * previewHeight + mPreview.getPaddingTop() + extraPadding);

        }

    }

}