[kairos] Fork status bar mobile domain layer (ec071220) · Commits · e / os / android_frameworks_base

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

0 → 100644

+868 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644

+1046 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+13 −3

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.Mobil
		import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.MobileConnectionsRepositoryKairosImpl
		import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor
		import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractorImpl
		import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractorKairosImpl
		import com.android.systemui.statusbar.pipeline.mobile.ui.MobileUiAdapter
		import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel
		import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy
		@@ -147,9 +148,6 @@ abstract class StatusBarPipelineModule {
		impl: SubscriptionManagerProxyImpl
		): SubscriptionManagerProxy

		@Binds
		abstract fun mobileIconsInteractor(impl: MobileIconsInteractorImpl): MobileIconsInteractor

		@Binds
		@IntoMap
		@ClassKey(MobileUiAdapter::class)
		@@ -170,6 +168,18 @@ abstract class StatusBarPipelineModule {

		companion object {

		@Provides
		fun mobileIconsInteractor(
		impl: Provider<MobileIconsInteractorImpl>,
		kairosImpl: Provider<MobileIconsInteractorKairosImpl>,
		): MobileIconsInteractor {
		return if (Flags.statusBarMobileIconKairos()) {
		kairosImpl.get()
		} else {
		impl.get()
		}
		}

		@Provides
		fun mobileConnectionsRepository(
		impl: Provider<MobileRepositorySwitcher>,

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

0 → 100644

+380 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.pipeline.mobile.domain.interactor

		import android.content.Context
		import com.android.internal.telephony.flags.Flags
		import com.android.settingslib.SignalIcon.MobileIconGroup
		import com.android.settingslib.graph.SignalDrawable
		import com.android.settingslib.mobile.MobileIconCarrierIdOverrides
		import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.log.table.logDiffsForTable
		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.model.ResolvedNetworkType
		import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
		import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel
		import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.DefaultIcon
		import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.OverriddenIcon
		import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel
		import com.android.systemui.statusbar.pipeline.satellite.ui.model.SatelliteIconModel
		import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.stateIn

		interface MobileIconInteractorKairos {
		/** The table log created for this connection */
		val tableLogBuffer: TableLogBuffer

		/** The current mobile data activity */
		val activity: Flow<DataActivityModel>

		/** See [MobileConnectionsRepository.mobileIsDefault]. */
		val mobileIsDefault: Flow<Boolean>

		/**
		* True when telephony tells us that the data state is CONNECTED. See
		* [android.telephony.TelephonyCallback.DataConnectionStateListener] for more details. We
		* consider this connection to be serving data, and thus want to show a network type icon, when
		* data is connected. Other data connection states would typically cause us not to show the icon
		*/
		val isDataConnected: StateFlow<Boolean>

		/** True if we consider this connection to be in service, i.e. can make calls */
		val isInService: StateFlow<Boolean>

		/** True if this connection is emergency only */
		val isEmergencyOnly: StateFlow<Boolean>

		/** Observable for the data enabled state of this connection */
		val isDataEnabled: StateFlow<Boolean>

		/** True if the RAT icon should always be displayed and false otherwise. */
		val alwaysShowDataRatIcon: StateFlow<Boolean>

		/** Canonical representation of the current mobile signal strength as a triangle. */
		val signalLevelIcon: StateFlow<SignalIconModel>

		/** Observable for RAT type (network type) indicator */
		val networkTypeIconGroup: StateFlow<NetworkTypeIconModel>

		/** Whether or not to show the slice attribution */
		val showSliceAttribution: StateFlow<Boolean>

		/** True if this connection is satellite-based */
		val isNonTerrestrial: StateFlow<Boolean>

		/**
		* Provider name for this network connection. The name can be one of 3 values:
		* 1. The default network name, if one is configured
		* 2. A derived name based off of the intent [ACTION_SERVICE_PROVIDERS_UPDATED]
		* 3. Or, in the case where the repository sends us the default network name, we check for an
		* override in [connectionInfo.operatorAlphaShort], a value that is derived from
		* [ServiceState]
		*/
		val networkName: StateFlow<NetworkNameModel>

		/**
		* Provider name for this network connection. The name can be one of 3 values:
		* 1. The default network name, if one is configured
		* 2. A name provided by the [SubscriptionModel] of this network connection
		* 3. Or, in the case where the repository sends us the default network name, we check for an
		* override in [connectionInfo.operatorAlphaShort], a value that is derived from
		* [ServiceState]
		*
		* TODO(b/296600321): De-duplicate this field with [networkName] after determining the data
		* provided is identical
		*/
		val carrierName: StateFlow<String>

		/** True if there is only one active subscription. */
		val isSingleCarrier: StateFlow<Boolean>

		/**
		* True if this connection is considered roaming. The roaming bit can come from [ServiceState],
		* or directly from the telephony manager's CDMA ERI number value. Note that we don't consider a
		* connection to be roaming while carrier network change is active
		*/
		val isRoaming: StateFlow<Boolean>

		/** See [MobileIconsInteractor.isForceHidden]. */
		val isForceHidden: Flow<Boolean>

		/** See [MobileConnectionRepository.isAllowedDuringAirplaneMode]. */
		val isAllowedDuringAirplaneMode: StateFlow<Boolean>

		/** True when in carrier network change mode */
		val carrierNetworkChangeActive: StateFlow<Boolean>
		}

		/** Interactor for a single mobile connection. This connection _should_ have one subscription ID */
		@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")
		class MobileIconInteractorKairosImpl(
		@Background scope: CoroutineScope,
		defaultSubscriptionHasDataEnabled: StateFlow<Boolean>,
		override val alwaysShowDataRatIcon: StateFlow<Boolean>,
		alwaysUseCdmaLevel: StateFlow<Boolean>,
		override val isSingleCarrier: StateFlow<Boolean>,
		override val mobileIsDefault: StateFlow<Boolean>,
		defaultMobileIconMapping: StateFlow<Map<String, MobileIconGroup>>,
		defaultMobileIconGroup: StateFlow<MobileIconGroup>,
		isDefaultConnectionFailed: StateFlow<Boolean>,
		override val isForceHidden: Flow<Boolean>,
		connectionRepository: MobileConnectionRepository,
		private val context: Context,
		val carrierIdOverrides: MobileIconCarrierIdOverrides = MobileIconCarrierIdOverridesImpl(),
		) : MobileIconInteractor, MobileIconInteractorKairos {
		override val tableLogBuffer: TableLogBuffer = connectionRepository.tableLogBuffer

		override val activity = connectionRepository.dataActivityDirection

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

		override val carrierNetworkChangeActive: StateFlow<Boolean> =
		connectionRepository.carrierNetworkChangeActive

		// True if there exists _any_ icon override for this carrierId. Note that overrides can include
		// any or none of the icon groups defined in MobileMappings, so we still need to check on a
		// per-network-type basis whether or not the given icon group is overridden
		private val carrierIdIconOverrideExists =
		connectionRepository.carrierId
		.map { carrierIdOverrides.carrierIdEntryExists(it) }
		.distinctUntilChanged()
		.stateIn(scope, SharingStarted.WhileSubscribed(), false)

		override val networkName =
		combine(connectionRepository.operatorAlphaShort, connectionRepository.networkName) {
		operatorAlphaShort,
		networkName ->
		if (networkName is NetworkNameModel.Default && operatorAlphaShort != null) {
		NetworkNameModel.IntentDerived(operatorAlphaShort)
		} else {
		networkName
		}
		}
		.stateIn(
		scope,
		SharingStarted.WhileSubscribed(),
		connectionRepository.networkName.value,
		)

		override val carrierName =
		combine(connectionRepository.operatorAlphaShort, connectionRepository.carrierName) {
		operatorAlphaShort,
		networkName ->
		if (networkName is NetworkNameModel.Default && operatorAlphaShort != null) {
		operatorAlphaShort
		} else {
		networkName.name
		}
		}
		.stateIn(
		scope,
		SharingStarted.WhileSubscribed(),
		connectionRepository.carrierName.value.name,
		)

		/** What the mobile icon would be before carrierId overrides */
		private val defaultNetworkType: StateFlow<MobileIconGroup> =
		combine(
		connectionRepository.resolvedNetworkType,
		defaultMobileIconMapping,
		defaultMobileIconGroup,
		) { resolvedNetworkType, mapping, defaultGroup ->
		when (resolvedNetworkType) {
		is ResolvedNetworkType.CarrierMergedNetworkType ->
		resolvedNetworkType.iconGroupOverride
		else -> {
		mapping[resolvedNetworkType.lookupKey] ?: defaultGroup
		}
		}
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), defaultMobileIconGroup.value)

		override val networkTypeIconGroup =
		combine(defaultNetworkType, carrierIdIconOverrideExists) { networkType, overrideExists ->
		// DefaultIcon comes out of the icongroup lookup, we check for overrides here
		if (overrideExists) {
		val iconOverride =
		carrierIdOverrides.getOverrideFor(
		connectionRepository.carrierId.value,
		networkType.name,
		context.resources,
		)
		if (iconOverride > 0) {
		OverriddenIcon(networkType, iconOverride)
		} else {
		DefaultIcon(networkType)
		}
		} else {
		DefaultIcon(networkType)
		}
		}
		.distinctUntilChanged()
		.logDiffsForTable(
		tableLogBuffer = tableLogBuffer,
		initialValue = DefaultIcon(defaultMobileIconGroup.value),
		)
		.stateIn(
		scope,
		SharingStarted.WhileSubscribed(),
		DefaultIcon(defaultMobileIconGroup.value),
		)

		override val showSliceAttribution: StateFlow<Boolean> =
		combine(
		connectionRepository.allowNetworkSliceIndicator,
		connectionRepository.hasPrioritizedNetworkCapabilities,
		) { allowed, hasPrioritizedNetworkCapabilities ->
		allowed && hasPrioritizedNetworkCapabilities
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), false)

		override val isNonTerrestrial: StateFlow<Boolean> = connectionRepository.isNonTerrestrial

		override val isRoaming: StateFlow<Boolean> =
		combine(
		connectionRepository.carrierNetworkChangeActive,
		connectionRepository.isGsm,
		connectionRepository.isRoaming,
		connectionRepository.cdmaRoaming,
		) { carrierNetworkChangeActive, isGsm, isRoaming, cdmaRoaming ->
		if (carrierNetworkChangeActive) {
		false
		} else if (isGsm) {
		isRoaming
		} else {
		cdmaRoaming
		}
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), false)

		private val level: StateFlow<Int> =
		combine(
		connectionRepository.isGsm,
		connectionRepository.primaryLevel,
		connectionRepository.cdmaLevel,
		alwaysUseCdmaLevel,
		) { isGsm, primaryLevel, cdmaLevel, alwaysUseCdmaLevel ->
		when {
		// GSM connections should never use the CDMA level
		isGsm -> primaryLevel
		alwaysUseCdmaLevel -> cdmaLevel
		else -> primaryLevel
		}
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), 0)

		private val numberOfLevels: StateFlow<Int> = connectionRepository.numberOfLevels

		override val isDataConnected: StateFlow<Boolean> =
		connectionRepository.dataConnectionState
		.map { it == Connected }
		.stateIn(scope, SharingStarted.WhileSubscribed(), false)

		override val isInService = connectionRepository.isInService

		override val isEmergencyOnly: StateFlow<Boolean> = connectionRepository.isEmergencyOnly

		override val isAllowedDuringAirplaneMode = connectionRepository.isAllowedDuringAirplaneMode

		/** Whether or not to show the error state of [SignalDrawable] */
		private val showExclamationMark: StateFlow<Boolean> =
		combine(defaultSubscriptionHasDataEnabled, isDefaultConnectionFailed, isInService) {
		isDefaultDataEnabled,
		isDefaultConnectionFailed,
		isInService ->
		!isDefaultDataEnabled \|\| isDefaultConnectionFailed \|\| !isInService
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), true)

		private val cellularShownLevel: StateFlow<Int> =
		combine(level, isInService, connectionRepository.inflateSignalStrength) {
		level,
		isInService,
		inflate ->
		if (isInService) {
		if (inflate) level + 1 else level
		} else 0
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), 0)

		// Satellite level is unaffected by the inflateSignalStrength property
		// See b/346904529 for details
		private val satelliteShownLevel: StateFlow<Int> =
		if (Flags.carrierRoamingNbIotNtn()) {
		connectionRepository.satelliteLevel
		} else {
		combine(level, isInService) { level, isInService -> if (isInService) level else 0 }
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), 0)

		private val cellularIcon: Flow<SignalIconModel.Cellular> =
		combine(
		cellularShownLevel,
		numberOfLevels,
		showExclamationMark,
		carrierNetworkChangeActive,
		) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->
		SignalIconModel.Cellular(
		cellularShownLevel,
		numberOfLevels,
		showExclamationMark,
		carrierNetworkChange,
		)
		}

		private val satelliteIcon: Flow<SignalIconModel.Satellite> =
		satelliteShownLevel.map {
		SignalIconModel.Satellite(
		level = it,
		icon =
		SatelliteIconModel.fromSignalStrength(it)
		?: SatelliteIconModel.fromSignalStrength(0)!!,
		)
		}

		override val signalLevelIcon: StateFlow<SignalIconModel> = run {
		val initial =
		SignalIconModel.Cellular(
		cellularShownLevel.value,
		numberOfLevels.value,
		showExclamationMark.value,
		carrierNetworkChangeActive.value,
		)
		isNonTerrestrial
		.flatMapLatest { ntn ->
		if (ntn) {
		satelliteIcon
		} else {
		cellularIcon
		}
		}
		.distinctUntilChanged()
		.logDiffsForTable(tableLogBuffer, columnPrefix = "icon", initialValue = initial)
		.stateIn(scope, SharingStarted.WhileSubscribed(), initial)
		}
		}

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

0 → 100644

+452 −0

File added.

Preview size limit exceeded, changes collapsed.