aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2015-03-21 21:39:01 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2015-03-21 21:39:01 +0000
commitcf1a6e3000a7344c6cc1a3f14ac387aa2292c10f (patch)
tree28c39ec73517c617696e861ff923410ca6731030
parentf1317221ef719b7c4f8bb0279f5cbb47cc455f31 (diff)
downloadconnectbot-cf1a6e3000a7344c6cc1a3f14ac387aa2292c10f.tar.gz
connectbot-cf1a6e3000a7344c6cc1a3f14ac387aa2292c10f.tar.bz2
connectbot-cf1a6e3000a7344c6cc1a3f14ac387aa2292c10f.zip
Reorganise preferences, add category for keyboard prefs
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/preferences.xml46
2 files changed, 28 insertions, 21 deletions
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">
@@ -83,6 +90,24 @@
/>
<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"
android:summary="@string/pref_shiftfkeys_summary"
@@ -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"
@@ -122,20 +140,6 @@
/>
<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"
android:summary="@string/pref_bumpyarrows_summary"