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

Commit 6325e97e authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Use Locale default temperature unit in wallpaper picker" into udc-dev am: 36677453 

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



Change-Id: I54959332d4f6a8354b2d4376afac429cc929ba8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 132e1b2e 36677453

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

+11 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Rect 
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.systemui.plugins.ClockController

import com.android.systemui.plugins.WeatherData
@@ -179,13 +180,18 @@ class ClockViewFactory( 
        )

        controller.smallClock.events.onTargetRegionChanged(getSmallClockRegion())



        // Use placeholder for weather clock preview in picker

        // 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 = TEMPERATURE_PLACEHOLDER,

                useCelsius = USE_CELSIUS_PLACEHODLER,

                temperature =

                    if (useCelsius) TEMPERATURE_CELSIUS_PLACEHOLDER

                    else TEMPERATURE_FAHRENHEIT_PLACEHOLDER,

                useCelsius = useCelsius,

            )

        )

        return controller
@@ -217,7 +223,8 @@ class ClockViewFactory( 


    companion object {

        const val DESCRIPTION_PLACEHODLER = ""

        const val TEMPERATURE_PLACEHOLDER = 58

        const val TEMPERATURE_FAHRENHEIT_PLACEHOLDER = 58

        const val TEMPERATURE_CELSIUS_PLACEHOLDER = 21

        val WEATHERICON_PLACEHOLDER = WeatherData.WeatherStateIcon.MOSTLY_SUNNY

        const val USE_CELSIUS_PLACEHODLER = false