From f8a77f6d7ee4e8093525a9c5da4bb80fa41a1e72 Mon Sep 17 00:00:00 2001
From: Ryan Hansberry <hansberry@google.com>
Date: Thu, 17 Sep 2015 11:48:30 -0700
Subject: Make APIv14 and above use SwitchPreference, and below use custom
 SwitchCompatPreference.

Created API-v14-and-above preferences.xml and host_prefs.xml files (under xml-v14/) in order
to do so. This unfortunately for the most part duplicates preferences.xml and host_prefs.xml.

This method is an effective workaround for the visual glitch encountered earlier, as recorded
here: https://github.com/connectbot/connectbot/pull/205#issuecomment-140547689
---
 app/src/main/res/xml-v14/host_prefs.xml  | 124 ++++++++++++++++++++
 app/src/main/res/xml-v14/preferences.xml | 188 +++++++++++++++++++++++++++++++
 app/src/main/res/xml/host_prefs.xml      |  27 ++---
 app/src/main/res/xml/preferences.xml     |  39 +++----
 4 files changed, 333 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/xml-v14/host_prefs.xml
 create mode 100644 app/src/main/res/xml-v14/preferences.xml

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

diff --git a/app/src/main/res/xml-v14/host_prefs.xml b/app/src/main/res/xml-v14/host_prefs.xml
new file mode 100644
index 0000000..e0cd4f2
--- /dev/null
+++ b/app/src/main/res/xml-v14/host_prefs.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<EditTextPreference
+		android:key="nickname"
+		android:title="@string/hostpref_nickname_title"
+		android:singleLine="true"
+		/>
+
+	<ListPreference
+		android:key="color"
+		android:title="@string/hostpref_color_title"
+		android:entries="@array/list_colors"
+		android:entryValues="@array/list_color_values"
+		/>
+
+	<EditTextPreference
+		android:key="fontsize"
+		android:title="@string/hostpref_fontsize_title"
+		android:inputType="number"
+		android:singleLine="true"
+		/>
+
+	<ListPreference
+		android:key="pubkeyid"
+		android:title="@string/hostpref_pubkeyid_title"
+		android:entries="@array/list_pubkeyids"
+		android:entryValues="@array/list_pubkeyids_value"
+		/>
+
+	<ListPreference
+		android:key="useauthagent"
+		android:title="@string/hostpref_authagent_title"
+		android:entries="@array/list_authagent"
+		android:entryValues="@array/list_authagent_values"
+		/>
+
+	<EditTextPreference
+		android:key="postlogin"
+		android:title="@string/hostpref_postlogin_title"
+		android:summary="@string/hostpref_postlogin_summary"
+		/>
+
+	<SwitchPreference
+		android:key="compression"
+		android:title="@string/hostpref_compression_title"
+		android:summary="@string/hostpref_compression_summary"
+		/>
+
+	<SwitchPreference
+		android:key="wantsession"
+		android:title="@string/hostpref_wantsession_title"
+		android:summary="@string/hostpref_wantsession_summary"
+		/>
+
+	<SwitchPreference
+		android:key="stayconnected"
+		android:title="@string/hostpref_stayconnected_title"
+		android:summary="@string/hostpref_stayconnected_summary"
+		/>
+
+	<SwitchPreference
+		android:key="quickdisconnect"
+		android:title="@string/hostpref_quickdisconnect_title"
+		android:summary="@string/hostpref_quickdisconnect_summary"
+		/>
+
+	<ListPreference
+		android:key="delkey"
+		android:title="@string/hostpref_delkey_title"
+		android:summary="@string/hostpref_delkey_summary"
+		android:entries="@array/list_delkey"
+		android:entryValues="@array/list_delkey_values"
+		/>
+
+	<ListPreference
+		android:key="encoding"
+		android:title="@string/hostpref_encoding_title"
+		android:summary="@string/hostpref_encoding_summary"
+		/>
+
+	<PreferenceCategory
+		android:title="@string/hostpref_connection_category">
+
+		<EditTextPreference
+			android:key="username"
+			android:title="@string/hostpref_username_title"
+			android:singleLine="true"
+			/>
+
+		<EditTextPreference
+			android:key="hostname"
+			android:title="@string/hostpref_hostname_title"
+			android:singleLine="true"
+			/>
+
+		<EditTextPreference
+			android:key="port"
+			android:title="@string/hostpref_port_title"
+			android:numeric="integer"
+			/>
+
+	</PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
new file mode 100644
index 0000000..d04119f
--- /dev/null
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<SwitchPreference
+		android:key="memkeys"
+		android:title="@string/pref_memkeys_title"
+		android:summary="@string/pref_memkeys_summary"
+		android:defaultValue="true"
+		/>
+
+	<SwitchPreference
+		android:key="connPersist"
+		android:title="@string/pref_conn_persist_title"
+		android:summary="@string/pref_conn_persist_summary"
+		android:defaultValue="true"
+		/>
+
+	<SwitchPreference
+		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">
+
+		<ListPreference
+			android:key="emulation"
+			android:title="@string/pref_emulation_title"
+			android:summary="@string/pref_emulation_summary"
+			android:entries="@array/list_emulation_modes"
+			android:entryValues="@array/list_emulation_modes"
+			android:defaultValue="screen"
+			/>
+
+		<EditTextPreference
+			android:key="scrollback"
+			android:title="@string/pref_scrollback_title"
+			android:summary="@string/pref_scrollback_summary"
+			android:defaultValue="140"
+			android:numeric="integer"
+			/>
+
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		android:title="@string/pref_ui_category">
+
+		<ListPreference
+			android:key="rotation"
+			android:title="@string/pref_rotation_title"
+			android:summary="@string/pref_rotation_summary"
+			android:entries="@array/list_rotation"
+			android:entryValues="@array/list_rotation_values"
+			android:defaultValue="Default"
+			/>
+
+		<SwitchPreference
+			android:key="titlebarhide"
+			android:title="@string/pref_titlebarhide_title"
+			android:summary="@string/pref_titlebarhide_summary"
+			android:defaultValue="false"
+			/>
+
+		<SwitchPreference
+			android:key="fullscreen"
+			android:title="@string/pref_fullscreen_title"
+			android:summary="@string/pref_fullscreen_summary"
+			android:defaultValue="false"
+			/>
+
+		<SwitchPreference
+			android:key="volumefont"
+			android:title="@string/pref_volumefont_title"
+			android:summary="@string/pref_volumefont_summary"
+			android:defaultValue="true"
+			/>
+
+		<SwitchPreference
+			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">
+
+		<SwitchPreference
+			android:key="shiftfkeys"
+			android:title="@string/pref_shiftfkeys_title"
+			android:summary="@string/pref_shiftfkeys_summary"
+			android:defaultValue="false"
+			/>
+
+		<SwitchPreference
+			android:key="ctrlfkeys"
+			android:title="@string/pref_ctrlfkeys_title"
+			android:summary="@string/pref_ctrlfkeys_summary"
+			android:defaultValue="false"
+			/>
+
+		<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"
+			android:entries="@array/list_keymode"
+			android:entryValues="@array/list_keymode_values"
+			android:defaultValue="none"
+			/>
+
+		<ListPreference
+			android:key="camera"
+			android:title="@string/pref_camera_title"
+			android:summary="@string/pref_camera_summary"
+			android:entries="@array/list_camera"
+			android:entryValues="@array/list_camera_values"
+			android:defaultValue="Ctrl+A then Space"
+			/>
+
+		<SwitchPreference
+			android:key="bumpyarrows"
+			android:title="@string/pref_bumpyarrows_title"
+			android:summary="@string/pref_bumpyarrows_summary"
+			android:defaultValue="true"
+			/>
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		android:title="@string/pref_bell_category">
+
+		<SwitchPreference
+			android:key="bell"
+			android:title="@string/pref_bell_title"
+			android:defaultValue="true"
+			/>
+
+		<org.connectbot.util.VolumePreference
+			android:key="bellVolume"
+			android:title="@string/pref_bell_volume_title"
+			/>
+
+		<SwitchPreference
+			android:key="bellVibrate"
+			android:title="@string/pref_bell_vibrate_title"
+			android:defaultValue="true"
+			/>
+
+		<SwitchPreference
+			android:key="bellNotification"
+			android:title="@string/pref_bell_notification_title"
+			android:summary="@string/pref_bell_notification_summary"
+			android:defaultValue="false"
+			/>
+
+	</PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/host_prefs.xml b/app/src/main/res/xml/host_prefs.xml
index 5e85d60..c21f980 100644
--- a/app/src/main/res/xml/host_prefs.xml
+++ b/app/src/main/res/xml/host_prefs.xml
@@ -40,13 +40,6 @@
 		android:singleLine="true"
 		/>
 
