Merge cherrypicks of [16332479] into sc-v2-release.
Change-Id: I4311bb86074146a0a61b7ffb14156d6621425b87
This commit is contained in:
@@ -86,6 +86,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import com.android.internal.logging.UiEventLogger;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition;
|
||||
import com.android.systemui.shared.system.InputChannelCompat;
|
||||
import com.android.systemui.shared.system.InputMonitorCompat;
|
||||
import com.android.systemui.shared.system.QuickStepContract;
|
||||
|
||||
@@ -162,6 +163,7 @@ public class ScreenshotView extends FrameLayout implements
|
||||
private GestureDetector mSwipeDetector;
|
||||
private SwipeDismissHandler mSwipeDismissHandler;
|
||||
private InputMonitorCompat mInputMonitor;
|
||||
private InputChannelCompat.InputEventReceiver mInputEventReceiver;
|
||||
private boolean mShowScrollablePreview;
|
||||
private String mPackageName = "";
|
||||
|
||||
@@ -302,8 +304,8 @@ public class ScreenshotView extends FrameLayout implements
|
||||
private void startInputListening() {
|
||||
stopInputListening();
|
||||
mInputMonitor = new InputMonitorCompat("Screenshot", Display.DEFAULT_DISPLAY);
|
||||
mInputMonitor.getInputReceiver(Looper.getMainLooper(), Choreographer.getInstance(),
|
||||
ev -> {
|
||||
mInputEventReceiver = mInputMonitor.getInputReceiver(
|
||||
Looper.getMainLooper(), Choreographer.getInstance(), ev -> {
|
||||
if (ev instanceof MotionEvent) {
|
||||
MotionEvent event = (MotionEvent) ev;
|
||||
if (event.getActionMasked() == MotionEvent.ACTION_DOWN
|
||||
@@ -320,6 +322,10 @@ public class ScreenshotView extends FrameLayout implements
|
||||
mInputMonitor.dispose();
|
||||
mInputMonitor = null;
|
||||
}
|
||||
if (mInputEventReceiver != null) {
|
||||
mInputEventReceiver.dispose();
|
||||
mInputEventReceiver = null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override // ViewGroup
|
||||
|
||||
Reference in New Issue
Block a user