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

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

Browse Source
This commit is contained in:
Matt Casey
2021-04-13 13:29:01 +00:00
committed by Android (Google) Code Review
parent fc4bb78d27 7b63f6f130
commit ece5535c18
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/long_screenshot.xml
View File

@@ -71,6 +71,7 @@
android:layout_height="0px" android:layout_height="0px"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="42dp" android:paddingBottom="42dp"
android:visibility="gone"
app:layout_constrainedHeight="true" app:layout_constrainedHeight="true"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintTop_toTopOf="@id/preview" app:layout_constraintTop_toTopOf="@id/preview"

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

@@ -207,6 +207,7 @@ public class LongScreenshotActivity extends Activity {
mLongScreenshot = longScreenshot; mLongScreenshot = longScreenshot;
mPreview.setImageDrawable(mLongScreenshot.getDrawable()); mPreview.setImageDrawable(mLongScreenshot.getDrawable());
updateImageDimensions(); updateImageDimensions();
mCropView.setVisibility(View.VISIBLE);
mMagnifierView.setDrawable(mLongScreenshot.getDrawable(), mMagnifierView.setDrawable(mLongScreenshot.getDrawable(),
mLongScreenshot.getWidth(), mLongScreenshot.getHeight()); mLongScreenshot.getWidth(), mLongScreenshot.getHeight());
// Original boundaries go from the image tile set's y=0 to y=pageSize, so // 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); mPreview.setImageDrawable(drawable);
mMagnifierView.setDrawable(drawable, imageResult.bitmap.getWidth(), mMagnifierView.setDrawable(drawable, imageResult.bitmap.getWidth(),
imageResult.bitmap.getHeight()); imageResult.bitmap.getHeight());
mCropView.setVisibility(View.VISIBLE);
mSavedImagePath = imageResult.fileName; mSavedImagePath = imageResult.fileName;
setButtonsEnabled(true); setButtonsEnabled(true);