aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2015-03-21 23:40:13 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2015-03-21 23:44:08 +0000
commite7334fb51553251cc365c9a17f0c4c49af959a1d (patch)
treec89273b310de4f0edd01af0dc54a9a461fa92d03 /res
parentcf1a6e3000a7344c6cc1a3f14ac387aa2292c10f (diff)
downloadconnectbot-e7334fb51553251cc365c9a17f0c4c49af959a1d.tar.gz
connectbot-e7334fb51553251cc365c9a17f0c4c49af959a1d.tar.bz2
connectbot-e7334fb51553251cc365c9a17f0c4c49af959a1d.zip
Make sticky modifiers an option, off by default.
Users with near-full-size keyboards (tablet docks/cases, or usb/bluetooth keyboards) probably don't want sticky modifier keys. Make it an option that's off by default (except on the Dream where it's likely desirable). Also, include a third state to make only "alt" sticky, for the benefit of the crazy keyboard driver on the TF101/201 that doesn't emit real key events for alt+key pressed together. Also, implement stickiness for the control key on physical keyboards that have one, for consistency.
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml12
-rw-r--r--res/values/strings.xml7
-rw-r--r--res/xml/preferences.xml9
3 files changed, 28 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 00c92ba..4721490 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -71,6 +71,18 @@
<item>gray</item>
</string-array>
+ <string-array name="list_stickymodifiers" translatable="false">
+ <item>@string/no</item>
+ <item>@string/only_alt</item>
+ <item>@string/yes</item>
+ </string-array>
+
+ <string-array name="list_stickymodifiers_values" translatable="false">
+ <item>no</item>
+ <item>alt</item>
+ <item>yes</item>
+ </string-array>
+
<string-array name="list_keymode" translatable="false">
<item>@string/list_keymode_right</item>
<item>@string/list_keymode_left</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 273815b..e634385 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -196,6 +196,13 @@
<!-- Summary for the keyboard shortcuts preference -->
<string name="pref_keymode_summary">"Select how to use Alt for '/' and Shift for Tab"</string>
+ <!-- Name for the sticky modifiers preference -->
+ <string name="pref_stickymodifiers_title">"Sticky modifiers"</string>
+ <!-- Summary for the sticky modifiers preference -->
+ <string name="pref_stickymodifiers_summary">"Modifier keys remain enabled until another key is pressed"</string>
+
+ <string name="only_alt">"Only alt"</string>
+
<!-- Name for the camera shortcut usage preference -->
<string name="pref_camera_title">"Camera shortcut"</string>
<!-- Summary for the camera shortcut usage preference -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 6d20a5d..a1b79ae 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -122,6 +122,15 @@
/>
<ListPreference
+ android:key="stickymodifiers"
+ android:title="@string/pref_stickymodifiers_title"
+ android:summary="@string/pref_stickymodifiers_summary"
+ android:entries="@array/list_stickymodifiers"
+ android:entryValues="@array/list_stickymodifiers_values"
+ android:defaultValue="no"
+ />
+
+ <ListPreference
android:key="keymode"
android:title="@string/pref_keymode_title"
android:summary="@string/pref_keymode_summary"