Merge changes Iccf1fb37,I75cc882f into main (b2c477cc) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt

0 → 100644

+349 −0

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

		import android.content.Context
		import android.content.pm.LauncherApps
		import android.content.pm.ShortcutInfo
		import android.content.res.Resources
		import android.graphics.Color
		import android.os.Handler
		import android.os.UserManager
		import android.view.IWindowManager
		import android.view.WindowManager
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.R
		import com.android.internal.protolog.ProtoLog
		import com.android.internal.statusbar.IStatusBarService
		import com.android.launcher3.icons.BubbleIconFactory
		import com.android.wm.shell.ShellTaskOrganizer
		import com.android.wm.shell.WindowManagerShellWrapper
		import com.android.wm.shell.bubbles.properties.BubbleProperties
		import com.android.wm.shell.bubbles.storage.BubblePersistentRepository
		import com.android.wm.shell.common.DisplayController
		import com.android.wm.shell.common.DisplayInsetsController
		import com.android.wm.shell.common.FloatingContentCoordinator
		import com.android.wm.shell.common.ShellExecutor
		import com.android.wm.shell.common.SyncTransactionQueue
		import com.android.wm.shell.common.TaskStackListenerImpl
		import com.android.wm.shell.shared.TransactionPool
		import com.android.wm.shell.sysui.ShellCommandHandler
		import com.android.wm.shell.sysui.ShellController
		import com.android.wm.shell.sysui.ShellInit
		import com.android.wm.shell.taskview.TaskView
		import com.android.wm.shell.taskview.TaskViewTransitions
		import com.android.wm.shell.transition.Transitions
		import com.google.common.truth.Truth.assertThat
		import com.google.common.util.concurrent.MoreExecutors.directExecutor
		import org.junit.Assert
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.mock

		/** Test inflating bubbles with [BubbleViewInfoTask]. */
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class BubbleViewInfoTaskTest {

		private val context = ApplicationProvider.getApplicationContext<Context>()
		private lateinit var metadataFlagListener: Bubbles.BubbleMetadataFlagListener
		private lateinit var iconFactory: BubbleIconFactory
		private lateinit var bubbleController: BubbleController
		private lateinit var mainExecutor: TestExecutor
		private lateinit var bgExecutor: TestExecutor
		private lateinit var bubbleStackView: BubbleStackView
		private lateinit var bubblePositioner: BubblePositioner
		private lateinit var expandedViewManager: BubbleExpandedViewManager

		private val bubbleTaskViewFactory = BubbleTaskViewFactory {
		BubbleTaskView(mock<TaskView>(), directExecutor())
		}

		@Before
		fun setUp() {
		ProtoLog.REQUIRE_PROTOLOGTOOL = false
		metadataFlagListener = Bubbles.BubbleMetadataFlagListener {}
		iconFactory =
		BubbleIconFactory(
		context,
		60,
		30,
		Color.RED,
		context.resources.getDimensionPixelSize(R.dimen.importance_ring_stroke_width)
		)

		mainExecutor = TestExecutor()
		bgExecutor = TestExecutor()
		val windowManager = context.getSystemService(WindowManager::class.java)
		val shellInit = ShellInit(mainExecutor)
		val shellCommandHandler = ShellCommandHandler()
		val shellController =
		ShellController(
		context,
		shellInit,
		shellCommandHandler,
		mock<DisplayInsetsController>(),
		mainExecutor
		)
		bubblePositioner = BubblePositioner(context, windowManager)
		val bubbleData =
		BubbleData(
		context,
		mock<BubbleLogger>(),
		bubblePositioner,
		BubbleEducationController(context),
		mainExecutor,
		bgExecutor
		)

		val surfaceSynchronizer = { obj: Runnable -> obj.run() }

		val bubbleDataRepository =
		BubbleDataRepository(
		mock<LauncherApps>(),
		mainExecutor,
		bgExecutor,
		BubblePersistentRepository(context)
		)

		bubbleController =
		BubbleController(
		context,
		shellInit,
		shellCommandHandler,
		shellController,
		bubbleData,
		surfaceSynchronizer,
		FloatingContentCoordinator(),
		bubbleDataRepository,
		mock<IStatusBarService>(),
		windowManager,
		WindowManagerShellWrapper(mainExecutor),
		mock<UserManager>(),
		mock<LauncherApps>(),
		mock<BubbleLogger>(),
		mock<TaskStackListenerImpl>(),
		mock<ShellTaskOrganizer>(),
		bubblePositioner,
		mock<DisplayController>(),
		null,
		null,
		mainExecutor,
		mock<Handler>(),
		bgExecutor,
		mock<TaskViewTransitions>(),
		mock<Transitions>(),
		SyncTransactionQueue(TransactionPool(), mainExecutor),
		mock<IWindowManager>(),
		mock<BubbleProperties>()
		)

		val bubbleStackViewManager = BubbleStackViewManager.fromBubbleController(bubbleController)
		bubbleStackView =
		BubbleStackView(
		context,
		bubbleStackViewManager,
		bubblePositioner,
		bubbleData,
		surfaceSynchronizer,
		FloatingContentCoordinator(),
		bubbleController,
		mainExecutor
		)
		expandedViewManager = BubbleExpandedViewManager.fromBubbleController(bubbleController)
		}

		@Test
		fun start_runsOnExecutors() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)

		task.start()

		assertThat(bubble.isInflated).isFalse()
		assertThat(bubble.expandedView).isNull()
		assertThat(task.isFinished).isFalse()

		bgExecutor.flushAll()
		assertThat(bubble.isInflated).isFalse()
		assertThat(bubble.expandedView).isNull()
		assertThat(task.isFinished).isFalse()

		mainExecutor.flushAll()
		assertThat(bubble.isInflated).isTrue()
		assertThat(bubble.expandedView).isNotNull()
		assertThat(task.isFinished).isTrue()
		}

		@Test
		fun startSync_runsImmediately() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)

		task.startSync()
		assertThat(bubble.isInflated).isTrue()
		assertThat(bubble.expandedView).isNotNull()
		assertThat(task.isFinished).isTrue()
		}

		@Test
		fun start_calledTwice_throwsIllegalStateException() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)
		task.start()
		Assert.assertThrows(IllegalStateException::class.java) { task.start() }
		}

		@Test
		fun startSync_calledTwice_throwsIllegalStateException() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)
		task.startSync()
		Assert.assertThrows(IllegalStateException::class.java) { task.startSync() }
		}

		@Test
		fun start_callbackNotified() {
		val bubble = createBubbleWithShortcut()
		var bubbleFromCallback: Bubble? = null
		val callback = BubbleViewInfoTask.Callback { b: Bubble? -> bubbleFromCallback = b }
		val task = createBubbleViewInfoTask(bubble, callback)
		task.start()
		bgExecutor.flushAll()
		mainExecutor.flushAll()
		assertThat(bubbleFromCallback).isSameInstanceAs(bubble)
		}

		@Test
		fun startSync_callbackNotified() {
		val bubble = createBubbleWithShortcut()
		var bubbleFromCallback: Bubble? = null
		val callback = BubbleViewInfoTask.Callback { b: Bubble? -> bubbleFromCallback = b }
		val task = createBubbleViewInfoTask(bubble, callback)
		task.startSync()
		assertThat(bubbleFromCallback).isSameInstanceAs(bubble)
		}

		@Test
		fun cancel_beforeBackgroundWorkStarts_bubbleNotInflated() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)
		task.start()

		// Cancel before allowing background or main executor to run
		task.cancel()
		bgExecutor.flushAll()
		mainExecutor.flushAll()

		assertThat(bubble.isInflated).isFalse()
		assertThat(bubble.expandedView).isNull()
		assertThat(task.isFinished).isTrue()
		}

		@Test
		fun cancel_afterBackgroundWorkBeforeMainThreadWork_bubbleNotInflated() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)
		task.start()

		// Cancel after background executor runs, but before main executor runs
		bgExecutor.flushAll()
		task.cancel()
		mainExecutor.flushAll()

		assertThat(bubble.isInflated).isFalse()
		assertThat(bubble.expandedView).isNull()
		assertThat(task.isFinished).isTrue()
		}

		@Test
		fun cancel_beforeStart_bubbleNotInflated() {
		val bubble = createBubbleWithShortcut()
		val task = createBubbleViewInfoTask(bubble)
		task.cancel()
		task.start()
		bgExecutor.flushAll()
		mainExecutor.flushAll()

		assertThat(task.isFinished).isTrue()
		assertThat(bubble.isInflated).isFalse()
		assertThat(bubble.expandedView).isNull()
		}

		private fun createBubbleWithShortcut(): Bubble {
		val shortcutInfo = ShortcutInfo.Builder(context, "mockShortcutId").build()
		return Bubble(
		"mockKey",
		shortcutInfo,
		1000,
		Resources.ID_NULL,
		"mockTitle",
		0 /* taskId */,
		"mockLocus",
		true /* isDismissible */,
		mainExecutor,
		bgExecutor,
		metadataFlagListener
		)
		}

		private fun createBubbleViewInfoTask(
		bubble: Bubble,
		callback: BubbleViewInfoTask.Callback? = null
		): BubbleViewInfoTask {
		return BubbleViewInfoTask(
		bubble,
		context,
		expandedViewManager,
		bubbleTaskViewFactory,
		bubblePositioner,
		bubbleStackView,
		null /* layerView */,
		iconFactory,
		false /* skipInflation */,
		callback,
		mainExecutor,
		bgExecutor
		)
		}

		private class TestExecutor : ShellExecutor {

		private val runnables: MutableList<Runnable> = mutableListOf()

		override fun execute(runnable: Runnable) {
		runnables.add(runnable)
		}

		override fun executeDelayed(runnable: Runnable, delayMillis: Long) {
		execute(runnable)
		}

		override fun removeCallbacks(runnable: Runnable?) {}

		override fun hasCallback(runnable: Runnable?): Boolean = false

		fun flushAll() {
		while (runnables.isNotEmpty()) {
		runnables.removeAt(0).run()
		}
		}
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -568,11 +568,11 @@ public class Bubble implements BubbleViewProvider {
		@Nullable BubbleBarLayerView layerView,
		BubbleIconFactory iconFactory,
		boolean skipInflation) {
		ProtoLog.v(WM_SHELL_BUBBLES, "Inflate bubble key=%s", getKey());
		if (Flags.bubbleViewInfoExecutors()) {
		if (mInflationTask != null && mInflationTask.getStatus() != FINISHED) {
		mInflationTask.cancel(true /* mayInterruptIfRunning */);
		if (mInflationTask != null && !mInflationTask.isFinished()) {
		mInflationTask.cancel();
		}
		// TODO(b/353894869): switch to executors
		mInflationTask = new BubbleViewInfoTask(this,
		context,
		expandedViewManager,
		@@ -583,11 +583,12 @@ public class Bubble implements BubbleViewProvider {
		iconFactory,
		skipInflation,
		callback,
		mMainExecutor);
		mMainExecutor,
		mBgExecutor);
		if (mInflateSynchronously) {
		mInflationTask.onPostExecute(mInflationTask.doInBackground());
		mInflationTask.startSync();
		} else {
		mInflationTask.execute();
		mInflationTask.start();
		}
		} else {
		if (mInflationTaskLegacy != null && mInflationTaskLegacy.getStatus() != FINISHED) {
		@@ -625,7 +626,7 @@ public class Bubble implements BubbleViewProvider {
		if (mInflationTask == null) {
		return;
		}
		mInflationTask.cancel(true /* mayInterruptIfRunning */);
		mInflationTask.cancel();
		} else {
		if (mInflationTaskLegacy == null) {
		return;

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java

+132 −46

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleViewInfoTest.kt

+0 −7

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ class BubbleViewInfoTest : ShellTestCase() {
		private lateinit var bubbleStackView: BubbleStackView
		private lateinit var bubbleBarLayerView: BubbleBarLayerView
		private lateinit var bubblePositioner: BubblePositioner
		private lateinit var expandedViewManager: BubbleExpandedViewManager

		private val bubbleTaskViewFactory = BubbleTaskViewFactory {
		BubbleTaskView(mock<TaskView>(), mock<Executor>())
		@@ -155,7 +154,6 @@ class BubbleViewInfoTest : ShellTestCase() {
		bubbleController,
		mainExecutor
		)
		expandedViewManager = BubbleExpandedViewManager.fromBubbleController(bubbleController)
		bubbleBarLayerView = BubbleBarLayerView(context, bubbleController, bubbleData)
		}

		@@ -165,7 +163,6 @@ class BubbleViewInfoTest : ShellTestCase() {
		val info =
		BubbleViewInfoTask.BubbleViewInfo.populate(
		context,
		expandedViewManager,
		bubbleTaskViewFactory,
		bubblePositioner,
		bubbleStackView,
		@@ -193,9 +190,7 @@ class BubbleViewInfoTest : ShellTestCase() {
		val info =
		BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar(
		context,
		expandedViewManager,
		bubbleTaskViewFactory,
		bubblePositioner,
		bubbleBarLayerView,
		iconFactory,
		bubble,
		@@ -229,9 +224,7 @@ class BubbleViewInfoTest : ShellTestCase() {
		val info =
		BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar(
		context,
		expandedViewManager,
		bubbleTaskViewFactory,
		bubblePositioner,
		bubbleBarLayerView,
		iconFactory,
		bubble,

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ import com.android.wm.shell.bubbles.BubbleData;
		import com.android.wm.shell.bubbles.BubbleDataRepository;
		import com.android.wm.shell.bubbles.BubbleEducationController;
		import com.android.wm.shell.bubbles.BubbleEntry;
		import com.android.wm.shell.bubbles.BubbleExpandedViewManager;
		import com.android.wm.shell.bubbles.BubbleLogger;
		import com.android.wm.shell.bubbles.BubbleOverflow;
		import com.android.wm.shell.bubbles.BubbleStackView;
		@@ -1408,7 +1407,6 @@ public class BubblesTest extends SysuiTestCase {
		.thenReturn(userContext);

		BubbleViewInfoTask.BubbleViewInfo info = BubbleViewInfoTask.BubbleViewInfo.populate(context,
		BubbleExpandedViewManager.fromBubbleController(mBubbleController),
		() -> new BubbleTaskView(mock(TaskView.class), mock(Executor.class)),
		mPositioner,
		mBubbleController.getStackView(),