Merge "Cleanup exclude_task_from_recents flag." into main (96d0d8bb) · Commits · e / os / android_frameworks_base

core/java/android/window/WindowContainerTransaction.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -512,10 +512,6 @@ public final class WindowContainerTransaction implements Parcelable {
		@NonNull
		public WindowContainerTransaction setTaskForceExcludedFromRecents(
		@NonNull WindowContainerToken container, boolean forceExcluded) {
		if (!Flags.excludeTaskFromRecents()) {
		throw new IllegalStateException(
		"Flag " + Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS + " is not enabled");
		}
		final Change chg = getOrCreateChange(container.asBinder());
		chg.mChangeMask \|= Change.CHANGE_FORCE_EXCLUDED_FROM_RECENTS;
		chg.mForceExcludedFromRecents = forceExcluded;
		@@ -1699,10 +1695,6 @@ public final class WindowContainerTransaction implements Parcelable {

		/** Gets whether the task is force excluded from recents. */
		public boolean getForceExcludedFromRecents() {
		if (!Flags.excludeTaskFromRecents()) {
		throw new IllegalStateException(
		"Flag " + Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS + " is not enabled");
		}
		return mForceExcludedFromRecents;
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -82,17 +82,6 @@ flag {
		bug: "425949809"
		}

		flag {
		namespace: "windowing_sdk"
		name: "exclude_task_from_recents"
		description: "Enables WCT to set whether the task should be excluded from the Recents list"
		bug: "404726350"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "activity_embedding_metrics"

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ class BubbleControllerTest(flags: FlagsParameterization) {

		bubbleTaskViewController.setTaskViewVisible(taskView, true /* visible */)

		if (BubbleAnythingFlagHelper.enableCreateAnyBubbleWithForceExcludedFromRecents()) {
		if (BubbleAnythingFlagHelper.enableCreateAnyBubble()) {
		verify(baseTransitions).setTaskViewVisible(
		taskView,
		true, /* visible */
		@@ -391,7 +391,7 @@ class BubbleControllerTest(flags: FlagsParameterization) {

		@Test
		fun setTaskViewVisible_lastBubbleRemoval_skipsTaskViewHiding() {
		assumeTrue(BubbleAnythingFlagHelper.enableCreateAnyBubbleWithForceExcludedFromRecents())
		assumeTrue(BubbleAnythingFlagHelper.enableCreateAnyBubble())

		val baseTransitions = mock<TaskViewTransitions>()
		val taskView = mock<TaskViewTaskController>()

+1 −6

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.window.WindowContainerTransaction
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.filters.SmallTest
		import com.android.internal.protolog.ProtoLog
		import com.android.window.flags.Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS
		import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_ANYTHING
		import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_TASK_VIEW_LISTENER
		import com.android.wm.shell.MockToken
		@@ -105,10 +104,7 @@ class BubbleExpandedViewTest(flags: FlagsParameterization) {
		}

		@Test
		@EnableFlags(
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		)
		@EnableFlags(FLAG_ENABLE_BUBBLE_ANYTHING)
		fun onTaskCreated_appliesWctToEnterBubble() {
		bubbleTaskView.listener.onTaskCreated(123 /* taskId */, componentName)

		@@ -127,7 +123,6 @@ class BubbleExpandedViewTest(flags: FlagsParameterization) {
		@Parameters(name = "{0}")
		fun getParams() = FlagsParameterization.allCombinationsOf(
		FLAG_ENABLE_BUBBLE_TASK_VIEW_LISTENER,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		)
		}
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.window.WindowContainerTransaction
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.protolog.ProtoLog
		import com.android.window.flags.Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS
		import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_ANYTHING
		import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_APP_COMPAT_FIXES
		import com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE
		@@ -135,7 +134,6 @@ class BubbleTaskStackListenerTest {
		@EnableFlags(
		FLAG_ENABLE_CREATE_ANY_BUBBLE,
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_ENABLE_BUBBLE_APP_COMPAT_FIXES,
		)
		fun onActivityRestartAttempt_inStackAppBubbleToFullscreen_notifiesTaskRemoval() {
		@@ -169,7 +167,6 @@ class BubbleTaskStackListenerTest {
		@EnableFlags(
		FLAG_ENABLE_CREATE_ANY_BUBBLE,
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		)
		fun onActivityRestartAttempt_inStackAppBubbleToSplit_doesNothing() {
		task.parentTaskId = 456
		@@ -200,7 +197,6 @@ class BubbleTaskStackListenerTest {
		@EnableFlags(
		FLAG_ENABLE_CREATE_ANY_BUBBLE,
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_ENABLE_BUBBLE_APP_COMPAT_FIXES,
		)
		fun onTaskMovedToFront_inStackAppBubbleToFullscreen_notifiesTaskRemoval() {