PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InternetPreferenceController V2 (4/n)

Browse Source 
Display different icon for different condition.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ic06b0e349a284f8b4466bd0c19f318a6a0936a6e
This commit is contained in:
Chaohui Wang
2024-06-12 17:48:38 +08:00
parent 585727a34a
commit 0d758dfdb9
3 changed files with 97 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/com/android/settings/network/InternetPreferenceRepository.kt
View File

@@ -21,6 +21,7 @@ import android.net.NetworkCapabilities
import android.net.wifi.WifiManager
import android.provider.Settings
import android.util.Log
import androidx.annotation.DrawableRes
import com.android.settings.R
import com.android.settings.network.telephony.DataSubscriptionRepository
import com.android.settings.wifi.WifiSummaryRepository
@@ -33,6 +34,7 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
@OptIn(ExperimentalCoroutinesApi::class)
@@ -47,42 +49,66 @@ class InternetPreferenceRepository(
context.settingsGlobalBooleanFlow(Settings.Global.AIRPLANE_MODE_ON),
) {
fun summaryFlow(): Flow<String> =
data class DisplayInfo(
val summary: String,
@DrawableRes val iconResId: Int,
)
fun displayInfoFlow(): Flow<DisplayInfo> =
connectivityRepository
.networkCapabilitiesFlow()
.flatMapLatest { capabilities -> capabilities.summaryFlow() }
.onEach { Log.d(TAG, "summaryFlow: $it") }
.flatMapLatest { capabilities -> capabilities.displayInfoFlow() }
.onEach { Log.d(TAG, "displayInfoFlow: $it") }
.conflate()
.flowOn(Dispatchers.Default)
private fun NetworkCapabilities.summaryFlow(): Flow<String> {
private fun NetworkCapabilities.displayInfoFlow(): Flow<DisplayInfo> {
if (
hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
) {
for (transportType in transportTypes) {
when (transportType) {
NetworkCapabilities.TRANSPORT_WIFI -> return wifiSummaryRepository.summaryFlow()
NetworkCapabilities.TRANSPORT_CELLULAR ->
return dataSubscriptionRepository.dataSummaryFlow()
NetworkCapabilities.TRANSPORT_WIFI -> return wifiDisplayInfoFlow()
NetworkCapabilities.TRANSPORT_CELLULAR -> return cellularDisplayInfoFlow()
}
}
}
return defaultSummaryFlow()
return defaultDisplayInfoFlow()
}
private fun defaultSummaryFlow(): Flow<String> =
private fun wifiDisplayInfoFlow() =
wifiSummaryRepository.summaryFlow().map { summary ->
DisplayInfo(
summary = summary,
iconResId = R.drawable.ic_wifi_signal_4,
)
}
private fun cellularDisplayInfoFlow() =
dataSubscriptionRepository.dataSummaryFlow().map { summary ->
DisplayInfo(
summary = summary,
iconResId = R.drawable.ic_network_cell,
)
}
private fun defaultDisplayInfoFlow(): Flow<DisplayInfo> =
combine(
airplaneModeOnFlow,
wifiRepository.wifiStateFlow(),
) { airplaneModeOn: Boolean, wifiState: Int ->
context.getString(
if (airplaneModeOn && wifiState != WifiManager.WIFI_STATE_ENABLED) {
R.string.condition_airplane_title
} else {
R.string.networks_available
}
)
if (airplaneModeOn && wifiState != WifiManager.WIFI_STATE_ENABLED) {
DisplayInfo(
summary = context.getString(R.string.condition_airplane_title),
iconResId = R.drawable.ic_no_internet_unavailable,
)
} else {
DisplayInfo(
summary = context.getString(R.string.networks_available),
iconResId = R.drawable.ic_no_internet_available,
)
}
}
private companion object {