From cf97b6b32a6edafd6c88f4b1ef8c443118eb5e5e Mon Sep 17 00:00:00 2001 From: Luis Vidal Date: Wed, 23 Mar 2016 20:03:18 -0700 Subject: [PATCH] Add Weather Content Provider [5/5] Use the Weather Content Provider in the cmsdk to pull the weather data. However, SystemUI will rely on LockClock to force weather updates via the new Weather Service, which in turn will send a broadcast when new weather data is available. Change-Id: I3c65ea5f4cc297a7944fcdef33f496cdf2d68d0a SystemUI: Expose weather text colors Weather text colors in the expanded status bar are hardcoded to white. Expose these via cm_colors so that themes can color them however they'd like. A martini. Shaken, not stirred. Change-Id: I5e5a738c8b97f556562114a66d102fcb924a0493 SystemUI: Update cached weather data when temperature unit changes Register an observer to keep track of the temperature unit selected in settings to update the cached data accordingly TICKET: CYNGNOS-2694 Change-Id: I92adec20835bcd6d6476d793564300611bcba4a1 --- packages/SystemUI/AndroidManifest.xml | 3 - packages/SystemUI/AndroidManifest_cm.xml | 3 + .../res/layout/status_bar_expanded_header.xml | 4 +- packages/SystemUI/res/values/cm_colors.xml | 23 ++++ .../statusbar/phone/StatusBarHeaderView.java | 61 +++-------- .../statusbar/policy/WeatherController.java | 3 +- .../statusbar/policy/WeatherControllerImpl.java | 118 +++++++++++++++------ 7 files changed, 130 insertions(+), 85 deletions(-) create mode 100644 packages/SystemUI/res/values/cm_colors.xml diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 83789beccc24..a3405d3d6611 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -165,9 +165,6 @@ - - - diff --git a/packages/SystemUI/AndroidManifest_cm.xml b/packages/SystemUI/AndroidManifest_cm.xml index aa4cdcde4d74..acf8c63a9c41 100644 --- a/packages/SystemUI/AndroidManifest_cm.xml +++ b/packages/SystemUI/AndroidManifest_cm.xml @@ -26,6 +26,9 @@ + + + diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml new file mode 100644 index 000000000000..c06a1115acdf --- /dev/null +++ b/packages/SystemUI/res/values/cm_colors.xml @@ -0,0 +1,23 @@ + + + + + + #FFFFFFFF + #FFFFFFFF + + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java index 8ae8bc7f3bdb..5ca365569f4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -16,34 +16,22 @@ package com.android.systemui.statusbar.phone; -import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; -import android.app.IUserSwitchObserver; import android.app.PendingIntent; import android.content.ContentUris; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; -import android.database.ContentObserver; import android.graphics.Outline; import android.graphics.Rect; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.net.Uri; -import android.os.Handler; -import android.os.IRemoteCallback; -import android.os.RemoteException; -import android.os.UserHandle; import android.provider.AlarmClock; import android.provider.CalendarContract; -import android.provider.Settings; -import android.net.Uri; import android.util.AttributeSet; -import android.util.Log; import android.util.MathUtils; import android.util.TypedValue; import android.view.View; @@ -55,11 +43,11 @@ import android.widget.RelativeLayout; import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; + import com.android.keyguard.KeyguardStatusView; import com.android.systemui.BatteryMeterView; import com.android.systemui.FontSizeUtils; import com.android.systemui.R; -import com.android.systemui.cm.UserContentObserver; import com.android.systemui.qs.QSPanel; import com.android.systemui.qs.QSPanel.Callback; import com.android.systemui.qs.QSTile; @@ -75,13 +63,14 @@ import com.android.systemui.tuner.TunerService; import java.text.NumberFormat; import cyanogenmod.providers.CMSettings; +import cyanogenmod.weather.util.WeatherUtils; /** * The view to manage the header area in the expanded status bar. */ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnClickListener, BatteryController.BatteryStateChangeCallback, NextAlarmController.NextAlarmChangeCallback, - EmergencyListener, WeatherController.Callback { + EmergencyListener, WeatherController.Callback, TunerService.Tunable { private boolean mExpanded; private boolean mListening; @@ -152,7 +141,6 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC private float mCurrentT; private boolean mShowingDetail; private boolean mDetailTransitioning; - private SettingsObserver mSettingsObserver; private boolean mShowWeather; private boolean mAllowExpand = true; @@ -195,7 +183,6 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC mWeatherContainer.setOnClickListener(this); mWeatherLine1 = (TextView) findViewById(R.id.weather_line_1); mWeatherLine2 = (TextView) findViewById(R.id.weather_line_2); - mSettingsObserver = new SettingsObserver(new Handler()); loadDimens(); updateVisibilities(); updateClockScale(); @@ -419,7 +406,8 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC private void updateListeners() { if (mListening) { - mSettingsObserver.observe(); + TunerService.get(getContext()).addTunable(this, + "cmsystem:" + CMSettings.System.STATUS_BAR_SHOW_WEATHER); mBatteryController.addStateChangedCallback(this); mNextAlarmController.addStateChangedCallback(this); mWeatherController.addCallback(this); @@ -427,7 +415,7 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC mBatteryController.removeStateChangedCallback(this); mNextAlarmController.removeStateChangedCallback(this); mWeatherController.removeCallback(this); - mSettingsObserver.unobserve(); + TunerService.get(getContext()).removeTunable(this); } } @@ -479,12 +467,12 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC @Override public void onWeatherChanged(WeatherController.WeatherInfo info) { - if (info.temp == null || info.condition == null) { + if (Double.isNaN(info.temp) || info.condition == null) { mWeatherLine1.setText(null); } else { mWeatherLine1.setText(mContext.getString( R.string.status_bar_expanded_header_weather_format, - info.temp, + WeatherUtils.formatTemperature(info.temp, info.tempUnit), info.condition)); } mWeatherLine2.setText(info.city); @@ -930,35 +918,10 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC } }; - class SettingsObserver extends UserContentObserver { - SettingsObserver(Handler handler) { - super(handler); - } - - @Override - protected void observe() { - super.observe(); - - ContentResolver resolver = mContext.getContentResolver(); - resolver.registerContentObserver(CMSettings.System.getUriFor( - CMSettings.System.STATUS_BAR_SHOW_WEATHER), false, this, UserHandle.USER_ALL); - update(); - } - - @Override - protected void unobserve() { - super.unobserve(); - - ContentResolver resolver = mContext.getContentResolver(); - resolver.unregisterContentObserver(this); - } - - @Override - public void update() { - - ContentResolver resolver = mContext.getContentResolver(); - mShowWeather = CMSettings.System.getInt( - resolver, CMSettings.System.STATUS_BAR_SHOW_WEATHER, 1) == 1; + @Override + public void onTuningChanged(String key, String newValue) { + if (key.endsWith(CMSettings.System.STATUS_BAR_SHOW_WEATHER)) { + mShowWeather = newValue == null || "1".equals(newValue); updateVisibilities(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java index 1fa49568fd55..0f71bccaa822 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java @@ -25,8 +25,9 @@ public interface WeatherController { void onWeatherChanged(WeatherInfo temp); } public static class WeatherInfo { - public String temp = null; + public double temp = Double.NaN; public String city = null; public String condition = null; + public int tempUnit; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java index 288bc7efd8a4..1a798f07d142 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java @@ -16,43 +16,49 @@ package com.android.systemui.statusbar.policy; -import android.content.BroadcastReceiver; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.database.ContentObserver; import android.database.Cursor; import android.net.Uri; import android.os.Handler; -import android.provider.Settings; import android.util.Log; +import cyanogenmod.providers.CMSettings; +import cyanogenmod.providers.WeatherContract; +import cyanogenmod.weather.CMWeatherManager; +import cyanogenmod.weather.util.WeatherUtils; import java.util.ArrayList; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_CITY; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_CONDITION; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_TEMPERATURE; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_TEMPERATURE_UNIT; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.CELSIUS; +import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT; + public class WeatherControllerImpl implements WeatherController { private static final String TAG = WeatherController.class.getSimpleName(); private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + private WeatherContentObserver mWeatherContentObserver; + private Handler mHandler; + private int mWeatherUnit; + private Uri mWeatherTempetarureUri; public static final ComponentName COMPONENT_WEATHER_FORECAST = new ComponentName( "com.cyanogenmod.lockclock", "com.cyanogenmod.lockclock.weather.ForecastActivity"); - public static final String ACTION_UPDATE_FINISHED - = "com.cyanogenmod.lockclock.action.WEATHER_UPDATE_FINISHED"; - public static final String EXTRA_UPDATE_CANCELLED = "update_cancelled"; public static final String ACTION_FORCE_WEATHER_UPDATE = "com.cyanogenmod.lockclock.action.FORCE_WEATHER_UPDATE"; - public static final Uri CURRENT_WEATHER_URI - = Uri.parse("content://com.cyanogenmod.lockclock.weather.provider/weather/current"); - public static final String[] WEATHER_PROJECTION = new String[]{ - "temperature", - "city", - "condition" + private static final String[] WEATHER_PROJECTION = new String[]{ + CURRENT_TEMPERATURE, + CURRENT_TEMPERATURE_UNIT, + CURRENT_CITY, + CURRENT_CONDITION }; private final ArrayList mCallbacks = new ArrayList(); - private final Receiver mReceiver = new Receiver(); private final Context mContext; private WeatherInfo mCachedInfo = new WeatherInfo(); @@ -60,10 +66,16 @@ public class WeatherControllerImpl implements WeatherController { public WeatherControllerImpl(Context context) { mContext = context; mContext.getSystemService(Context.CONNECTIVITY_SERVICE); + mHandler = new Handler(); + mWeatherContentObserver = new WeatherContentObserver(mHandler); + mWeatherTempetarureUri + = CMSettings.Global.getUriFor(CMSettings.Global.WEATHER_TEMPERATURE_UNIT); + mContext.getContentResolver().registerContentObserver( + WeatherContract.WeatherColumns.CURRENT_WEATHER_URI,true, mWeatherContentObserver); + mContext.getContentResolver().registerContentObserver(mWeatherTempetarureUri, true, + mWeatherContentObserver); + queryWeatherTempUnit(); queryWeather(); - final IntentFilter filter = new IntentFilter(); - filter.addAction(ACTION_UPDATE_FINISHED); - mContext.registerReceiver(mReceiver, filter); } public void addCallback(Callback callback) { @@ -85,17 +97,29 @@ public class WeatherControllerImpl implements WeatherController { } private void queryWeather() { - Cursor c = mContext.getContentResolver().query(CURRENT_WEATHER_URI, WEATHER_PROJECTION, + Cursor c = mContext.getContentResolver().query( + WeatherContract.WeatherColumns.CURRENT_WEATHER_URI, WEATHER_PROJECTION, null, null, null); if (c == null) { if(DEBUG) Log.e(TAG, "cursor was null for temperature, forcing weather update"); + //LockClock keeps track of the user settings (temp unit, search by geo location/city) + //so we delegate the responsibility of handling a weather update to LockClock mContext.sendBroadcast(new Intent(ACTION_FORCE_WEATHER_UPDATE)); } else { try { c.moveToFirst(); - mCachedInfo.temp = c.getString(0); - mCachedInfo.city = c.getString(1); - mCachedInfo.condition = c.getString(2); + double temp = c.getDouble(0); + int reportedUnit = c.getInt(1); + if (reportedUnit == CELSIUS && mWeatherUnit == FAHRENHEIT) { + temp = WeatherUtils.celsiusToFahrenheit(temp); + } else if (reportedUnit == FAHRENHEIT && mWeatherUnit == CELSIUS) { + temp = WeatherUtils.fahrenheitToCelsius(temp); + } + + mCachedInfo.temp = temp; + mCachedInfo.tempUnit = mWeatherUnit; + mCachedInfo.city = c.getString(2); + mCachedInfo.condition = c.getString(3); } finally { c.close(); } @@ -108,19 +132,53 @@ public class WeatherControllerImpl implements WeatherController { } } - private final class Receiver extends BroadcastReceiver { + private class WeatherContentObserver extends ContentObserver { + + public WeatherContentObserver(Handler handler) { + super(handler); + } + @Override - public void onReceive(Context context, Intent intent) { - if (DEBUG) Log.d(TAG, "onReceive " + intent.getAction()); - if (intent.hasExtra(EXTRA_UPDATE_CANCELLED)) { - if (intent.getBooleanExtra(EXTRA_UPDATE_CANCELLED, false)) { - // no update - return; + public void onChange(boolean selfChange, Uri uri) { + if (uri != null) { + if (uri.compareTo(WeatherContract.WeatherColumns.CURRENT_WEATHER_URI) == 0) { + queryWeather(); + fireCallback(); + } else if (uri.compareTo(mWeatherTempetarureUri) == 0) { + queryWeatherTempUnit(); + fixCachedWeatherInfo(); + fireCallback(); + } else { + super.onChange(selfChange, uri); } } - queryWeather(); - fireCallback(); + } + + @Override + public void onChange(boolean selfChange) { + onChange(selfChange, null); } } + private void queryWeatherTempUnit() { + try { + mWeatherUnit = CMSettings.Global.getInt(mContext.getContentResolver(), + CMSettings.Global.WEATHER_TEMPERATURE_UNIT); + } catch (CMSettings.CMSettingNotFoundException e) { + //CMSettingsProvider should have taken care of setting a default value for this setting + //so how is that we ended up here?? We need to set a valid temp unit anyway to keep + //this going + mWeatherUnit = WeatherContract.WeatherColumns.TempUnit.CELSIUS; + } + } + + private void fixCachedWeatherInfo() { + if (mCachedInfo.tempUnit == CELSIUS && mWeatherUnit == FAHRENHEIT) { + mCachedInfo.temp = WeatherUtils.celsiusToFahrenheit(mCachedInfo.temp); + mCachedInfo.tempUnit = FAHRENHEIT; + } else if (mCachedInfo.tempUnit == FAHRENHEIT && mWeatherUnit == CELSIUS) { + mCachedInfo.temp = WeatherUtils.fahrenheitToCelsius(mCachedInfo.temp); + mCachedInfo.tempUnit = CELSIUS; + } + } } -- 2.11.0