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

Commit 3820c510 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove zoom from app clips." into udc-dev

parents 9651d0bb f7e7b11d

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

+1 −6
Original line number Diff line number Diff line
@@ -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);

    }