commit 06e9cb261994f9b4b511ca5c7b9a0a149176016d
author Catherine Liang <cathliang@google.com> Tue Aug 27 17:15:34 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 17:15:34 2024 +0000
tree 9d91dc703437c17aa9af4d04b61cb417bfa45846
parent 119da97a96982cf98ac89cf1b4e497d11954d3b5
parent 1e0307f1c89a0cec62ef4ee8a9887d4f5bbb8643

Merge "Animate tab color change when system color is changed (2/2)" into main

src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt

diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt
index a3f7c51..669c273 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt
@@ -23,7 +23,6 @@
 import android.view.View
 import android.widget.FrameLayout
 import androidx.annotation.ColorInt
-import androidx.core.text.util.LocalePreferences
 import androidx.lifecycle.LifecycleOwner
 import com.android.internal.policy.SystemBarUtils
 import com.android.systemui.plugins.clocks.ClockController
@@ -201,21 +200,7 @@
                 .toFloat()
         )
         controller.smallClock.events.onTargetRegionChanged(getSmallClockRegion())
-
-        // Use placeholder for weather clock preview in picker.
-        // Use locale default temp unit since assistant default is not available in this context.
-        val useCelsius =
-            LocalePreferences.getTemperatureUnit() == LocalePreferences.TemperatureUnit.CELSIUS
-        controller.events.onWeatherDataChanged(
-            WeatherData(
-                description = DESCRIPTION_PLACEHODLER,
-                state = WEATHERICON_PLACEHOLDER,
-                temperature =
-                    if (useCelsius) TEMPERATURE_CELSIUS_PLACEHOLDER
-                    else TEMPERATURE_FAHRENHEIT_PLACEHOLDER,
-                useCelsius = useCelsius,
-            )
-        )
+        controller.events.onWeatherDataChanged(WeatherData.getPlaceholderWeatherData())
         return controller
     }
 
@@ -252,13 +237,7 @@
     }
 
     companion object {
-        const val DESCRIPTION_PLACEHODLER = ""
-        const val TEMPERATURE_FAHRENHEIT_PLACEHOLDER = 58
-        const val TEMPERATURE_CELSIUS_PLACEHOLDER = 21
-        val WEATHERICON_PLACEHOLDER = WeatherData.WeatherStateIcon.MOSTLY_SUNNY
-
         private fun getStatusBarHeight(context: Context): Int {
-
             val display = context.displayNoVerify
             if (display != null) {
                 return SystemBarUtils.getStatusBarHeight(context.resources, display.cutout)

src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt

diff --git a/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt b/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
index dedbfe5..9868073 100644
--- a/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
+++ b/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
@@ -34,7 +34,6 @@
         val itemIndex = parent.getChildAdapterPosition(view)
         val columnIndex = itemIndex / 2
         val isRtl = parent.layoutManager?.layoutDirection == View.LAYOUT_DIRECTION_RTL
-        val density = parent.context.resources.displayMetrics.density
 
         val itemCount = parent.adapter?.itemCount ?: 0
         val columnCount = (itemCount + 1) / 2