Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a15ab1 authored by Evan Laird's avatar Evan Laird
Browse files

[Sb refactor] Remove debug color flags 

`NEW_STATUS_BAR_ICONS_DEBUG_COLORING` was implemented to help us
distinguish the icons coming from the new pipeline vs the old one. Now
that we are fully rolled out, we don't need this flag.

Fixes: 260881289
Test: tests in com.android.systemui.statusbar.pipeline
Test: manual
Change-Id: Ia3691744e9d00fc41a041c4aaa032dce23cc6e22
parent 78e6bd96

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

+0 −3
Original line number Diff line number Diff line
@@ -369,9 +369,6 @@ object Flags { 
    val NEW_STATUS_BAR_MOBILE_ICONS_BACKEND =

        unreleasedFlag(608, "new_status_bar_mobile_icons_backend", teamfood = true)



    // TODO(b/260881289): Tracking Bug

    val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =

        unreleasedFlag(611, "new_status_bar_icons_debug_coloring")



    // TODO(b/265892345): Tracking Bug

    val PLUG_IN_STATUS_BAR_CHIP = releasedFlag(265892345, "plug_in_status_bar_chip")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/StatusBarPipelineFlags.kt

+0 −7
Original line number Diff line number Diff line
@@ -45,13 +45,6 @@ constructor( 
    fun runNewMobileIconsBackend(): Boolean =

        featureFlags.isEnabled(Flags.NEW_STATUS_BAR_MOBILE_ICONS_BACKEND) || useNewMobileIcons()



    /**

     * Returns true if we should apply some coloring to the icons that were rendered with the new

     * pipeline to help with debugging.

     */

    fun useDebugColoring(): Boolean =

        featureFlags.isEnabled(Flags.NEW_STATUS_BAR_ICONS_DEBUG_COLORING)



    /**

     * For convenience in the StatusBarIconController, we want to gate some actions based on slot

     * name and the flag together.

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt

+0 −6
Original line number Diff line number Diff line
@@ -183,16 +183,10 @@ object MobileIconBinder { 
            }



            override fun onIconTintChanged(newTint: Int) {

                if (viewModel.useDebugColoring) {

                    return

                }

                iconTint.value = newTint

            }



            override fun onDecorTintChanged(newTint: Int) {

                if (viewModel.useDebugColoring) {

                    return

                }

                decorTint.value = newTint

            }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileViewModel.kt

+3 −25
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel 


import android.graphics.Color

import com.android.systemui.statusbar.phone.StatusBarLocation

import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags

import com.android.systemui.statusbar.pipeline.mobile.ui.VerboseMobileViewLogger



/**
@@ -32,24 +31,14 @@ import com.android.systemui.statusbar.pipeline.mobile.ui.VerboseMobileViewLogger 
 */

abstract class LocationBasedMobileViewModel(

    val commonImpl: MobileIconViewModelCommon,

    statusBarPipelineFlags: StatusBarPipelineFlags,

    debugTint: Int,

    val locationName: String,

    val verboseLogger: VerboseMobileViewLogger?,

) : MobileIconViewModelCommon by commonImpl {

    val useDebugColoring: Boolean = statusBarPipelineFlags.useDebugColoring()



    val defaultColor: Int =

        if (useDebugColoring) {

            debugTint

        } else {

            Color.WHITE

        }

    val defaultColor: Int = Color.WHITE



    companion object {

        fun viewModelForLocation(

            commonImpl: MobileIconViewModelCommon,

            statusBarPipelineFlags: StatusBarPipelineFlags,

            verboseMobileViewLogger: VerboseMobileViewLogger,

            loc: StatusBarLocation,

        ): LocationBasedMobileViewModel =
@@ -57,39 +46,31 @@ abstract class LocationBasedMobileViewModel( 
                StatusBarLocation.HOME ->

                    HomeMobileIconViewModel(

                        commonImpl,

                        statusBarPipelineFlags,

                        verboseMobileViewLogger,

                    )

                StatusBarLocation.KEYGUARD ->

                    KeyguardMobileIconViewModel(commonImpl, statusBarPipelineFlags)

                StatusBarLocation.QS -> QsMobileIconViewModel(commonImpl, statusBarPipelineFlags)

                StatusBarLocation.KEYGUARD -> KeyguardMobileIconViewModel(commonImpl)

                StatusBarLocation.QS -> QsMobileIconViewModel(commonImpl)

            }

    }

}



class HomeMobileIconViewModel(

    commonImpl: MobileIconViewModelCommon,

    statusBarPipelineFlags: StatusBarPipelineFlags,

    verboseMobileViewLogger: VerboseMobileViewLogger,

) :

    MobileIconViewModelCommon,

    LocationBasedMobileViewModel(

        commonImpl,

        statusBarPipelineFlags,

        debugTint = Color.CYAN,

        locationName = "Home",

        verboseMobileViewLogger,

    )



class QsMobileIconViewModel(

    commonImpl: MobileIconViewModelCommon,

    statusBarPipelineFlags: StatusBarPipelineFlags,

) :

    MobileIconViewModelCommon,

    LocationBasedMobileViewModel(

        commonImpl,

        statusBarPipelineFlags,

        debugTint = Color.GREEN,

        locationName = "QS",

        // Only do verbose logging for the Home location.

        verboseLogger = null,
@@ -97,13 +78,10 @@ class QsMobileIconViewModel( 


class KeyguardMobileIconViewModel(

    commonImpl: MobileIconViewModelCommon,

    statusBarPipelineFlags: StatusBarPipelineFlags,

) :

    MobileIconViewModelCommon,

    LocationBasedMobileViewModel(

        commonImpl,

        statusBarPipelineFlags,

        debugTint = Color.MAGENTA,

        locationName = "Keyguard",

        // Only do verbose logging for the Home location.

        verboseLogger = null,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModel.kt

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ constructor( 
        val common = commonViewModelForSub(subId)

        return LocationBasedMobileViewModel.viewModelForLocation(

            common,

            statusBarPipelineFlags,

            verboseLogger,

            location,

        )