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

Commit 710ee563 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Use @EnableFlags and @DisableFlags annotations instead of soon-to-be... 

Merge "Use @EnableFlags and @DisableFlags annotations instead of soon-to-be deprecated methods." into main
parents 3335e348 3d75c8a0

tests/Input/src/android/hardware/input/KeyboardLayoutPreviewTests.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.input



import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.content.ContextWrapper

import android.graphics.drawable.Drawable

import android.platform.test.annotations.Presubmit
@@ -54,16 +56,16 @@ class KeyboardLayoutPreviewTests { 
    }



    @Test

    @EnableFlags(Flags.FLAG_KEYBOARD_LAYOUT_PREVIEW_FLAG)

    fun testKeyboardLayoutDrawable_hasCorrectDimensions() {

        setFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_LAYOUT_PREVIEW_FLAG)

        val drawable = createDrawable()!!

        assertEquals(WIDTH, drawable.intrinsicWidth)

        assertEquals(HEIGHT, drawable.intrinsicHeight)

    }



    @Test

    @DisableFlags(Flags.FLAG_KEYBOARD_LAYOUT_PREVIEW_FLAG)

    fun testKeyboardLayoutDrawable_isNull_ifFlagOff() {

        setFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_LAYOUT_PREVIEW_FLAG)

        assertNull(createDrawable())

    }

}
 
 No newline at end of file

tests/Input/src/android/hardware/input/StickyModifierStateListenerTest.kt

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.ContextWrapper 
import android.os.Handler

import android.os.HandlerExecutor

import android.os.test.TestLooper

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.Presubmit

import android.platform.test.flag.junit.SetFlagsRule

import android.view.KeyEvent
@@ -50,6 +51,10 @@ import kotlin.test.fail 
 */

@Presubmit

@RunWith(MockitoJUnitRunner::class)

@EnableFlags(

    com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG,

    com.android.input.flags.Flags.FLAG_ENABLE_INPUT_FILTER_RUST_IMPL,

)

class StickyModifierStateListenerTest {



    @get:Rule
@@ -67,10 +72,6 @@ class StickyModifierStateListenerTest { 


    @Before

    fun setUp() {

        // Enable Sticky keys feature

        rule.enableFlags(com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG)

        rule.enableFlags(com.android.input.flags.Flags.FLAG_ENABLE_INPUT_FILTER_RUST_IMPL)



        context = Mockito.spy(ContextWrapper(ApplicationProvider.getApplicationContext()))

        inputManagerGlobalSession = InputManagerGlobal.createTestSession(iInputManagerMock)

        inputManager = InputManager(context)