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

Commit 0fb69e95 authored by Evan Laird's avatar Evan Laird
Browse files

[Sb refactor] show data activity in Mobile view 

Adds support for reading the config `config_showActivity`, and uses the
new `DataActivityModel` type to show the data activity in the mobile
view model / view binder

Test: MobileIconViewModelTest
Test: MobileConnectionRepositoryTest
Test: DemoMobileConnectionParameterizedTest
Test: manual demo mode
Bug: 238425913
Change-Id: Id413d57d6c694ea6f324b022f6d215ae71b22074
parent d4c86b4e

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt

+6 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.pipeline.mobile.data.model



import android.annotation.IntRange

import android.telephony.Annotation.DataActivityType

import android.telephony.CellSignalStrength

import android.telephony.TelephonyCallback.CarrierNetworkListener

import android.telephony.TelephonyCallback.DataActivityListener
@@ -28,6 +27,7 @@ import android.telephony.TelephonyCallback.SignalStrengthsListener 
import android.telephony.TelephonyDisplayInfo

import android.telephony.TelephonyManager

import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected

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



/**

 * Data class containing all of the relevant information for a particular line of service, known as
@@ -54,7 +54,11 @@ data class MobileConnectionModel( 
    val dataConnectionState: DataConnectionState = Disconnected,



    /** From [DataActivityListener.onDataActivity]. See [TelephonyManager] for the values */

    @DataActivityType val dataActivityDirection: Int? = null,

    val dataActivityDirection: DataActivityModel =

        DataActivityModel(

            hasActivityIn = false,

            hasActivityOut = false,

        ),



    /** From [CarrierNetworkListener.onCarrierNetworkChange] */

    val carrierNetworkChangeActive: Boolean = false,

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.demo 


import android.content.Context

import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID

import android.telephony.TelephonyManager.DATA_ACTIVITY_NONE

import android.util.Log

import com.android.settingslib.SignalIcon

import com.android.settingslib.mobile.MobileMappings
@@ -34,6 +35,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConn 
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

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

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

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -236,7 +238,7 @@ constructor( 
            primaryLevel = level ?: 0,

            dataConnectionState =

                DataConnectionState.Connected, // TODO(b/261029387): not yet supported

            dataActivityDirection = activity,

            dataActivityDirection = (activity ?: DATA_ACTIVITY_NONE).toMobileDataActivityModel(),

            carrierNetworkChangeActive = carrierNetworkChange,

            resolvedNetworkType = dataType.toResolvedNetworkType()

        )

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

+5 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConn 
import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

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

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

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

import com.android.systemui.util.settings.GlobalSettings

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher
@@ -137,7 +138,10 @@ class MobileConnectionRepositoryImpl( 
                        }



                        override fun onDataActivity(direction: Int) {

                            state = state.copy(dataActivityDirection = direction)

                            state =

                                state.copy(

                                    dataActivityDirection = direction.toMobileDataActivityModel()

                                )

                            trySend(state)

                        }

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

+7 −0
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ import com.android.settingslib.SignalIcon.MobileIconGroup 
import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Connected

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

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
@@ -32,6 +34,9 @@ import kotlinx.coroutines.flow.mapLatest 
import kotlinx.coroutines.flow.stateIn



interface MobileIconInteractor {

    /** The current mobile data activity */

    val activity: Flow<DataActivityModel>



    /** Only true if mobile is the default transport but is not validated, otherwise false */

    val isDefaultConnectionFailed: StateFlow<Boolean>
@@ -82,6 +87,8 @@ class MobileIconInteractorImpl( 
) : MobileIconInteractor {

    private val connectionInfo = connectionRepository.connectionInfo



    override val activity = connectionInfo.mapLatest { it.dataActivityDirection }



    override val isDataEnabled: StateFlow<Boolean> = connectionRepository.dataEnabled



    override val isDefaultDataEnabled = defaultSubscriptionHasDataEnabled

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

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.pipeline.mobile.ui.binder



import android.content.res.ColorStateList

import android.view.View

import android.view.View.GONE

import android.view.View.VISIBLE

import android.view.ViewGroup
@@ -40,6 +41,9 @@ object MobileIconBinder { 
        view: ViewGroup,

        viewModel: MobileIconViewModel,

    ) {

        val activityContainer = view.requireViewById<View>(R.id.inout_container)

        val activityIn = view.requireViewById<ImageView>(R.id.mobile_in)

        val activityOut = view.requireViewById<ImageView>(R.id.mobile_out)

        val networkTypeView = view.requireViewById<ImageView>(R.id.mobile_type)

        val iconView = view.requireViewById<ImageView>(R.id.mobile_signal)

        val mobileDrawable = SignalDrawable(view.context).also { iconView.setImageDrawable(it) }
@@ -74,6 +78,15 @@ object MobileIconBinder { 
                    }

                }



                // Set the activity indicators

                launch { viewModel.activityInVisible.collect { activityIn.isVisible = it } }



                launch { viewModel.activityOutVisible.collect { activityOut.isVisible = it } }



                launch {

                    viewModel.activityContainerVisible.collect { activityContainer.isVisible = it }

                }



                // Set the tint

                launch {

                    viewModel.tint.collect { tint ->
@@ -81,6 +94,8 @@ object MobileIconBinder { 
                        iconView.imageTintList = tintList

                        networkTypeView.imageTintList = tintList

                        roamingView.imageTintList = tintList

                        activityIn.imageTintList = tintList

                        activityOut.imageTintList = tintList

                    }

                }

            }