Make Injector implementations more readable
Fixes: 333813332
Bug: 335706962
Flag: NA
Test: picker launches without error
Change-Id: Ibd483be43c2d3676e86a1a0fda0bd36495deaca4
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 0bf6270..da25950 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -126,9 +126,10 @@
private var gridScreenViewModelFactory: GridScreenViewModel.Factory? = null
private var clockRegistryProvider: ClockRegistryProvider? = null
- @Inject lateinit var themesUserEventLogger: Lazy<ThemesUserEventLogger>
+ // Injected objects, sorted by type
@Inject
lateinit var colorContrastSectionViewModelFactory: Lazy<ColorContrastSectionViewModel.Factory>
+ @Inject lateinit var themesUserEventLogger: Lazy<ThemesUserEventLogger>
override fun getCustomizationSections(activity: ComponentActivity): CustomizationSections {
val appContext = activity.applicationContext
@@ -469,7 +470,7 @@
return darkModeSnapshotRestorer
?: DarkModeSnapshotRestorer(
context = appContext,
- manager = uiModeManager,
+ manager = uiModeManager.get(),
backgroundDispatcher = bgDispatcher,
)
.also { darkModeSnapshotRestorer = it }
diff --git a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
index bb0957c..c898bc7 100644
--- a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
+++ b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
@@ -204,7 +204,7 @@
context,
lifecycle,
injector.getDarkModeSnapshotRestorer(requireContext()),
- injector.uiModeManager,
+ injector.uiModeManager.get(),
injector.getUserEventLogger(),
)
.createView(requireContext())