From 215d44020f4a6449260ebbab55feb3462f2416a6 Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Tue, 26 Apr 2016 22:42:21 -0700
Subject: Add option to select temperature unit

Added a menu in the weather settings to select the
temperature unit. This setting will be visible only
if the user has at least one weather service provider
installed.

The weather settings layout was refactored to make room
for this new preference

Change-Id: I5e9f206573e0ff95fcee31a010b52530a907acc6
TICKET: CYNGNOS-2605
---
 res/layout/empty_weather_state.xml               | 16 +++++++++++-----
 res/layout/weather_service_provider_info_row.xml |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/empty_weather_state.xml b/res/layout/empty_weather_state.xml
index 09c3794..7ae635a 100644
--- a/res/layout/empty_weather_state.xml
+++ b/res/layout/empty_weather_state.xml
@@ -32,16 +32,22 @@
                 android:layout_marginBottom="12dip"
                 android:src="@drawable/ic_settings_weather"
                 android:tint="@color/weather_settings_icon_tint"
-                android:contentDescription="@null">
-        </ImageView>
-
+                android:contentDescription="@null" />
         <TextView
                 android:id="@+id/message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18dp"
-                android:textColor="?android:attr/textColorSecondary">
-        </TextView>
+                android:textColor="?android:attr/textColorSecondary" />
 
+        <Button android:id="@+id/add_weather_provider"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                style="?android:attr/buttonBarButtonStyle"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:text="@string/weather_settings_add_weather_provider"
+                android:textAllCaps="true" />
     </LinearLayout>
 </FrameLayout>
diff --git a/res/layout/weather_service_provider_info_row.xml b/res/layout/weather_service_provider_info_row.xml
index 676863e..ddaa820 100644
--- a/res/layout/weather_service_provider_info_row.xml
+++ b/res/layout/weather_service_provider_info_row.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The CyanogenMod Project
 
-- 
cgit v1.1