Merge "Verify bubble bar can move to the other side" into main (6efe8db1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/BubbleBarMovesTest.kt

0 → 100644

+115 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.wm.shell.flicker.bubbles

		import android.platform.systemui_tapl.ui.Root
		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresFlagsEnabled
		import android.tools.NavBar
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.Flags
		import com.android.wm.shell.Utils
		import com.android.wm.shell.flicker.bubbles.testcase.ExpandBubbleTestCases
		import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule
		import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer
		import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule
		import com.android.wm.shell.flicker.bubbles.utils.collapseBubbleAppViaTouchOutside
		import com.android.wm.shell.flicker.bubbles.utils.expandBubbleAppViaBubbleBar
		import com.android.wm.shell.flicker.bubbles.utils.launchBubbleViaBubbleMenu
		import com.google.common.truth.Truth.assertWithMessage
		import org.junit.Assume.assumeTrue
		import org.junit.Before
		import org.junit.FixMethodOrder
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runners.MethodSorters

		/**
		* Test clicking bubble to expand a bubble that was in collapsed state.
		*
		* To run this test: `atest WMShellExplicitFlickerTestsBubbles:BubbleBarMovesTest`
		*
		* Pre-steps:
		* ```
		* Launch [testApp] into bubble and collapse the bubble
		* ```
		*
		* Actions:
		* ```
		* Drag and move the bubble bar to the other side
		* Expand the [testApp] bubble via clicking the bubble bar
		* ```
		* Verified tests:
		* - [BubbleFlickerTestBase]
		* - [ExpandBubbleTestCases]
		* - the bubble bar is moved
		*/
		@RequiresFlagsEnabled(Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE)
		@RequiresDevice
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Presubmit
		class BubbleBarMovesTest(navBar: NavBar) : BubbleFlickerTestBase(), ExpandBubbleTestCases {
		companion object : FlickerPropertyInitializer() {

		/**
		* Whether the bubble bar position is changed.
		*/
		private var bubbleBarPosChanges: Boolean = false

		private val recordTraceWithTransitionRule = RecordTraceWithTransitionRule(
		setUpBeforeTransition = {
		// Launch and collapse the bubble.
		launchBubbleViaBubbleMenu(testApp, tapl, wmHelper)
		collapseBubbleAppViaTouchOutside(testApp, wmHelper)
		},
		transition = {
		val bubbleBarBeforeTransition = Root.get().bubbleBar.visibleCenter
		Root.get().bubbleBar.dragToTheOtherSide()
		val bubbleBarAfterTransition = Root.get().bubbleBar.visibleCenter
		bubbleBarPosChanges = (bubbleBarBeforeTransition != bubbleBarAfterTransition)
		expandBubbleAppViaBubbleBar(uiDevice, testApp, wmHelper)
		},
		tearDownAfterTransition = { testApp.exit(wmHelper) }
		)
		}

		@get:Rule
		val setUpRule = ApplyPerParameterRule(
		Utils.testSetupRule(navBar).around(recordTraceWithTransitionRule),
		params = arrayOf(navBar)
		)

		override val traceDataReader
		get() = recordTraceWithTransitionRule.reader

		@Before
		override fun setUp() {
		// The bubble bar is only available on large screen devices.
		assumeTrue(tapl.isTablet)
		super.setUp()
		}

		/**
		* Verifies that the bubble bar is moved to the other side.
		*/
		@Test
		fun bubbleBarMovesToTheOtherSide() {
		assertWithMessage("The bubble bar position must be changed")
		.that(bubbleBarPosChanges)
		.isTrue()
		}
		}
		No newline at end of file

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/utils/BubbleFlickerTestHelper.kt

+18 −2

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ fun launchBubbleViaDragToBubbleBar(
		}

		/**
		* Collapses the bubble app [testApp] via back key
		* Collapses the bubble app [testApp] via back key.
		*
		* @param testApp the bubble app to collapse
		* @param tapl the [LauncherInstrumentation]
		@@ -139,7 +139,6 @@ fun collapseBubbleAppViaBackKey(
		tapl: LauncherInstrumentation,
		wmHelper: WindowManagerStateHelper,
		) {
		// Ensure Bubble is in expanded state.
		waitAndAssertBubbleAppInExpandedState(testApp, wmHelper)

		// Press back key to collapse bubble
		@@ -148,6 +147,23 @@ fun collapseBubbleAppViaBackKey(
		waitAndAssertBubbleAppInCollapseState(wmHelper)
		}

		/**
		* Collapses the bubble app [testApp] via touching outside the bubble app.
		*
		* @param testApp the bubble app to collapse
		* @param wmHelper the [WindowManagerStateHelper]
		*/
		fun collapseBubbleAppViaTouchOutside(
		testApp: StandardAppHelper,
		wmHelper: WindowManagerStateHelper,
		) {
		waitAndAssertBubbleAppInExpandedState(testApp, wmHelper)

		Root.get().expandedBubbleStack.closeByClickingOutside()

		waitAndAssertBubbleAppInCollapseState(wmHelper)
		}

		/**
		* Expands the bubble app [testApp], which is previously collapsed via tapping on bubble stack.
		*