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

Commit e193236f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use TintedIconManager in split shade"

parents abe72552 3b6023c0

packages/SystemUI/src/com/android/systemui/statusbar/phone/SplitShadeHeaderController.kt

+5 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.phone 




import android.view.View

import android.view.View

import androidx.constraintlayout.motion.widget.MotionLayout

import androidx.constraintlayout.motion.widget.MotionLayout

import com.android.settingslib.Utils

import com.android.systemui.R

import com.android.systemui.R

import com.android.systemui.animation.ShadeInterpolation

import com.android.systemui.animation.ShadeInterpolation

import com.android.systemui.battery.BatteryMeterView

import com.android.systemui.battery.BatteryMeterView
@@ -49,7 +50,7 @@ class SplitShadeHeaderController @Inject constructor( 




    private val combinedHeaders = featureFlags.isEnabled(Flags.COMBINED_QS_HEADERS)

    private val combinedHeaders = featureFlags.isEnabled(Flags.COMBINED_QS_HEADERS)

    // TODO(b/194178072) Handle RSSI hiding when multi carrier

    // TODO(b/194178072) Handle RSSI hiding when multi carrier

    private val iconManager: StatusBarIconController.IconManager

    private val iconManager: StatusBarIconController.TintedIconManager

    private val qsCarrierGroupController: QSCarrierGroupController

    private val qsCarrierGroupController: QSCarrierGroupController

    private var visible = false

    private var visible = false

        set(value) {

        set(value) {
@@ -117,7 +118,9 @@ class SplitShadeHeaderController @Inject constructor( 
        batteryIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE)

        batteryIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE)





        val iconContainer: StatusIconContainer = statusBar.findViewById(R.id.statusIcons)

        val iconContainer: StatusIconContainer = statusBar.findViewById(R.id.statusIcons)

        iconManager = StatusBarIconController.IconManager(iconContainer, featureFlags)

        iconManager = StatusBarIconController.TintedIconManager(iconContainer, featureFlags)

        iconManager.setTint(Utils.getColorAttrDefaultColor(statusBar.context,

                android.R.attr.textColorPrimary))

        qsCarrierGroupController = qsCarrierGroupControllerBuilder

        qsCarrierGroupController = qsCarrierGroupControllerBuilder

                .setQSCarrierGroup(statusBar.findViewById(R.id.carrier_group))

                .setQSCarrierGroup(statusBar.findViewById(R.id.carrier_group))

                .build()

                .build()