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

Fix AppDataUsageCycleController.setInitialCycles

Browse Source 
This is actually called after displayPreference(), so should update
cycleAdapter in setInitialCycles() instead of displayPreference().

Also update test.

Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I00287c21e307199b26c336f15b9a623737a5d130
This commit is contained in:
Chaohui Wang
2023-11-05 21:10:45 +08:00
parent 6584f32b6a
commit fead9257b3
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/datausage/AppDataUsageCycleController.kt
View File

@@ -25,7 +25,6 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.preference.PreferenceScreen
import com.android.settings.core.BasePreferenceController
import com.android.settings.datausage.lib.AppDataUsageDetailsRepository
import com.android.settings.datausage.lib.IAppDataUsageDetailsRepository
import com.android.settings.datausage.lib.NetworkUsageDetailsData
import kotlinx.coroutines.Dispatchers
@@ -40,11 +39,18 @@ class AppDataUsageCycleController(context: Context, preferenceKey: String) :
private lateinit var preference: SpinnerPreference
private var cycleAdapter: CycleAdapter? = null
private var initialCycles: List<Long> = emptyList()
private var initialSelectedEndTime: Long = -1
private var usageDetailsDataList: List<NetworkUsageDetailsData> = emptyList()
override fun getAvailabilityStatus() = AVAILABLE
override fun displayPreference(screen: PreferenceScreen) {
super.displayPreference(screen)
preference = screen.findPreference(preferenceKey)!!
if (cycleAdapter == null) {
cycleAdapter = CycleAdapter(mContext, preference)
}
}
fun init(
repository: IAppDataUsageDetailsRepository,
onUsageDataUpdated: (NetworkUsageDetailsData) -> Unit,
@@ -60,22 +66,9 @@ class AppDataUsageCycleController(context: Context, preferenceKey: String) :
* before loading to reduce flicker.
*/
fun setInitialCycles(initialCycles: List<Long>, initialSelectedEndTime: Long) {
this.initialCycles = initialCycles
this.initialSelectedEndTime = initialSelectedEndTime
}
override fun getAvailabilityStatus() = AVAILABLE
override fun displayPreference(screen: PreferenceScreen) {
super.displayPreference(screen)
preference = screen.findPreference(preferenceKey)!!
if (cycleAdapter == null) {
cycleAdapter = CycleAdapter(mContext, preference).apply {
if (initialCycles.isNotEmpty()) {
setInitialCycleList(initialCycles, initialSelectedEndTime)
preference.setHasCycles(true)
}
}
if (initialCycles.isNotEmpty()) {
cycleAdapter?.setInitialCycleList(initialCycles, initialSelectedEndTime)
preference.setHasCycles(true)
}
}