From 377fffca6989304ec61e33dacb0dd3fba8345262 Mon Sep 17 00:00:00 2001 From: Luis Vidal Date: Tue, 12 Apr 2016 23:59:32 -0700 Subject: [PATCH] Use temperature unit from CMSettings on weather update requests Make sure the the weather update requests are using the temperature unit set by the user in the weather settings Change-Id: Iac3a891b5afbcf36a87386f828b40bcbd0e1de02 TICKET: CYNGNOS-2429 --- .../java/cyanogenmod/weather/CMWeatherManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java b/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java index 2613ea5..545c3ce 100644 --- a/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java +++ b/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java @@ -26,6 +26,8 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.ArraySet; import cyanogenmod.app.CMContextConstants; +import cyanogenmod.providers.CMSettings; +import cyanogenmod.providers.WeatherContract; import java.util.ArrayList; import java.util.Collections; @@ -142,9 +144,14 @@ public class CMWeatherManager { } try { + int tempUnit = CMSettings.Global.getInt(mContext.getContentResolver(), + CMSettings.Global.WEATHER_TEMPERATURE_UNIT, + WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT); + RequestInfo info = new RequestInfo .Builder(mRequestInfoListener) .setLocation(location) + .setTemperatureUnit(tempUnit) .build(); if (listener != null) mWeatherUpdateRequestListeners.put(info, listener); sWeatherManagerService.updateWeather(info); @@ -175,9 +182,14 @@ public class CMWeatherManager { } try { + int tempUnit = CMSettings.Global.getInt(mContext.getContentResolver(), + CMSettings.Global.WEATHER_TEMPERATURE_UNIT, + WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT); + RequestInfo info = new RequestInfo .Builder(mRequestInfoListener) .setWeatherLocation(weatherLocation) + .setTemperatureUnit(tempUnit) .build(); if (listener != null) mWeatherUpdateRequestListeners.put(info, listener); sWeatherManagerService.updateWeather(info);