From be032f4719736adb19c1ec174d869923555e6d48 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Wed, 7 Oct 2015 11:38:35 -0700
Subject: Make the pg up/down gesture a preference which is disabled by
 default.

---
 app/src/main/res/values/strings.xml      | 7 ++++++-
 app/src/main/res/xml-v14/preferences.xml | 7 +++++++
 app/src/main/res/xml/preferences.xml     | 7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d44f8d..b92cc28 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,7 +83,7 @@
 	<string name="page_updn_header">"Page Up / Page Down"</string>
 
 	<!-- Instructions about paging up and down in the terminal. -->
-	<string name="page_updn_content">"Swiping your finger up and down on the left third of the screen	will send a page up and page down key to the remote host. Many programs	map this to scrolling back into history such as irssi or tinyfugue."</string>
+	<string name="page_updn_content">"NOTE: This must be enabled in settings."\n\n"Swiping your finger up and down on the left third of the screen	will send a page up and page down key to the remote host. Many programs	map this to scrolling back into history such as irssi or tinyfugue."</string>
 
 	<!-- Captions for images showing the page up/down gestures. -->
 	<string name="page_up">"Page up"</string>
@@ -236,6 +236,11 @@
 	<!-- Summary for the titlebar hide preference -->
 	<string name="pref_titlebarhide_summary">"Tap console to show title bar and access menu"</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 -->
+	<string name="pref_pg_updn_gesture_summary">"Swipe the left third of the screen to send pg up/dn to the terminal"</string>
+
 	<!-- Name for the full screen preference -->
 	<string name="pref_fullscreen_title">"Full screen"</string>
 	<!-- Summary for the full screen preference -->
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index d04119f..9e76c36 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -89,6 +89,13 @@
 			android:defaultValue="false"
 			/>
 
+		<org.connectbot.util.SwitchCompatPreference
+			android:key="pgupdngesture"
+			android:title="@string/pref_pg_updn_gesture_title"
+			android:summary="@string/pref_pg_updn_gesture_summary"
+			android:defaultValue="false"
+			/>
+
 		<SwitchPreference
 			android:key="volumefont"
 			android:title="@string/pref_volumefont_title"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 88b9855..e87b263 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -89,6 +89,13 @@
 			android:defaultValue="false"
 			/>
 
+		<org.connectbot.util.SwitchCompatPreference
+			android:key="pgupdngesture"
+			android:title="@string/pref_pg_updn_gesture_title"
+			android:summary="@string/pref_pg_updn_gesture_summary"
+			android:defaultValue="false"
+			/>
+
 		<org.connectbot.util.SwitchCompatPreference
 			android:key="volumefont"
 			android:title="@string/pref_volumefont_title"
-- 
cgit v1.2.3