PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split up tests by actual hardware keyboard status." into main

Browse Source
This commit is contained in:
Brian Isganitis
2024-12-20 11:36:35 -08:00
committed by Android (Google) Code Review
parent aad6505463 a481af5779
commit 1e6ffc8a08
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarStashControllerTest.kt
+26 -6
View File
@@ -56,8 +56,8 @@ import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_
import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING
import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_BAR
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.TruthJUnit.assume
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -82,11 +82,6 @@ class TaskbarStashControllerTest {
private val activityContext by taskbarUnitTestRule::activityContext
// Disable hardware keyboard mode during tests.
@Before fun enableSoftwareIme() = TaskbarStashController.enableSoftwareImeForTests(true)
@After fun resetIme() = TaskbarStashController.enableSoftwareImeForTests(false)
@After fun cancelTimeoutIfExists() = stashController.cancelTimeoutIfExists()
@Test
@@ -544,6 +539,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(PINNED)
fun testAnimatePinnedTaskbar_imeShown_replacesIconsWithHandle() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, false)
animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME)
@@ -555,6 +552,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(PINNED)
fun testAnimatePinnedTaskbar_imeHidden_replacesHandleWithIcons() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, true)
animatorTestRule.advanceTimeBy(0)
@@ -571,6 +570,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(PINNED)
fun testAnimatePinnedTaskbar_imeHidden_verifyAnimationDuration() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
// Start with IME shown.
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, true)
@@ -596,6 +597,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(THREE_BUTTONS)
fun testAnimateThreeButtonsTaskbar_imeShown_hidesIconsAndBg() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, false)
animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME)
@@ -607,6 +610,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(THREE_BUTTONS)
fun testAnimateThreeButtonsTaskbar_imeHidden_showsIconsAndBg() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, false)
animatorTestRule.advanceTimeBy(TASKBAR_STASH_DURATION_FOR_IME)
@@ -625,6 +630,8 @@ class TaskbarStashControllerTest {
@Test
@TaskbarMode(PINNED)
fun testSetSystemGestureInProgress_whileImeShown_unstashesTaskbar() {
assume().that(activityContext.isHardwareKeyboard).isFalse()
getInstrumentation().runOnMainSync {
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, true)
animatorTestRule.advanceTimeBy(0)
@@ -639,6 +646,19 @@ class TaskbarStashControllerTest {
assertThat(stashController.isStashed).isFalse()
}
@Test
@TaskbarMode(PINNED)
fun testSysuiStateImeShowingInApp_hardwareKeyboardWithPinnedMode_notStashedForIme() {
assume().that(activityContext.isHardwareKeyboard).isTrue()
getInstrumentation().runOnMainSync {
stashController.updateStateForFlag(FLAG_IN_APP, true)
stashController.updateStateForSysuiFlags(SYSUI_STATE_IME_SHOWING, true)
}
assertThat(stashController.isStashed).isFalse()
}
@Test
@TaskbarMode(PINNED)
fun testUnlockTransition_pinnedMode_fadesOutHandle() {