From ba9baf3bc964f0fbd1661fa516277658d1d777aa Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 22 Aug 2012 16:57:24 -0700
Subject: [PATCH] Move misc preferences to the bottom

---
 astrid/res/xml/preferences.xml                | 37 ------------------
 astrid/res/xml/preferences_misc.xml           | 39 +++++++++++++++++++
 .../astrid/activity/EditPreferences.java      |  2 +
 3 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100644 astrid/res/xml/preferences_misc.xml

diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index ebf1bd1a5..02e26daee 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -110,41 +110,4 @@
              
     </PreferenceScreen>
 
-
-    <PreferenceScreen
-        android:title="@string/EPr_powerpack_header"
-        android:summary="@string/EPr_powerpack_summary">
-        
-        <PreferenceScreen android:title="@string/p_files_dir" android:key="@string/p_files_dir" />
-        
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_voiceRemindersEnabled"
-            android:title="@string/EPr_voiceRemindersEnabled_title"
-            android:defaultValue="false" />
-
-        <CheckBoxPreference
-            android:key="@string/p_field_missed_calls"
-            android:title="@string/MCA_missed_calls_pref_title"/>
-        
-        <CheckBoxPreference
-            android:key="@string/p_third_party_addons"
-            android:title="@string/EPr_third_party_addons" />
-        
-        <CheckBoxPreference
-            android:key="@string/p_ideas_tab_enabled"
-            android:title="@string/EPr_ideas_tab_enabled" 
-            android:summary="@string/EPr_ideas_tab_description" />
-        
-        <CheckBoxPreference
-            android:title="@string/EPr_cal_end_or_start_at_due_time"
-            android:key = "@string/p_end_at_deadline" />
-        
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	        android:key="@string/p_statistics"
-	        android:title="@string/EPr_statistics_title"
-	        android:defaultValue="true" />   
-          
-    </PreferenceScreen>
-
-
 </PreferenceScreen>
diff --git a/astrid/res/xml/preferences_misc.xml b/astrid/res/xml/preferences_misc.xml
new file mode 100644
index 000000000..acf97d683
--- /dev/null
+++ b/astrid/res/xml/preferences_misc.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/EPr_powerpack_header">
+	<PreferenceScreen
+	    android:title="@string/EPr_powerpack_header"
+	    android:summary="@string/EPr_powerpack_summary">
+	    
+	    <PreferenceScreen android:title="@string/p_files_dir" android:key="@string/p_files_dir" />
+	    
+	    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	        android:key="@string/p_voiceRemindersEnabled"
+	        android:title="@string/EPr_voiceRemindersEnabled_title"
+	        android:defaultValue="false" />
+	
+	    <CheckBoxPreference
+	        android:key="@string/p_field_missed_calls"
+	        android:title="@string/MCA_missed_calls_pref_title"/>
+	    
+	    <CheckBoxPreference
+	        android:key="@string/p_third_party_addons"
+	        android:title="@string/EPr_third_party_addons" />
+	    
+	    <CheckBoxPreference
+	        android:key="@string/p_ideas_tab_enabled"
+	        android:title="@string/EPr_ideas_tab_enabled" 
+	        android:summary="@string/EPr_ideas_tab_description" />
+	    
+	    <CheckBoxPreference
+	        android:title="@string/EPr_cal_end_or_start_at_due_time"
+	        android:key = "@string/p_end_at_deadline" />
+	    
+	    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	        android:key="@string/p_statistics"
+	        android:title="@string/EPr_statistics_title"
+	        android:defaultValue="true" />   
+	      
+	</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 29d063152..d90e5e673 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -134,6 +134,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         addPluginPreferences(screen);
 
+        addPreferencesFromResource(R.xml.preferences_misc);
+
         final Resources r = getResources();
 
         // first-order preferences