From 06bacd38efdba9f91e5a0ae758375299e4794277 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 2 Jul 2010 20:12:35 -0700
Subject: [PATCH] updated preference ish

---
 astrid/res/xml/preferences.xml           | 117 +++--------------------
 astrid/res/xml/preferences_reminders.xml |  49 ++++++++++
 2 files changed, 62 insertions(+), 104 deletions(-)
 create mode 100644 astrid/res/xml/preferences_reminders.xml

diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index cad90874b..42b54e085 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -2,120 +2,29 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:title="@string/prefs_category_alerts">
-        <ListPreference
-            android:key="@string/p_notif_quietStart"
-            android:entries="@array/EPr_quiet_hours_start"
-            android:entryValues="@array/EPr_quiet_hours_start_values"
-            android:title="@string/prefs_quietStart_title"
-            android:summary="@string/prefs_quietStart_desc" />
+    <PreferenceScreen
+        android:title="@string/EPr_defaults_header">
         <ListPreference
-            android:key="@string/p_notif_quietEnd"
-            android:entries="@array/EPr_quiet_hours_end"
-            android:entryValues="@array/EPr_quiet_hours_end_values"
-            android:title="@string/prefs_quietEnd_title"
-            android:summary="@string/prefs_quietEnd_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_notif_annoy"
-            android:title="@string/prefs_annoy_title"
-            android:summary="@string/prefs_annoy_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_notif_vibrate"
-            android:title="@string/prefs_vibrate_title"
-            android:summary="@string/prefs_vibrate_desc" />
-        <EditTextPreference
-            android:key="@string/p_notif_defaultRemind"
-            android:title="@string/prefs_defaultRemind_title"
-            android:summary="@string/prefs_defaultRemind_desc" />
-        <RingtonePreference
-            android:key="@string/p_notification_ringtone"
-            android:title="@string/prefs_notification_title"
-            android:summary="@string/prefs_notification_desc"
-            android:ringtoneType="notification"
-    		android:showDefault="true"
-    		android:showSilent="true" />
+            android:key="@string/EPr_default_importance_key"  
+            android:entries="@array/EPr_default_importance"  
+            android:entryValues="@array/EPr_default_importance_values"  
+            android:title="@string/EPr_default_importance_title" />
+    
         <ListPreference
-            android:key="@string/p_notif_icon"
-            android:entries="@array/notif_icon_entries"
-            android:entryValues="@array/notif_icon_values"
-            android:title="@string/prefs_notificon_title"
-            android:summary="@string/prefs_notificon_desc" />
-
-    </PreferenceCategory>
+            android:key="@string/EPr_default_urgency_key"  
+            android:entries="@array/EPr_default_urgency"  
+            android:entryValues="@array/EPr_default_urgency_values"  
+            android:title="@string/EPr_default_urgency_title" />
+    </PreferenceScreen>  
 
     <PreferenceCategory
         android:title="@string/prefs_category_appearance">
-        <CheckBoxPreference
-            android:key="@string/p_colorize"
-            android:title="@string/prefs_colorize_title"
-            android:summary="@string/prefs_colorize_desc" />
         <ListPreference
             android:key="@string/p_fontSize"
             android:entries="@array/EPr_font_size"
             android:entryValues="@array/EPr_font_size"
             android:title="@string/prefs_fontSize_title"
             android:summary="@string/prefs_fontSize_desc" />
