cLock: Make the showing of weather when minimized a user option

Also includes some code cleanup

Change-Id: Iad2c4dba4f6e1d77fae28d3f52fa1ef878815614

1 files changed, 22 insertions, 8 deletions

diff --git a/res/xml/preferences_weather.xml b/res/xml/preferences_weather.xml
index 7cfb516..8544cfc 100644
--- a/res/xml/preferences_weather.xml
+++ b/res/xml/preferences_weather.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2009 The CyanogenMod Project (DvTonder)
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@
         <CheckBoxPreference
             android:key="show_weather"
             android:title="@string/weather_enable"
-            android:summary="@string/weather_source" />
+            android:summary="@string/weather_source"
+            android:defaultValue="true" />
 
         <ListPreference
             android:key="weather_refresh_interval"
@@ -38,7 +39,8 @@
         <CheckBoxPreference
             android:key="weather_use_custom_location"
             android:dependency="show_weather"
-            android:title="@string/weather_use_custom_location" />
+            android:title="@string/weather_use_custom_location"
+            android:defaultValue="false" />
 
         <EditTextPreference
             android:key="weather_custom_location_string"
@@ -52,29 +54,41 @@
         android:title="@string/display_category" >
 
         <CheckBoxPreference
+            android:key="weather_show_when_minimized"
+            android:dependency="show_weather"
+            android:title="@string/weather_show_when_minimized_title"
+            android:summary="@string/weather_show_when_minimized_summary"
+            android:defaultValue="true" />
+
+        <CheckBoxPreference
             android:key="weather_use_alternate_icons"
             android:dependency="show_weather"
             android:title="@string/weather_alternate_icons_title"
-            android:summary="@string/weather_alternate_icons_summary" />
+            android:summary="@string/weather_alternate_icons_summary"
+            android:defaultValue="false" />
 
         <CheckBoxPreference
             android:key="weather_use_metric"
             android:dependency="show_weather"
-            android:title="@string/weather_use_metric" />
+            android:title="@string/weather_use_metric"
+            android:defaultValue="true" />
 
         <CheckBoxPreference
             android:key="weather_show_location"
             android:dependency="show_weather"
-            android:title="@string/weather_show_location_title" />
+            android:title="@string/weather_show_location_title"
+            android:defaultValue="true" />
 
         <CheckBoxPreference
             android:key="weather_show_timestamp"
             android:dependency="show_weather"
-            android:title="@string/weather_show_timestamp_title" />
+            android:title="@string/weather_show_timestamp_title"
+            android:defaultValue="true" />
 
         <CheckBoxPreference
             android:key="weather_invert_lowhigh"
             android:dependency="show_weather"
-            android:title="@string/weather_invert_lowhigh" />
+            android:title="@string/weather_invert_lowhigh"
+            android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file