Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6892ca29 authored by George Lin's avatar George Lin Committed by Automerger Merge Worker
Browse files

[TP] Get string array am: f9429e4f am: b39daad3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21750705



Change-Id: I11feb56cb11315d3282d1a879c81ac5b0e9308da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83b43406 b39daad3

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

+7 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.customization.picker.clock.ui.viewmodel 
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 @@ data class ClockColorViewModel( 
        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()