-        <PreferenceScreen
-            android:title="@string/displayedFields_PrefScreen_Title"
-            android:summary="@string/displayedFields_PrefScreen_Desc">
-            <CheckBoxPreference
-               android:key="@string/prefs_deadlineVisible"
-               android:title="@string/prefs_deadlineVisible_title"
-               android:summary="@string/prefs_deadlineVisible_desc"
-               android:defaultValue="@string/prefs_deadlineVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_tagsVisible"
-               android:title="@string/prefs_tagsVisible_title"
-               android:summary="@string/prefs_tagsVisible_desc"
-               android:defaultValue="@string/prefs_tagsVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_importanceVisible"
-               android:title="@string/prefs_importanceVisible_title"
-               android:summary="@string/prefs_importanceVisible_desc"
-               android:defaultValue="@string/prefs_importanceVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_timeVisible"
-               android:title="@string/prefs_timeVisible_title"
-               android:summary="@string/prefs_timeVisible_desc"
-               android:defaultValue="@string/prefs_timeVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_reminderVisible"
-               android:title="@string/prefs_reminderVisible_title"
-               android:summary="@string/prefs_reminderVisible_desc"
-               android:defaultValue="@string/prefs_reminderVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_repeatVisible"
-               android:title="@string/prefs_repeatVisible_title"
-               android:summary="@string/prefs_repeatVisible_desc"
-               android:defaultValue="@string/prefs_repeatVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_notesVisible"
-               android:title="@string/prefs_notesVisible_title"
-               android:summary="@string/prefs_notesVisible_desc"
-               android:defaultValue="@string/prefs_notesVisible_default"  />
-        </PreferenceScreen>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/prefs_category_other">
-        <CheckBoxPreference
-           android:key="@string/p_nagging"
-           android:title="@string/prefs_nagging_title"
-           android:summary="@string/prefs_nagging_desc"
-           android:defaultValue="true"  />
-        <EditTextPreference
-            android:key="@string/p_deadlineTime"
-            android:title="@string/prefs_deadlineTime_title"
-            android:summary="@string/prefs_deadlineTime_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_backup"
-            android:title="@string/prefs_backup_title"
-            android:summary="@string/prefs_backup_desc"
-            android:defaultValue="true" />
-       <ListPreference
-            android:key="@string/prefs_defaultCalendar"
-            android:title="@string/prefs_defaultCalendar_title"
-            android:summary="@string/prefs_defaultCalendar_desc" />
     </PreferenceCategory>
+    
 </PreferenceScreen>
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_reminders.xml b/astrid/res/xml/preferences_reminders.xml
new file mode 100644
index 000000000..3f25dec4f
--- /dev/null
+++ b/astrid/res/xml/preferences_reminders.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/rmd_EPr_alerts_header">
+
+    <ListPreference
+        android:key="@string/p_notif_quietStart"
+        android:entries="@array/EPr_quiet_hours_start"
+        android:entryValues="@array/EPr_quiet_hours_start_values"
+        android:title="@string/prefs_quietStart_title"
+        android:summary="@string/prefs_quietStart_desc" />
+    <ListPreference
+        android:key="@string/p_notif_quietEnd"
+        android:entries="@array/EPr_quiet_hours_end"
+        android:entryValues="@array/EPr_quiet_hours_end_values"
+        android:title="@string/prefs_quietEnd_title"
+        android:summary="@string/prefs_quietEnd_desc" />
+    <CheckBoxPreference
+        android:key="@string/p_notif_annoy"
+        android:title="@string/prefs_annoy_title"
+        android:summary="@string/prefs_annoy_desc" />
+    <CheckBoxPreference
+        android:key="@string/p_notif_vibrate"
+        android:title="@string/prefs_vibrate_title"
+        android:summary="@string/prefs_vibrate_desc" />
+    <EditTextPreference
+        android:key="@string/p_notif_defaultRemind"
+        android:title="@string/prefs_defaultRemind_title"
+        android:summary="@string/prefs_defaultRemind_desc" />
+    <RingtonePreference
+        android:key="@string/p_notification_ringtone"
+        android:title="@string/prefs_notification_title"
+        android:summary="@string/prefs_notification_desc"
+        android:ringtoneType="notification"
+		android:showDefault="true"
+		android:showSilent="true" />
+    <ListPreference
+        android:key="@string/p_notif_icon"
+        android:entries="@array/notif_icon_entries"
+        android:entryValues="@array/notif_icon_values"
+        android:title="@string/prefs_notificon_title"
+        android:summary="@string/prefs_notificon_desc" />
+    <CheckBoxPreference
+       android:key="@string/p_nagging"
+       android:title="@string/prefs_nagging_title"
+       android:summary="@string/prefs_nagging_desc"
+       android:defaultValue="true"  />
+       
+</PreferenceScreen>
\ No newline at end of file