-<!--
-	<CheckBoxPreference
-		android:key="usekeys"
-		android:title="Use SSH keys"
-		/>
--->
-
 	<ListPreference
 		android:key="pubkeyid"
 		android:title="@string/hostpref_pubkeyid_title"
@@ -66,30 +59,26 @@
 		android:title="@string/hostpref_postlogin_title"
 		android:summary="@string/hostpref_postlogin_summary"
 		/>
-		
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+
+	<org.connectbot.SwitchCompatPreference
 		android:key="compression"
 		android:title="@string/hostpref_compression_title"
 		android:summary="@string/hostpref_compression_summary"
 		/>
-		
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+
+	<org.connectbot.SwitchCompatPreference
 		android:key="wantsession"
 		android:title="@string/hostpref_wantsession_title"
 		android:summary="@string/hostpref_wantsession_summary"
 		/>
 
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+	<org.connectbot.SwitchCompatPreference
 		android:key="stayconnected"
 		android:title="@string/hostpref_stayconnected_title"
 		android:summary="@string/hostpref_stayconnected_summary"
 		/>
 
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+	<org.connectbot.SwitchCompatPreference
 		android:key="quickdisconnect"
 		android:title="@string/hostpref_quickdisconnect_title"
 		android:summary="@string/hostpref_quickdisconnect_summary"
