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

Commit 1d08a471 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB Refactor] Make `numberOfLevels` a flow at the repo level. 

The carrier merged logic will need to provide `numberOfLevels` at the
repo level, so pre-emptively refactor it there now.

Bug: 238425913
Test: `adb shell am broadcast -a com.android.systemui.demo
-e command network -e mobile show -e level 4 -e datatype 4g` -> shows
full triangle
Test: all statusbar.pipeline.mobile tests

Change-Id: I7f5bc07b4ff9917b32ffb6e56a1f18dbe181e401
parent 3747a472

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ interface MobileConnectionRepository { 
     * listener + model.

     */

    val connectionInfo: Flow<MobileConnectionModel>



    /** The total number of levels. Used with [SignalDrawable]. */

    val numberOfLevels: StateFlow<Int>



    /** Observable tracking [TelephonyManager.isDataConnectionAllowed] */

    val dataEnabled: StateFlow<Boolean>
@@ -64,4 +68,9 @@ interface MobileConnectionRepository { 


    /** The service provider name for this network connection, or the default name */

    val networkName: StateFlow<NetworkNameModel>



    companion object {

        /** The default number of levels to use for [numberOfLevels]. */

        const val DEFAULT_NUM_LEVELS = 4

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetwork 
import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType.DefaultNetworkType

import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.model.FakeNetworkEventModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.model.FakeNetworkEventModel.Mobile
@@ -270,6 +271,8 @@ class DemoMobileConnectionRepository( 
) : MobileConnectionRepository {

    override val connectionInfo = MutableStateFlow(MobileConnectionModel())



    override val numberOfLevels = MutableStateFlow(DEFAULT_NUM_LEVELS)



    override val dataEnabled = MutableStateFlow(true)



    override val cdmaRoaming = MutableStateFlow(false)

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt

+8 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetwork 
import com.android.systemui.statusbar.pipeline.mobile.data.model.toDataConnectionType

import com.android.systemui.statusbar.pipeline.mobile.data.model.toNetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.data.model.toMobileDataActivityModel
@@ -63,6 +64,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow 
import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.flow.mapLatest

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.onEach
@@ -213,6 +215,12 @@ class MobileConnectionRepositoryImpl( 
            .stateIn(scope, SharingStarted.WhileSubscribed(), state)

    }



    // This will become variable based on [CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL]

    // once it's wired up inside of [CarrierConfigTracker].

    override val numberOfLevels: StateFlow<Int> =

        flowOf(DEFAULT_NUM_LEVELS)

            .stateIn(scope, SharingStarted.WhileSubscribed(), DEFAULT_NUM_LEVELS)



    /** Produces whenever the mobile data setting changes for this subId */

    private val localMobileDataSettingChangedEvent: Flow<Unit> = conflatedCallbackFlow {

        val observer =

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt

+7 −7
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ import com.android.systemui.log.table.TableLogBuffer 
import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Connected

import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.util.CarrierConfigTracker

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.combine
@@ -171,11 +170,12 @@ class MobileIconInteractorImpl( 
            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), 0)



    /**

     * This will become variable based on [CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL]

     * once it's wired up inside of [CarrierConfigTracker]

     */

    override val numberOfLevels: StateFlow<Int> = MutableStateFlow(4)

    override val numberOfLevels: StateFlow<Int> =

        connectionRepository.numberOfLevels.stateIn(

            scope,

            SharingStarted.WhileSubscribed(),

            connectionRepository.numberOfLevels.value,

        )



    override val isDataConnected: StateFlow<Boolean> =

        connectionInfo

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/FakeMobileConnectionRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository 
import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import kotlinx.coroutines.flow.MutableStateFlow



// TODO(b/261632894): remove this in favor of the real impl or DemoMobileConnectionRepository
@@ -29,6 +30,8 @@ class FakeMobileConnectionRepository( 
    private val _connectionInfo = MutableStateFlow(MobileConnectionModel())

    override val connectionInfo = _connectionInfo



    override val numberOfLevels = MutableStateFlow(DEFAULT_NUM_LEVELS)



    private val _dataEnabled = MutableStateFlow(true)

    override val dataEnabled = _dataEnabled