Merge "Add FLAG_IS_ACCESSIBILITY_EVENT to KeyEvent and MotionEvent" into sc-dev

1 files changed, 6 insertions, 2 deletions

diff --git a/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt b/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt
index 2c4851f0ab4e..29ad0aa43672 100644
--- a/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt
+++ b/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt
@@ -18,6 +18,7 @@ package android.view
 
 import android.view.InputDevice.SOURCE_TOUCHSCREEN
 import android.view.MotionEvent.ACTION_MOVE
+import android.view.MotionEvent.FLAG_IS_ACCESSIBILITY_EVENT
 import android.view.MotionEvent.FLAG_WINDOW_IS_OBSCURED
 import android.view.MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED
 import android.view.MotionEvent.FLAG_TAINTED
@@ -49,6 +50,7 @@ class VerifiedMotionEventTest {
         assertEquals(RAW_Y, event.rawY, 0f)
         assertEquals(ACTION_MASKED, event.actionMasked)
         assertEquals(DOWN_TIME_NANOS, event.downTimeNanos)
+        assertEquals(FLAGS, event.flags)
         assertEquals(META_STATE, event.metaState)
         assertEquals(BUTTON_STATE, event.buttonState)
     }
@@ -128,8 +130,9 @@ class VerifiedMotionEventTest {
         assertNull(motionEvent.getFlag(0))
         // Flag that was not set
         assertEquals(false, motionEvent.getFlag(FLAG_WINDOW_IS_PARTIALLY_OBSCURED))
-        // Flag that was set
+        // Flags that were set
         assertEquals(true, motionEvent.getFlag(FLAG_WINDOW_IS_OBSCURED))
+        assertEquals(true, motionEvent.getFlag(FLAG_IS_ACCESSIBILITY_EVENT))
         // Only 1 flag at a time is accepted
         assertNull(motionEvent.getFlag(
                 FLAG_WINDOW_IS_PARTIALLY_OBSCURED or FLAG_WINDOW_IS_OBSCURED))
@@ -153,7 +156,7 @@ class VerifiedMotionEventTest {
         private const val RAW_Y = 200f
         private const val ACTION_MASKED = ACTION_MOVE
         private const val DOWN_TIME_NANOS: Long = 1000
-        private const val FLAGS = FLAG_WINDOW_IS_OBSCURED
+        private const val FLAGS = FLAG_WINDOW_IS_OBSCURED or FLAG_IS_ACCESSIBILITY_EVENT
         private const val META_STATE = 11
         private const val BUTTON_STATE = 22
 
@@ -178,6 +181,7 @@ class VerifiedMotionEventTest {
             assertEquals(event1.rawY, event2.rawY, 0f)
             assertEquals(event1.actionMasked, event2.actionMasked)
             assertEquals(event1.downTimeNanos, event2.downTimeNanos)
+            assertEquals(event1.flags, event2.flags)
             assertEquals(event1.metaState, event2.metaState)
             assertEquals(event1.buttonState, event2.buttonState)
         }