Merge "[SB Refactor] Add a flag to enable/disable icon debug colors." into tm-qpr-dev (6058b731) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+4 −9

Original line number	Diff line number	Diff line
		@@ -207,15 +207,6 @@ object Flags {
		unreleasedFlag(508, "qs_secondary_data_sub_info", teamfood = true)

		// 600- status bar
		// TODO(b/254512623): Tracking Bug
		@Deprecated("Replaced by mobile and wifi specific flags.")
		val NEW_STATUS_BAR_PIPELINE_BACKEND =
		unreleasedFlag(604, "new_status_bar_pipeline_backend", teamfood = false)

		// TODO(b/254512660): Tracking Bug
		@Deprecated("Replaced by mobile and wifi specific flags.")
		val NEW_STATUS_BAR_PIPELINE_FRONTEND =
		unreleasedFlag(605, "new_status_bar_pipeline_frontend", teamfood = false)

		// TODO(b/256614753): Tracking Bug
		val NEW_STATUS_BAR_MOBILE_ICONS = unreleasedFlag(606, "new_status_bar_mobile_icons")
		@@ -233,6 +224,10 @@ object Flags {
		// TODO(b/256623670): Tracking Bug
		@JvmField val BATTERY_SHIELD_ICON = unreleasedFlag(610, "battery_shield_icon")

		// TODO(b/260881289): Tracking Bug
		val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =
		unreleasedFlag(611, "new_status_bar_icons_debug_coloring")

		// 700 - dialer/calls
		// TODO(b/254512734): Tracking Bug
		val ONGOING_CALL_STATUS_BAR_CHIP = releasedFlag(700, "ongoing_call_status_bar_chip")

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,6 +52,6 @@ class StatusBarPipelineFlags @Inject constructor(private val featureFlags: Featu
		* Returns true if we should apply some coloring to the wifi icon that was rendered with the new
		* pipeline to help with debugging.
		*/
		// For now, just always apply the debug coloring if we've enabled the new icon.
		fun useWifiDebugColoring(): Boolean = useNewWifiIcon()
		fun useWifiDebugColoring(): Boolean =
		featureFlags.isEnabled(Flags.NEW_STATUS_BAR_ICONS_DEBUG_COLORING)
		}