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

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

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

Change-Id: Ib093bc0699e50e6d883a9b8104c6bfa573371d18
This commit is contained in:
Matt Casey
2021-06-16 19:49:46 +00:00
committed by Automerger Merge Worker
parent 0b010c0b62 11aac84721
commit bd35fc745d
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,7 @@ public class LongScreenshotActivity extends Activity {
Log.d(TAG, "onCachedImageLoaded(imageResult=" + imageResult + ")"); Log.d(TAG, "onCachedImageLoaded(imageResult=" + imageResult + ")");
BitmapDrawable drawable = new BitmapDrawable(getResources(), imageResult.bitmap); BitmapDrawable drawable = new BitmapDrawable(getResources(), imageResult.bitmap);
mPreview.setImageDrawable(drawable); mPreview.setImageDrawable(drawable);
mPreview.setAlpha(1f);
mMagnifierView.setDrawable(drawable, imageResult.bitmap.getWidth(), mMagnifierView.setDrawable(drawable, imageResult.bitmap.getWidth(),
imageResult.bitmap.getHeight()); imageResult.bitmap.getHeight());
mCropView.setVisibility(View.VISIBLE); mCropView.setVisibility(View.VISIBLE);
@@ -476,6 +477,7 @@ public class LongScreenshotActivity extends Activity {
params.height = boundaries.height(); params.height = boundaries.height();
mTransitionView.setLayoutParams(params); mTransitionView.setLayoutParams(params);
if (mLongScreenshot != null) {
ConstraintLayout.LayoutParams enterTransitionParams = ConstraintLayout.LayoutParams enterTransitionParams =
(ConstraintLayout.LayoutParams) mEnterTransitionView.getLayoutParams(); (ConstraintLayout.LayoutParams) mEnterTransitionView.getLayoutParams();
float topFraction = Math.max(0, float topFraction = Math.max(0,
@@ -491,4 +493,5 @@ public class LongScreenshotActivity extends Activity {
mEnterTransitionView.setTranslationY( mEnterTransitionView.setTranslationY(
topFraction * previewHeight + mPreview.getPaddingTop() + extraPadding); topFraction * previewHeight + mPreview.getPaddingTop() + extraPadding);
} }
}
} }