# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1404878148 25200
# Node ID c6157535e180c64d6b783719926c0fe125669a74
# Parent  abf17d9431ebdd62eb212ee75ffd49145d6005b1
update version; consistent defaults for hardware buttons

diff -r abf17d9431eb -r c6157535e180 AndroidManifest.xml
--- a/AndroidManifest.xml	Tue Jul 08 17:20:53 2014 -0700
+++ b/AndroidManifest.xml	Tue Jul 08 20:55:48 2014 -0700
@@ -17,7 +17,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.8.4-1"
+	android:versionName="1.8.5-1"
 	android:versionCode="1"
 	android:installLocation="auto">
 
diff -r abf17d9431eb -r c6157535e180 res/xml/preferences.xml
--- a/res/xml/preferences.xml	Tue Jul 08 17:20:53 2014 -0700
+++ b/res/xml/preferences.xml	Tue Jul 08 20:55:48 2014 -0700
@@ -123,7 +123,7 @@
 			android:summary="@string/pref_volup_summary"
 			android:entries="@array/list_hwbutton"
 			android:entryValues="@array/list_hwbutton_values"
-			android:defaultValue="None"
+			android:defaultValue="Soft Function Keypad"
 			/>
 
 		<ListPreference
@@ -141,7 +141,7 @@
 			android:summary="@string/pref_search_summary"
 			android:entries="@array/list_hwbutton"
 			android:entryValues="@array/list_hwbutton_values"
-			android:defaultValue="None"
+			android:defaultValue="Esc"
 			/>
 
 		<ListPreference
diff -r abf17d9431eb -r c6157535e180 src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java
--- a/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Tue Jul 08 17:20:53 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Tue Jul 08 20:55:48 2014 -0700
@@ -580,7 +580,7 @@
                 // check to see which shortcut the volume button triggers
                 hwbuttonShortcut = manager.prefs.getString(
                                        PreferenceConstants.VOLUP,
-                                       PreferenceConstants.HWBUTTON_CTRL);
+                                       PreferenceConstants.HWBUTTON_FUNCTION_KEYS);
                 return (handleShortcut(v, hwbuttonShortcut, repeat, down));
 
             case KeyEvent.KEYCODE_VOLUME_DOWN:
diff -r abf17d9431eb -r c6157535e180 xml/510connectbot.in
--- a/xml/510connectbot.in	Tue Jul 08 17:20:53 2014 -0700
+++ b/xml/510connectbot.in	Tue Jul 08 20:55:48 2014 -0700
@@ -24,7 +24,7 @@
 
     <refentry id="x@PACKAGE@.1">
         <refentryinfo>
-            <date>2014-06-22</date>
+            <date>2014-07-08</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -72,9 +72,9 @@
             <title>Changes from previous Connectbots</title>
             <itemizedlist>
                 <listitem><para>
-                    The soft function keypad can generate all 24 function keys
-                    for 5250 emulation. A hardware button can be configured to
-                    display that function keypad.
+                    The soft function keypad now has better labels, and can generate
+                    all 24 function keys for 5250 emulation. A hardware button can
+                    be configured to display that function keypad.
                 </para></listitem>
 
                 <listitem><para>