Merge "Mock InputEventReceiver for clipboard tests" into main (03717050) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardInputEventReceiver.kt

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.clipboardoverlay

		import android.hardware.input.InputManager
		import android.os.Looper
		import android.util.Log
		import android.view.InputEvent
		import android.view.InputEventReceiver
		import android.view.InputMonitor
		import javax.inject.Inject

		open class ClipboardInputEventReceiver @Inject constructor(private val inputManager: InputManager) {
		private var inputMonitor: InputMonitor? = null
		private var inputEventReceiver: InputEventReceiver? = null

		fun monitorOutsideTouches(onInputEvent: (InputEvent?) -> Unit) {
		if (inputMonitor != null \|\| inputEventReceiver != null) {
		Log.wtf(TAG, "monitorOutsideTouches called multiple times without disposal")
		dispose()
		}
		inputMonitor =
		inputManager.monitorGestureInput("clipboard overlay", 0).also {
		inputEventReceiver =
		object : InputEventReceiver(it.inputChannel, Looper.getMainLooper()) {
		override fun onInputEvent(event: InputEvent?) {
		onInputEvent(event)
		finishInputEvent(event, true)
		}
		}
		}
		}

		fun dispose() {
		inputMonitor?.dispose()
		inputMonitor = null
		inputEventReceiver?.dispose()
		inputEventReceiver = null
		}

		companion object {
		private const val TAG = "ClipboardInputEventReceiver"
		}
		}

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+19 −35

Original line number	Diff line number	Diff line
		@@ -45,14 +45,9 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManager;
		import android.hardware.input.InputManager;
		import android.net.Uri;
		import android.os.Looper;
		import android.provider.DeviceConfig;
		import android.util.Log;
		import android.view.InputEvent;
		import android.view.InputEventReceiver;
		import android.view.InputMonitor;
		import android.view.MotionEvent;
		import android.view.WindowInsets;

		@@ -68,6 +63,8 @@ import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.res.R;
		import com.android.systemui.screenshot.TimeoutHandler;

		import kotlin.Unit;

		import java.util.Optional;
		import java.util.concurrent.Executor;

		@@ -96,6 +93,8 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		private final Executor mBgExecutor;
		private final ClipboardImageLoader mClipboardImageLoader;
		private final ClipboardTransitionExecutor mTransitionExecutor;
		private final ClipboardInputEventReceiver mClipboardInputEventReceiver;


		private final ClipboardOverlayView mView;
		private final ClipboardIndicationProvider mClipboardIndicationProvider;
		@@ -106,9 +105,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		private Runnable mOnShareTapped;
		private Runnable mOnPreviewTapped;

		private InputMonitor mInputMonitor;
		private InputEventReceiver mInputEventReceiver;

		private BroadcastReceiver mCloseDialogsReceiver;
		private BroadcastReceiver mScreenshotReceiver;

		@@ -192,6 +188,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		@Background Executor bgExecutor,
		ClipboardImageLoader clipboardImageLoader,
		ClipboardTransitionExecutor transitionExecutor,
		ClipboardInputEventReceiver clipboardInputEventReceiver,
		ClipboardIndicationProvider clipboardIndicationProvider,
		UiEventLogger uiEventLogger,
		IntentCreator intentCreator) {
		@@ -199,6 +196,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mBroadcastDispatcher = broadcastDispatcher;
		mClipboardImageLoader = clipboardImageLoader;
		mTransitionExecutor = transitionExecutor;
		mClipboardInputEventReceiver = clipboardInputEventReceiver;
		mClipboardIndicationProvider = clipboardIndicationProvider;

		mClipboardLogger = new ClipboardLogger(uiEventLogger);
		@@ -469,14 +467,8 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		}

		private void monitorOutsideTouches() {
		InputManager inputManager = mContext.getSystemService(InputManager.class);
		mInputMonitor = inputManager.monitorGestureInput("clipboard overlay", 0);
		mInputEventReceiver = new InputEventReceiver(
		mInputMonitor.getInputChannel(), Looper.getMainLooper()) {
		@Override
		public void onInputEvent(InputEvent event) {
		if (mShowingUi && event instanceof MotionEvent) {
		MotionEvent motionEvent = (MotionEvent) event;
		mClipboardInputEventReceiver.monitorOutsideTouches(event -> {
		if (mShowingUi && event instanceof MotionEvent motionEvent) {
		if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
		if (!mView.isInTouchRegion(
		(int) motionEvent.getRawX(), (int) motionEvent.getRawY())) {
		@@ -489,9 +481,8 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		}
		}
		}
		finishInputEvent(event, true /* handled */);
		}
		};
		return Unit.INSTANCE;
		});
		}

		private void editImage(Uri uri) {
		@@ -635,14 +626,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mBroadcastDispatcher.unregisterReceiver(mScreenshotReceiver);
		mScreenshotReceiver = null;
		}
		if (mInputEventReceiver != null) {
		mInputEventReceiver.dispose();
		mInputEventReceiver = null;
		}
		if (mInputMonitor != null) {
		mInputMonitor.dispose();
		mInputMonitor = null;
		}
		mClipboardInputEventReceiver.dispose();
		if (mOnSessionCompleteListener != null) {
		mOnSessionCompleteListener.run();
		}

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		@Mock
		private ClipboardTransitionExecutor mClipboardTransitionExecutor;
		@Mock
		private ClipboardInputEventReceiver mClipboardInputEventReceiver;
		@Mock
		private UiEventLogger mUiEventLogger;
		private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext);

		@@ -199,6 +201,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		mExecutor,
		mClipboardImageLoader,
		mClipboardTransitionExecutor,
		mClipboardInputEventReceiver,
		mClipboardIndicationProvider,
		mUiEventLogger,
		fakeIntentCreator);
		@@ -208,8 +211,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {

		@After
		public void tearDown() {
		// call the InputReceiver dispose method on the main thread
		mMainHandler.post(() -> mOverlayController.hideImmediate());
		mOverlayController.hideImmediate();
		}

		@Test