Merge "Cleanup disallow_bubble_to_enter_pip" into main (ccae1b2d) · Commits · e / os / android_frameworks_base

core/java/android/window/WindowContainerTransaction.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -996,10 +996,6 @@ public final class WindowContainerTransaction implements Parcelable {
		@NonNull
		public WindowContainerTransaction setDisablePip(
		@NonNull WindowContainerToken container, boolean disablePip) {
		if (!Flags.disallowBubbleToEnterPip()) {
		throw new IllegalStateException(
		"Flag " + Flags.FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP + " is not enabled");
		}
		final Change chg = getOrCreateChange(container.asBinder());
		chg.mChangeMask \|= Change.CHANGE_DISABLE_PIP;
		chg.mDisablePip = disablePip;

+0 −11

Original line number	Diff line number	Diff line
		@@ -154,17 +154,6 @@ flag {
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "disallow_bubble_to_enter_pip"
		description: "Prevent Bubble task to enter picture-in-picture"
		bug: "389158353"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "reparent_to_default_with_display_removal"

+0 −2

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_DISALLOW_BUBBLE_TO_ENTER_PIP
		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
		@@ -109,7 +108,6 @@ class BubbleExpandedViewTest(flags: FlagsParameterization) {
		@EnableFlags(
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,
		)
		fun onTaskCreated_appliesWctToEnterBubble() {
		bubbleTaskView.listener.onTaskCreated(123 /* taskId */, componentName)

+0 −3

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_DISALLOW_BUBBLE_TO_ENTER_PIP
		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
		@@ -137,7 +136,6 @@ class BubbleTaskStackListenerTest {
		FLAG_ENABLE_CREATE_ANY_BUBBLE,
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,
		FLAG_ENABLE_BUBBLE_APP_COMPAT_FIXES,
		)
		fun onActivityRestartAttempt_inStackAppBubbleToFullscreen_notifiesTaskRemoval() {
		@@ -172,7 +170,6 @@ class BubbleTaskStackListenerTest {
		FLAG_ENABLE_CREATE_ANY_BUBBLE,
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,
		)
		fun onActivityRestartAttempt_inStackAppBubbleToSplit_doesNothing() {
		task.parentTaskId = 456

+0 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
		import com.android.internal.protolog.ProtoLog
		import com.android.window.flags.Flags.FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP
		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_CREATE_ANY_BUBBLE
		@@ -425,7 +424,6 @@ class BubbleTaskViewListenerTest {
		@EnableFlags(
		FLAG_ENABLE_BUBBLE_ANYTHING,
		FLAG_EXCLUDE_TASK_FROM_RECENTS,
		FLAG_DISALLOW_BUBBLE_TO_ENTER_PIP,
		)
		fun onTaskCreated_appliesWctToEnterBubble() {
		val b = createAppBubble()