aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-11-06 09:07:01 -0800
committerKenny Root <kenny@the-b.org>2015-11-06 09:07:01 -0800
commitad6d5bb18bfba975386210f2114d15a9d49d4a73 (patch)
tree5f30db0aa6effc4663bb1f694f9cdc12b09c0fca /app/src/main/res
parent9bcc1233fba2a81a0f60cee25b34a7350a49dd0b (diff)
parenta60d7944928b03c8426a1b1d2c0c8b036b1535c8 (diff)
downloadconnectbot-ad6d5bb18bfba975386210f2114d15a9d49d4a73.tar.gz
connectbot-ad6d5bb18bfba975386210f2114d15a9d49d4a73.tar.bz2
connectbot-ad6d5bb18bfba975386210f2114d15a9d49d4a73.zip
Merge pull request #330 from alescdb/keyboard-always-visible
Add an option to always show the virtual keyboard (special keys)
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values-fr/strings.xml1
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/xml-v14/preferences.xml6
-rw-r--r--app/src/main/res/xml/preferences.xml6
4 files changed, 16 insertions, 1 deletions
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b615b2b..d09ab89 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -78,6 +78,7 @@
<string name="pref_rotation_summary">Comment changer l\'orientation de l\'écran suivant si le clavier est déplié</string>
<string name="pref_titlebarhide_title">Masquer automatiquement la barre de titre</string>
<string name="pref_titlebarhide_summary">Appuyez sur console pour montrer la barre de titre et accèder au menu</string>
+ <string name="pref_alwaysvisible_title">Toujours afficher les touches spéciales</string>
<string name="pref_fullscreen_title">Plein écran</string>
<string name="pref_fullscreen_summary">Cacher la barre de notifications lorsque la console est active</string>
<string name="pref_keyboard_category">Clavier</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34dcb64..45ef38c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,6 +219,9 @@
<!-- Summary for the titlebar hide preference -->
<string name="pref_titlebarhide_summary">"Tap console to show title bar and access menu"</string>
+ <!-- Title for special keys always visible preference -->
+ <string name="pref_alwaysvisible_title">Special keys always visible</string>
+
<!-- Name for the page up/down gesture preference -->
<string name="pref_pg_updn_gesture_title">"Page up/down gesture"</string>
<!-- Summary for the full screen preference -->
@@ -636,5 +639,4 @@
<string name="discard_host_button">Discard</string>
<!-- Text for button which does not discard changes and keeps editing. -->
<string name="discard_host_cancel_button">Keep editing</string>
-
</resources>
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index 9e76c36..7c495b1 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -115,6 +115,12 @@
android:title="@string/pref_keyboard_category">
<SwitchPreference
+ android:key="alwaysvisible"
+ android:title="@string/pref_alwaysvisible_title"
+ android:defaultValue="false"
+ />
+
+ <SwitchPreference
android:key="shiftfkeys"
android:title="@string/pref_shiftfkeys_title"
android:summary="@string/pref_shiftfkeys_summary"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e87b263..2774834 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -115,6 +115,12 @@
android:title="@string/pref_keyboard_category">
<org.connectbot.util.SwitchCompatPreference
+ android:key="alwaysvisible"
+ android:title="@string/pref_alwaysvisible_title"
+ android:defaultValue="false"
+ />
+
+ <org.connectbot.util.SwitchCompatPreference
android:key="shiftfkeys"
android:title="@string/pref_shiftfkeys_title"
android:summary="@string/pref_shiftfkeys_summary"