@@ -108,10 +97,10 @@
 		android:title="@string/hostpref_encoding_title"
 		android:summary="@string/hostpref_encoding_summary"
 		/>
-	
+
 	<PreferenceCategory
 		android:title="@string/hostpref_connection_category">
-		
+
 		<EditTextPreference
 			android:key="username"
 			android:title="@string/hostpref_username_title"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ecddd71..a0baf8a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -20,24 +20,21 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+	<org.connectbot.SwitchCompatPreference
 		android:key="memkeys"
 		android:title="@string/pref_memkeys_title"
 		android:summary="@string/pref_memkeys_summary"
 		android:defaultValue="true"
 		/>
 
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+	<org.connectbot.SwitchCompatPreference
 		android:key="connPersist"
 		android:title="@string/pref_conn_persist_title"
 		android:summary="@string/pref_conn_persist_summary"
 		android:defaultValue="true"
 		/>
 
-	<CheckBoxPreference
-		android:widgetLayout="@layout/switch_compat_preference_layout"
+	<org.connectbot.SwitchCompatPreference
 		android:key="wifilock"
 		android:title="@string/pref_wifilock_title"
 		android:summary="@string/pref_wifilock_summary"
@@ -78,32 +75,28 @@
 			android:defaultValue="Default"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="titlebarhide"
 			android:title="@string/pref_titlebarhide_title"
 			android:summary="@string/pref_titlebarhide_summary"
 			android:defaultValue="false"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="fullscreen"
 			android:title="@string/pref_fullscreen_title"
 			android:summary="@string/pref_fullscreen_summary"
 			android:defaultValue="false"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="volumefont"
 			android:title="@string/pref_volumefont_title"
 			android:summary="@string/pref_volumefont_summary"
 			android:defaultValue="true"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="keepalive"
 			android:title="@string/pref_keepalive_title"
 			android:summary="@string/pref_keepalive_summary"
@@ -114,16 +107,14 @@
 	<PreferenceCategory
 		android:title="@string/pref_keyboard_category">
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="shiftfkeys"
 			android:title="@string/pref_shiftfkeys_title"
 			android:summary="@string/pref_shiftfkeys_summary"
 			android:defaultValue="false"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="ctrlfkeys"
 			android:title="@string/pref_ctrlfkeys_title"
 			android:summary="@string/pref_ctrlfkeys_summary"
@@ -157,8 +148,7 @@
 			android:defaultValue="Ctrl+A then Space"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="bumpyarrows"
 			android:title="@string/pref_bumpyarrows_title"
 			android:summary="@string/pref_bumpyarrows_summary"
@@ -169,8 +159,7 @@
 	<PreferenceCategory
 		android:title="@string/pref_bell_category">
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="bell"
 			android:title="@string/pref_bell_title"
 			android:defaultValue="true"
@@ -181,15 +170,13 @@
 			android:title="@string/pref_bell_volume_title"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="bellVibrate"
 			android:title="@string/pref_bell_vibrate_title"
 			android:defaultValue="true"
 			/>
 
-		<CheckBoxPreference
-			android:widgetLayout="@layout/switch_compat_preference_layout"
+		<org.connectbot.SwitchCompatPreference
 			android:key="bellNotification"
 			android:title="@string/pref_bell_notification_title"
 			android:summary="@string/pref_bell_notification_summary"
-- 
cgit v1.2.3