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

Commit 776e8d05 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I91b545e9,Iac6ce358 into udc-qpr-dev 

* changes:
  [Status Bar][Wifi] Flip WIFI_TRACKER_LIB_FOR_WIFI_ICON to teamfood.
  [Status Bar][Wifi] Track secondary networks in TrackerLibRepo.
parents 92351470 6d9af3a0

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

+4 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ object Flags { 


    // TODO(b/292533677): Tracking Bug

    val WIFI_TRACKER_LIB_FOR_WIFI_ICON =

        unreleasedFlag(613, "wifi_tracker_lib_for_wifi_icon")

        unreleasedFlag(613, "wifi_tracker_lib_for_wifi_icon", teamfood = true)



    // TODO(b/293863612): Tracking Bug

    @JvmField val INCOMPATIBLE_CHARGING_BATTERY_ICON =
@@ -378,6 +378,9 @@ object Flags { 
    // TODO(b/293585143): Tracking Bug

    val INSTANT_TETHER = unreleasedFlag(615, "instant_tether")



    // TODO(b/294588085): Tracking Bug

    val WIFI_SECONDARY_NETWORKS = unreleasedFlag(617, "wifi_secondary_networks")



    // 700 - dialer/calls

    // TODO(b/254512734): Tracking Bug

    val ONGOING_CALL_STATUS_BAR_CHIP = releasedFlag(700, "ongoing_call_status_bar_chip")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt

+10 −1
Original line number Diff line number Diff line
@@ -29,9 +29,18 @@ interface WifiRepository { 
    /** Observable for the current wifi default status. */

    val isWifiDefault: StateFlow<Boolean>



    /** Observable for the current wifi network. */

    /** Observable for the current primary wifi network. */

    val wifiNetwork: StateFlow<WifiNetworkModel>



    /**

     * Observable for secondary wifi networks (if any). Should specifically exclude the primary

     * network emitted by [wifiNetwork].

     *

     * This isn't used by phones/tablets, which only display the primary network, but may be used by

     * other variants like Car.

     */

    val secondaryNetworks: StateFlow<List<WifiNetworkModel>>



    /** Observable for the current wifi network activity. */

    val wifiActivity: StateFlow<DataActivityModel>

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt

+5 −0
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ constructor( 
            .flatMapLatest { it.wifiNetwork }

            .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.wifiNetwork.value)



    override val secondaryNetworks: StateFlow<List<WifiNetworkModel>> =

        activeRepo

            .flatMapLatest { it.secondaryNetworks }

            .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.secondaryNetworks.value)



    override val wifiActivity: StateFlow<DataActivityModel> =

        activeRepo

            .flatMapLatest { it.wifiActivity }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ constructor( 
    private val _wifiNetwork = MutableStateFlow<WifiNetworkModel>(WifiNetworkModel.Inactive)

    override val wifiNetwork: StateFlow<WifiNetworkModel> = _wifiNetwork



    private val _secondaryNetworks = MutableStateFlow<List<WifiNetworkModel>>(emptyList())

    override val secondaryNetworks: StateFlow<List<WifiNetworkModel>> = _secondaryNetworks



    private val _wifiActivity =

        MutableStateFlow(DataActivityModel(hasActivityIn = false, hasActivityOut = false))

    override val wifiActivity: StateFlow<DataActivityModel> = _wifiActivity

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ class DisabledWifiRepository @Inject constructor() : 


    override val wifiNetwork: StateFlow<WifiNetworkModel> = MutableStateFlow(NETWORK).asStateFlow()



    override val secondaryNetworks: StateFlow<List<WifiNetworkModel>> =

        MutableStateFlow(emptyList<WifiNetworkModel>()).asStateFlow()



    override val wifiActivity: StateFlow<DataActivityModel> =

        MutableStateFlow(ACTIVITY).asStateFlow()