From 5e5f03f62855de3a6403411a8c35b840d877cfa3 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Thu, 9 Jan 2025 18:06:51 +0000
Subject: InputTests: Unify CaptureEventActivity

Use a shared version of CaptureEventActivity from cts-input-lib.

Bug: 388825703
Test: Presubmit
Flag: TEST_ONLY
Change-Id: I6dfd1bbdf5f9c42dea85235e2fb585884e7f3a49
---
 tests/Input/AndroidManifest.xml                    |  2 +-
 .../com/android/test/input/CaptureEventActivity.kt | 85 ----------------------
 .../test/input/UinputRecordingIntegrationTests.kt  |  1 +
 3 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 tests/Input/src/com/android/test/input/CaptureEventActivity.kt

diff --git a/tests/Input/AndroidManifest.xml b/tests/Input/AndroidManifest.xml
index 914adc40194d..8d380f0d72a6 100644
--- a/tests/Input/AndroidManifest.xml
+++ b/tests/Input/AndroidManifest.xml
@@ -32,7 +32,7 @@
              android:process=":externalProcess">
         </activity>
 
-        <activity android:name="com.android.test.input.CaptureEventActivity"
+        <activity android:name="com.android.cts.input.CaptureEventActivity"
             android:label="Capture events"
             android:configChanges="touchscreen|uiMode|orientation|screenSize|screenLayout|keyboardHidden|uiMode|navigation|keyboard|density|fontScale|layoutDirection|locale|mcc|mnc|smallestScreenSize"
             android:enableOnBackInvokedCallback="false"
diff --git a/tests/Input/src/com/android/test/input/CaptureEventActivity.kt b/tests/Input/src/com/android/test/input/CaptureEventActivity.kt
deleted file mode 100644
index d54e3470d9c4..000000000000
--- a/tests/Input/src/com/android/test/input/CaptureEventActivity.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2024 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.test.input
-
-import android.app.Activity
-import android.os.Bundle
-import android.view.InputEvent
-import android.view.KeyEvent
-import android.view.MotionEvent
-import java.util.concurrent.LinkedBlockingQueue
-import java.util.concurrent.TimeUnit
-import org.junit.Assert.assertNull
-
-class CaptureEventActivity : Activity() {
-    private val events = LinkedBlockingQueue<InputEvent>()
-    var shouldHandleKeyEvents = true
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        // Set the fixed orientation if requested
-        if (intent.hasExtra(EXTRA_FIXED_ORIENTATION)) {
-            val orientation = intent.getIntExtra(EXTRA_FIXED_ORIENTATION, 0)
-            setRequestedOrientation(orientation)
-        }
-
-        // Set the flag if requested
-        if (intent.hasExtra(EXTRA_WINDOW_FLAGS)) {
-            val flags = intent.getIntExtra(EXTRA_WINDOW_FLAGS, 0)
-            window.addFlags(flags)
-        }
-    }
-
-    override fun dispatchGenericMotionEvent(ev: MotionEvent?): Boolean {
-        events.add(MotionEvent.obtain(ev))
-        return true
-    }
-
-    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        events.add(MotionEvent.obtain(ev))
-        return true
-    }
-
-    override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        events.add(KeyEvent(event))
-        return shouldHandleKeyEvents
-    }
-
-    override fun dispatchTrackballEvent(ev: MotionEvent?): Boolean {
-        events.add(MotionEvent.obtain(ev))
-        return true
-    }
-
-    fun getInputEvent(): InputEvent? {
-        return events.poll(5, TimeUnit.SECONDS)
-    }
-
-    fun hasReceivedEvents(): Boolean {
-        return !events.isEmpty()
-    }
-
-    fun assertNoEvents() {
-        val event = events.poll(100, TimeUnit.MILLISECONDS)
-        assertNull("Expected no events, but received $event", event)
-    }
-
-    companion object {
-        const val EXTRA_FIXED_ORIENTATION = "fixed_orientation"
-        const val EXTRA_WINDOW_FLAGS = "window_flags"
-    }
-}
diff --git a/tests/Input/src/com/android/test/input/UinputRecordingIntegrationTests.kt b/tests/Input/src/com/android/test/input/UinputRecordingIntegrationTests.kt
index 0b281d8d39e2..9e0f7347943d 100644
--- a/tests/Input/src/com/android/test/input/UinputRecordingIntegrationTests.kt
+++ b/tests/Input/src/com/android/test/input/UinputRecordingIntegrationTests.kt
@@ -28,6 +28,7 @@ import android.view.InputEvent
 import android.view.MotionEvent
 import androidx.test.platform.app.InstrumentationRegistry
 import com.android.cts.input.BatchedEventSplitter
+import com.android.cts.input.CaptureEventActivity
 import com.android.cts.input.InputJsonParser
 import com.android.cts.input.VirtualDisplayActivityScenario
 import com.android.cts.input.inputeventmatchers.isResampled
-- 
cgit v1.2.3-59-g8ed1b