Merge "[sb] status_bar_simple_fragment -> status_bar_root_modernization" into main (9bef2e06) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -631,9 +631,9 @@ flag {
		}

		flag {
		name: "status_bar_simple_fragment"
		name: "status_bar_root_modernization"
		namespace: "systemui"
		description: "Feature flag for refactoring the collapsed status bar fragment"
		description: "Feature flag for replacing the status bar fragment with a compose root"
		bug: "364360986"
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt

+8 −9

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.platform.test.annotations.EnableFlags
		import android.view.ViewGroup
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.fragments.FragmentHostManager
		import com.android.systemui.kosmos.useUnconfinedTestDispatcher
		@@ -81,21 +80,21 @@ class StatusBarInitializerTest : SysuiTestCase() {
		)

		@Test
		@EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)
		fun simpleFragment_startsFromCoreStartable() {
		@EnableFlags(StatusBarRootModernization.FLAG_NAME)
		fun flagOn_startsFromCoreStartable() {
		underTest.start()
		assertThat(underTest.initialized).isTrue()
		}

		@Test
		@EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)
		fun simpleFragment_throwsIfInitializeIsCalled() {
		@EnableFlags(StatusBarRootModernization.FLAG_NAME)
		fun flagOn_throwsIfInitializeIsCalled() {
		assertThrows(IllegalStateException::class.java) { underTest.initializeStatusBar() }
		}

		@Test
		@EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)
		fun simpleFragment_flagEnabled_doesNotCreateFragment() {
		@EnableFlags(StatusBarRootModernization.FLAG_NAME)
		fun flagOn_flagEnabled_doesNotCreateFragment() {
		underTest.start()

		verify(fragmentManager, never()).beginTransaction()
		@@ -103,14 +102,14 @@ class StatusBarInitializerTest : SysuiTestCase() {
		}

		@Test
		@DisableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)
		@DisableFlags(StatusBarRootModernization.FLAG_NAME)
		fun flagOff_startCalled_stillInitializes() {
		underTest.start()
		assertThat(underTest.initialized).isTrue()
		}

		@Test
		@DisableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)
		@DisableFlags(StatusBarRootModernization.FLAG_NAME)
		fun flagOff_doesNotThrowIfInitializeIsCalled() {
		underTest.initializeStatusBar()
		assertThat(underTest.initialized).isTrue()

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -112,12 +112,12 @@ constructor(
		}

		override fun initializeStatusBar() {
		StatusBarSimpleFragment.assertInLegacyMode()
		StatusBarRootModernization.assertInLegacyMode()
		doStart()
		}

		private fun doStart() {
		if (StatusBarSimpleFragment.isEnabled) doComposeStart() else doLegacyStart()
		if (StatusBarRootModernization.isEnabled) doComposeStart() else doLegacyStart()
		}

		/**

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarSimpleFragment.kt→packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import com.android.systemui.flags.FlagToken
		import com.android.systemui.flags.RefactorFlagUtils

		/** Helper for reading and using the status bar simple fragment flag state */
		object StatusBarSimpleFragment {
		object StatusBarRootModernization {
		/** Aconfig flag for removing the fragment */
		const val FLAG_NAME = Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT
		const val FLAG_NAME = Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION

		/** A token used for dependency declaration */
		val token: FlagToken
		@@ -32,7 +32,7 @@ object StatusBarSimpleFragment {
		/** Is the refactor enabled */
		@JvmStatic
		inline val isEnabled
		get() = Flags.statusBarSimpleFragment()
		get() = Flags.statusBarRootModernization()

		/**
		* Called to ensure code is only run when the flag is enabled. This protects users from the

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.core.StatusBarConnectedDisplays;
		import com.android.systemui.statusbar.core.StatusBarInitializer;
		import com.android.systemui.statusbar.core.StatusBarSimpleFragment;
		import com.android.systemui.statusbar.core.StatusBarRootModernization;
		import com.android.systemui.statusbar.data.model.StatusBarMode;
		import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore;
		import com.android.systemui.statusbar.notification.NotificationActivityStarter;
		@@ -1231,7 +1231,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		checkBarModes();
		});
		}
		if (!StatusBarSimpleFragment.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) {
		if (!StatusBarRootModernization.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) {
		// When the flag is on, we register the fragment as a core startable and this is not
		// needed
		mStatusBarInitializer.initializeStatusBar();