Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor SliceDataRepository"

Browse Source
This commit is contained in:
Zekan Qian
2022-11-15 12:56:01 +00:00
committed by Android (Google) Code Review
parent 8decff095c ea644d1dde
commit 0409f0ee11
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSliceBroadcastReceiver.kt
View File

@@ -23,7 +23,7 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
class SpaSliceBroadcastReceiver : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
val sliceRepository = SpaEnvironmentFactory.instance.sliceDataRepository
val sliceRepository by SpaEnvironmentFactory.instance.sliceDataRepository
val sliceUri = intent?.data ?: return
val sliceData = sliceRepository.getActiveSliceData(sliceUri) ?: return
sliceData.doAction()

3
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSliceProvider.kt
View File

@@ -32,7 +32,8 @@ private const val TAG = "SpaSliceProvider"
class SpaSliceProvider : SliceProvider(), Observer<Slice?> {
private fun getOrPutSliceData(sliceUri: Uri): EntrySliceData? {
if (!SpaEnvironmentFactory.isReady()) return null
return SpaEnvironmentFactory.instance.sliceDataRepository.getOrBuildSliceData(sliceUri)
val sliceRepository by SpaEnvironmentFactory.instance.sliceDataRepository
return sliceRepository.getOrBuildSliceData(sliceUri)
}
override fun onBindSlice(sliceUri: Uri): Slice? {

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
View File

@@ -65,7 +65,7 @@ abstract class SpaEnvironment(context: Context) {
val entryRepository = lazy { SettingsEntryRepository(pageProviderRepository.value) }
val sliceDataRepository = SettingsSliceDataRepository()
val sliceDataRepository = lazy { SettingsSliceDataRepository(entryRepository.value) }
// In Robolectric test, applicationContext is not available. Use context as fallback.
val appContext: Context = context.applicationContext ?: context

7
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SettingsSliceDataRepository.kt
View File

@@ -19,11 +19,11 @@ package com.android.settingslib.spa.slice
import android.net.Uri
import android.util.Log
import com.android.settingslib.spa.framework.common.EntrySliceData
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
import com.android.settingslib.spa.framework.common.SettingsEntryRepository
private const val TAG = "SliceDataRepository"
class SettingsSliceDataRepository {
class SettingsSliceDataRepository(private val entryRepository: SettingsEntryRepository) {
// The map of slice uri to its EntrySliceData, a.k.a. LiveData<Slice?>
private val sliceDataMap: MutableMap<String, EntrySliceData> = mutableMapOf()
@@ -46,13 +46,10 @@ class SettingsSliceDataRepository {
private fun buildLiveDataImpl(sliceUri: Uri): EntrySliceData? {
Log.d(TAG, "buildLiveData: $sliceUri")
if (!SpaEnvironmentFactory.isReady()) return null
val entryRepository by SpaEnvironmentFactory.instance.entryRepository
val entryId = sliceUri.getEntryId() ?: return null
val entry = entryRepository.getEntry(entryId) ?: return null
if (!entry.hasSliceSupport) return null
val arguments = sliceUri.getRuntimeArguments()
return entry.getSliceData(runtimeArguments = arguments, sliceUri = sliceUri)
}