Merge changes from topic "use_setflagsrule_annotations" into main (0e782f51) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,7 @@ android_library {
		"com_android_systemui_flags_lib",
		"com_android_systemui_shared_flags_lib",
		"flag-junit-base",
		"platform-parametric-runner-lib",
		"androidx.viewpager2_viewpager2",
		"androidx.legacy_legacy-support-v4",
		"androidx.recyclerview_recyclerview",

+2 −6

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		package com.android.systemui.scene.domain.startable

		import android.os.PowerManager
		import android.platform.test.annotations.EnableFlags
		import android.view.Display
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		@@ -45,7 +46,6 @@ import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.test.TestScope
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mockito.clearInvocations
		@@ -55,6 +55,7 @@ import org.mockito.Mockito.verify

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@EnableFlags(AconfigFlags.FLAG_SCENE_CONTAINER)
		class SceneContainerStartableTest : SysuiTestCase() {

		private val utils = SceneTestUtils(this)
		@@ -93,11 +94,6 @@ class SceneContainerStartableTest : SysuiTestCase() {
		authenticationInteractor = authenticationInteractor,
		)

		@Before
		fun setUp() {
		mSetFlagsRule.enableFlags(AconfigFlags.FLAG_SCENE_CONTAINER)
		}

		@Test
		fun hydrateVisibility() =
		testScope.runTest {

+3 −4

Original line number	Diff line number	Diff line
		@@ -119,9 +119,8 @@ data class UnreleasedFlag constructor(
		data class ReleasedFlag constructor(
		override val name: String,
		override val namespace: String,
		override val teamfood: Boolean = false,
		override val overridden: Boolean = false
		) : BooleanFlag(name, namespace, true, teamfood, overridden)
		) : BooleanFlag(name, namespace, true, teamfood = false, overridden)

		/**
		* A Flag that reads its default values from a resource overlay instead of code.
		@@ -132,8 +131,9 @@ data class ResourceBooleanFlag constructor(
		override val name: String,
		override val namespace: String,
		@BoolRes override val resourceId: Int,
		) : ResourceFlag<Boolean> {
		override val teamfood: Boolean = false
		) : ResourceFlag<Boolean>
		}

		/**
		* A Flag that can reads its overrides from System Properties.
		@@ -147,7 +147,6 @@ data class SysPropBooleanFlag constructor(
		override val namespace: String,
		override val default: Boolean = false,
		) : SysPropFlag<Boolean> {
		// TODO(b/268520433): Teamfood not supported for sysprop flags yet.
		override val teamfood: Boolean = false
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ object FlagsFactory {
		name: String,
		namespace: String = "systemui",
		): ReleasedFlag {
		val flag = ReleasedFlag(name = name, namespace = namespace, teamfood = false)
		val flag = ReleasedFlag(name = name, namespace = namespace)
		checkForDupesAndAdd(flag)
		return flag
		}
		@@ -57,7 +57,6 @@ object FlagsFactory {
		name = name,
		namespace = namespace,
		resourceId = resourceId,
		teamfood = false,
		)
		checkForDupesAndAdd(flag)
		return flag

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ object FlagsFactory {
		name: String,
		namespace: String = "systemui",
		): ReleasedFlag {
		val flag = ReleasedFlag(name = name, namespace = namespace, teamfood = false)
		val flag = ReleasedFlag(name = name, namespace = namespace)
		flagMap[name] = flag
		return flag
		}
		@@ -57,7 +57,6 @@ object FlagsFactory {
		name = name,
		namespace = namespace,
		resourceId = resourceId,
		teamfood = false,
		)
		flagMap[name] = flag
		return flag