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

Merge "Fix flicker of "App data usage"" into 24D1-dev

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-09 05:50:55 +00:00
committed by Android (Google) Code Review
parent a48f19c101 9e5b389de3
commit eb729f283c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
View File

@@ -33,6 +33,7 @@ import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageLib import com.android.settings.datausage.lib.DataUsageLib
import com.android.settings.datausage.lib.NetworkCycleDataRepository import com.android.settings.datausage.lib.NetworkCycleDataRepository
import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange
import com.android.settingslib.spaprivileged.framework.compose.getPlaceholder
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -63,6 +64,7 @@ class DataUsagePreferenceController(context: Context, key: String) :
} }
override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
preference.summary = mContext.getPlaceholder()
viewLifecycleOwner.lifecycleScope.launch { viewLifecycleOwner.lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
update() update()
@@ -113,7 +115,6 @@ class DataUsagePreferenceController(context: Context, key: String) :
} }
val allTimeUsage = repository.queryUsage(AllTimeRange) val allTimeUsage = repository.queryUsage(AllTimeRange)
if (allTimeUsage.usage > 0) return allTimeUsage.getDataUsedString(mContext) to true return allTimeUsage.getDataUsedString(mContext) to (allTimeUsage.usage > 0)
return null to false
} }
} }

2
tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
View File

@@ -120,7 +120,7 @@ class DataUsagePreferenceControllerTest {
on { loadFirstCycle() } doReturn usageData on { loadFirstCycle() } doReturn usageData
} }
controller.onViewCreated(TestLifecycleOwner()) controller.onViewCreated(TestLifecycleOwner())
waitUntil { preference.summary != null } waitUntil { !preference.summary.isNullOrBlank() }
controller.handlePreferenceTreeClick(preference) controller.handlePreferenceTreeClick(preference)