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

Commit cf97b6b3 authored by Luis Vidal's avatar Luis Vidal Committed by Steve Kondik
Browse files

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
parent 5fb1cb70

packages/SystemUI/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ 
    <!-- the ability to rename notifications posted by other apps -->

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />



    <!-- Weather -->

    <uses-permission android:name="com.cyanogenmod.lockclock.permission.READ_WEATHER" />



    <!-- manage cmsettings -->

    <uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS" />

    <uses-permission android:name="cyanogenmod.permission.WRITE_SECURE_SETTINGS" />

packages/SystemUI/AndroidManifest_cm.xml

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

    <uses-permission android:name="android.permission.RECORD_AUDIO" />



     <!-- Weather Provider -->

    <uses-permission android:name="cyanogenmod.permission.READ_WEATHER" />



    <application>



        <activity-alias

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
            android:layout_height="wrap_content"

            android:paddingEnd="16dp"

            android:gravity="right"

            android:textColor="#ffffff"

            android:textColor="@color/status_bar_temperature_text_color"

            android:textSize="@dimen/weather_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    <TextView
@@ -192,7 +192,7 @@ 
            android:layout_height="wrap_content"

            android:paddingEnd="16dp"

            android:gravity="right"

            android:textColor="#ffffff"

            android:textColor="@color/status_bar_temperature_location_text_color"

            android:textSize="@dimen/weather_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    </LinearLayout>

packages/SystemUI/res/values/cm_colors.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2016 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>



    <!-- Expanded Status Bar Weather Text Colors -->

    <color name="status_bar_temperature_text_color">#FFFFFFFF</color>

    <color name="status_bar_temperature_location_text_color">#FFFFFFFF</color>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java

+12 −49
Original line number Diff line number Diff line
@@ -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;

    public void onTuningChanged(String key, String newValue) {

        if (key.endsWith(CMSettings.System.STATUS_BAR_SHOW_WEATHER)) {

            mShowWeather = newValue == null || "1".equals(newValue);

            updateVisibilities();

        }

    }