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

Merge "Remove zoom from app clips." into udc-dev am: 3820c510f4 am: c1a255255a

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

Change-Id: I6eb1063c8d17970c26ff51ccfcc29f693416878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-04 14:47:22 +00:00
committed by Automerger Merge Worker
parent 0b405cfcad c1a255255a
commit ca43616de1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java
View File

@@ -53,7 +53,6 @@ import com.android.internal.logging.UiEventLogger.UiEventEnum;
import com.android.settingslib.Utils;
import com.android.systemui.R;
import com.android.systemui.screenshot.CropView;
import com.android.systemui.screenshot.MagnifierView;
import com.android.systemui.settings.UserTracker;
import javax.inject.Inject;
@@ -93,7 +92,6 @@ public class AppClipsActivity extends ComponentActivity {
private View mRoot;
private ImageView mPreview;
private CropView mCropView;
private MagnifierView mMagnifierView;
private Button mSave;
private Button mCancel;
private AppClipsViewModel mViewModel;
@@ -156,9 +154,8 @@ public class AppClipsActivity extends ComponentActivity {
mSave.setOnClickListener(this::onClick);
mCancel.setOnClickListener(this::onClick);
mMagnifierView = mLayout.findViewById(R.id.magnifier);
mCropView = mLayout.findViewById(R.id.crop_view);
mCropView.setCropInteractionListener(mMagnifierView);
mPreview = mLayout.findViewById(R.id.preview);
mPreview.addOnLayoutChangeListener(
@@ -218,8 +215,6 @@ public class AppClipsActivity extends ComponentActivity {
mPreview.setImageDrawable(drawable);
mPreview.setAlpha(1f);
mMagnifierView.setDrawable(drawable, screenshot.getWidth(), screenshot.getHeight());
// Screenshot is now available so set content view.
setContentView(mLayout);
}