commit f9429e4fde890f822ccdf0efb0515cd040cbc07d
author George Lin <giolin@google.com> Fri Mar 03 18:23:44 2023 +0000
committer George Lin <giolin@google.com> Sun Mar 05 03:05:28 2023 +0000
tree fec82e53556a6678c7918775f2fa67fc63e86282
parent d0673258fe13cdc62cedc078c7bda0a832353d6f

[TP] Get string array

Get string array from the resource

Test: manually tested it's working
Bug: 270097085
Change-Id: Ibb6a5ec16b59d41ae68a1c83d08f37ce26c8c64c

src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt

diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
index 65ebc79..ea60ae3 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
@@ -19,7 +19,6 @@
 import android.annotation.ColorInt
 import android.content.res.Resources
 import android.graphics.Color
-import androidx.core.content.res.getStringOrThrow
 import com.android.wallpaper.R
 
 /** The view model that defines custom clock colors. */
@@ -40,27 +39,26 @@
         const val DEFAULT_COLOR_TONE_MAX = 100
 
         fun getPresetColorMap(resources: Resources): Map<String, ClockColorViewModel> {
-            val ids = resources.obtainTypedArray(R.array.clock_color_ids)
+            val ids = resources.getStringArray(R.array.clock_color_ids)
             val names = resources.obtainTypedArray(R.array.clock_color_names)
             val colors = resources.obtainTypedArray(R.array.clock_colors)
             val colorToneMinList = resources.obtainTypedArray(R.array.clock_color_tone_min)
             val colorToneMaxList = resources.obtainTypedArray(R.array.clock_color_tone_max)
             return buildList {
-                    for (i in 0 until ids.length()) {
+                    ids.indices.forEach { index ->
                         add(
                             ClockColorViewModel(
-                                ids.getStringOrThrow(i),
-                                names.getString(i),
-                                colors.getColor(i, Color.TRANSPARENT),
-                                colorToneMinList.getInt(i, DEFAULT_COLOR_TONE_MIN).toDouble(),
-                                colorToneMaxList.getInt(i, DEFAULT_COLOR_TONE_MAX).toDouble(),
+                                ids[index],
+                                names.getString(index),
+                                colors.getColor(index, Color.TRANSPARENT),
+                                colorToneMinList.getInt(index, DEFAULT_COLOR_TONE_MIN).toDouble(),
+                                colorToneMaxList.getInt(index, DEFAULT_COLOR_TONE_MAX).toDouble(),
                             )
                         )
                     }
                 }
                 .associateBy { it.colorId }
                 .also {
-                    ids.recycle()
                     names.recycle()
                     colors.recycle()
                     colorToneMinList.recycle()