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

Commit 94dc45cd authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
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 am: 2d140714

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3092345



Change-Id: Iac4df4cfec84bee9f52216318a724c6d61159a11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c94776e 2d140714

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