Merge "Revert "Polish weather clock Move adding weather placeholder to ..."" into udc-dev
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
index 2620f9b..67c7002 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -21,7 +21,6 @@
import androidx.annotation.ColorInt
import androidx.lifecycle.LifecycleOwner
import com.android.systemui.plugins.ClockController
-import com.android.systemui.plugins.WeatherData
import com.android.systemui.shared.clocks.ClockRegistry
import com.android.wallpaper.R
import com.android.wallpaper.util.ScreenSizeCalculator
@@ -95,23 +94,7 @@
activity.resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat() *
getRatio()
)
- // Use placeholder for weather clock preview in picker
- controller.events.onWeatherDataChanged(
- WeatherData(
- description = DESCRIPTION_PLACEHODLER,
- state = WEATHERICON_PLACEHOLDER,
- temperature = TEMPERATURE_PLACEHOLDER,
- useCelsius = USE_CELSIUS_PLACEHODLER,
- )
- )
clockControllers[clockId] = controller
return controller
}
-
- companion object {
- val DESCRIPTION_PLACEHODLER = ""
- val TEMPERATURE_PLACEHOLDER = 58
- val WEATHERICON_PLACEHOLDER = WeatherData.WeatherStateIcon.MOSTLY_SUNNY
- val USE_CELSIUS_PLACEHODLER = false
- }
}