Merge "[SB Refactor] Add a flag to enable/disable icon debug colors." into tm-qpr-dev am: 6058b731b9 am: d990aa7486
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20598764 Change-Id: Ia5af9343048f1522762d9b87698b16b0f0cbb872 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -205,15 +205,6 @@ object Flags {
|
||||
@JvmField val QS_SECONDARY_DATA_SUB_INFO = releasedFlag(508, "qs_secondary_data_sub_info")
|
||||
|
||||
// 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")
|
||||
@@ -231,6 +222,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")
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user