From cf1a6e3000a7344c6cc1a3f14ac387aa2292c10f Mon Sep 17 00:00:00 2001
From: Torne Wuff <torne@wolfpuppy.org.uk>
Date: Sat, 21 Mar 2015 21:39:01 +0000
Subject: Reorganise preferences, add category for keyboard prefs

---
 res/values/strings.xml  |  3 +++
 res/xml/preferences.xml | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b9febd..273815b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -163,6 +163,9 @@
 	<!-- Summary for the full screen preference -->
 	<string name="pref_fullscreen_summary">"Hide status bar while in console"</string>
 
+	<!-- The category title for keyboard preferences -->
+	<string name="pref_keyboard_category">"Keyboard"</string>
+
 	<!-- Name for the shifted numbers are f-keys preference -->
 	<string name="pref_shiftfkeys_title">"Shift+num are F-keys"</string>
 	<!-- Summary for the shifted numbers are f-keys preference -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index b90637e..6d20a5d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -34,6 +34,13 @@
 		android:defaultValue="true"
 		/>
 
+	<CheckBoxPreference
+		android:key="wifilock"
+		android:title="@string/pref_wifilock_title"
+		android:summary="@string/pref_wifilock_summary"
+		android:defaultValue="true"
+		/>
+
 	<PreferenceCategory
 		android:title="@string/pref_emulation_category">
 
@@ -82,6 +89,24 @@
 			android:defaultValue="false"
 			/>
 
+		<CheckBoxPreference
+			android:key="volumefont"
+			android:title="@string/pref_volumefont_title"
+			android:summary="@string/pref_volumefont_summary"
+			android:defaultValue="true"
+			/>
+
+		<CheckBoxPreference
+			android:key="keepalive"
+			android:title="@string/pref_keepalive_title"
+			android:summary="@string/pref_keepalive_summary"
+			android:defaultValue="true"
+			/>
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		android:title="@string/pref_keyboard_category">
+
 		<CheckBoxPreference
 			android:key="shiftfkeys"
 			android:title="@string/pref_shiftfkeys_title"
@@ -96,13 +121,6 @@
 			android:defaultValue="false"
 			/>
 
-		<CheckBoxPreference
-			android:key="volumefont"
-			android:title="@string/pref_volumefont_title"
-			android:summary="@string/pref_volumefont_summary"
-			android:defaultValue="true"
-			/>
-
 		<ListPreference
 			android:key="keymode"
 			android:title="@string/pref_keymode_title"
@@ -121,20 +139,6 @@
 			android:defaultValue="Ctrl+A then Space"
 			/>
 
-		<CheckBoxPreference
-			android:key="keepalive"
-			android:title="@string/pref_keepalive_title"
-			android:summary="@string/pref_keepalive_summary"
-			android:defaultValue="true"
-			/>
-
-		<CheckBoxPreference
-			android:key="wifilock"
-			android:title="@string/pref_wifilock_title"
-			android:summary="@string/pref_wifilock_summary"
-			android:defaultValue="true"
-			/>
-
 		<CheckBoxPreference
 			android:key="bumpyarrows"
 			android:title="@string/pref_bumpyarrows_title"
-- 
cgit v1.2.3