Remove view map from customization option util (1/2)
This can avoid unnecessary potential memory leaks
Test: Manually tested.
Bug: 337941334
Flag: com.android.wallpaper.new_picker_ui_flag
Change-Id: Ic11728f9e64a9721b8107cb082b9f777f8b33401
diff --git a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
index 4905551..e8bac6a 100644
--- a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
+++ b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
@@ -49,8 +49,6 @@
THEMED_ICONS,
}
- private var viewMap: Map<CustomizationOptionUtil.CustomizationOption, View>? = null
-
override fun getOptionEntries(
screen: Screen,
optionContainer: LinearLayout,
@@ -141,9 +139,14 @@
override fun initBottomSheetContent(
bottomSheetContainer: FrameLayout,
layoutInflater: LayoutInflater
- ) {
- defaultCustomizationOptionUtil.initBottomSheetContent(bottomSheetContainer, layoutInflater)
- viewMap = buildMap {
+ ): Map<CustomizationOptionUtil.CustomizationOption, View> {
+ val map =
+ defaultCustomizationOptionUtil.initBottomSheetContent(
+ bottomSheetContainer,
+ layoutInflater
+ )
+ return buildMap {
+ putAll(map)
put(
ThemePickerLockCustomizationOption.CLOCK,
createCustomizationPickerBottomSheetView(
@@ -165,14 +168,6 @@
}
}
- override fun getBottomSheetContent(option: CustomizationOptionUtil.CustomizationOption): View? {
- return defaultCustomizationOptionUtil.getBottomSheetContent(option) ?: viewMap?.get(option)
- }
-
- override fun onDestroy() {
- viewMap = null
- }
-
private fun createCustomizationPickerBottomSheetView(
option: ThemePickerLockCustomizationOption,
bottomSheetContainer: FrameLayout,