aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2013-09-30 23:40:26 +0100
committerTorne Wuff <torne@wolfpuppy.org.uk>2013-09-30 23:40:26 +0100
commitb06bdfb83db5900a276a1dc5a4f9957bdf4ff9c0 (patch)
treeafd15e77dee33fddf2d3df7aefbb171f968bd9e5 /res
parent05bbc915058d85a4f1f0ef46d41ec40ed646152b (diff)
downloadconnectbot-b06bdfb83db5900a276a1dc5a4f9957bdf4ff9c0.tar.gz
connectbot-b06bdfb83db5900a276a1dc5a4f9957bdf4ff9c0.tar.bz2
connectbot-b06bdfb83db5900a276a1dc5a4f9957bdf4ff9c0.zip
Hopefully fix the majority of keyboard issues.
It seems that the majority of keyboard issues were caused by quirks implemented for the convenience of the HTC Dream (shift+numbers generating function keys on the hardware keyboard and ctrl+numbers generating function keys on the software keyboard). Turn these into settings, which are disabled by default unless the device is indeed a HTC Dream. Also, add a setting (defaulting to on) which determines whether the volume keys change the font size. Disabling this restores normal volume control functionality.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml15
-rw-r--r--res/xml/preferences.xml21
2 files changed, 36 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1392622..f8f8f89 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -158,6 +158,21 @@
<!-- Summary for the full screen preference -->
<string name="pref_fullscreen_summary">"Hide status bar while in console"</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 -->
+ <string name="pref_shiftfkeys_summary">"On hardware keyboards, number keys send F1-F10 with shift"</string>
+
+ <!-- Name for the ctrl'ed numbers are f-keys preference -->
+ <string name="pref_ctrlfkeys_title">"Ctrl+num are F-keys"</string>
+ <!-- Summary for the ctrl'ed numbers are f-keys preference -->
+ <string name="pref_ctrlfkeys_summary">"On software keyboards, number keys send F1-F10 with ctrl"</string>
+
+ <!-- Name for the volume keys control font size preference -->
+ <string name="pref_volumefont_title">"Volume keys change font size"</string>
+ <!-- Summary for the volume keys control font size preference -->
+ <string name="pref_volumefont_summary">"Font size can also be changed in per-host settings"</string>
+
<!-- Name for the memorize keys preference -->
<string name="pref_memkeys_title">"Remember keys in memory"</string>
<!-- Summary for the memorize keys preference -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8726ea4..5fb836b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -84,6 +84,27 @@
android:defaultValue="false"
/>
+ <CheckBoxPreference
+ android:key="shiftfkeys"
+ android:title="@string/pref_shiftfkeys_title"
+ android:summary="@string/pref_shiftfkeys_summary"
+ android:defaultValue="false"
+ />
+
+ <CheckBoxPreference
+ android:key="ctrlfkeys"
+ android:title="@string/pref_ctrlfkeys_title"
+ android:summary="@string/pref_ctrlfkeys_summary"
+ 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"