From 15f6f4577c8c16533433654f5ed4625a2caff1a0 Mon Sep 17 00:00:00 2001
From: adb2001 <adb2001@hotmail.com>
Date: Sat, 15 Aug 2015 10:34:46 +0200
Subject: Hide ActionBar when a virtual key is pressed.

---
 .../main/java/org/connectbot/ConsoleActivity.java  | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index d6ee629..7f7ddcd 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -17,19 +17,6 @@
 
 package org.connectbot;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.connectbot.bean.HostBean;
-import org.connectbot.bean.SelectionArea;
-import org.connectbot.service.BridgeDisconnectedListener;
-import org.connectbot.service.PromptHelper;
-import org.connectbot.service.TerminalBridge;
-import org.connectbot.service.TerminalKeyListener;
-import org.connectbot.service.TerminalManager;
-import org.connectbot.util.PreferenceConstants;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -50,8 +37,8 @@ import android.os.IBinder;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
@@ -89,6 +76,20 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import org.connectbot.bean.HostBean;
+import org.connectbot.bean.SelectionArea;
+import org.connectbot.service.BridgeDisconnectedListener;
+import org.connectbot.service.PromptHelper;
+import org.connectbot.service.TerminalBridge;
+import org.connectbot.service.TerminalKeyListener;
+import org.connectbot.service.TerminalManager;
+import org.connectbot.util.PreferenceConstants;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
 import de.mud.terminal.vt320;
 
 public class ConsoleActivity extends Activity implements BridgeDisconnectedListener {
@@ -256,6 +257,9 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 			autoHideEmulatedKeys();
 
 		terminal.bridge.tryKeyVibrate();
+		if(titleBarHide) {
+			actionBar.hide();
+		}
 	}
 
 	/**
-- 
cgit v1.2.3


From 4fe2f3181d7bdf30abca1e321f53c1ba693e99e3 Mon Sep 17 00:00:00 2001
From: adb2001 <adb2001@hotmail.com>
Date: Sat, 15 Aug 2015 10:40:45 +0200
Subject: Rearrange imports

---
 .../main/java/org/connectbot/ConsoleActivity.java  | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 7f7ddcd..111b3e3 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -17,6 +17,19 @@
 
 package org.connectbot;
 
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.connectbot.bean.HostBean;
+import org.connectbot.bean.SelectionArea;
+import org.connectbot.service.BridgeDisconnectedListener;
+import org.connectbot.service.PromptHelper;
+import org.connectbot.service.TerminalBridge;
+import org.connectbot.service.TerminalKeyListener;
+import org.connectbot.service.TerminalManager;
+import org.connectbot.util.PreferenceConstants;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -37,8 +50,8 @@ import android.os.IBinder;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
 import android.support.v4.app.ActivityCompat;
+import android.support.design.widget.TabLayout;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
@@ -76,20 +89,6 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-
-import org.connectbot.bean.HostBean;
-import org.connectbot.bean.SelectionArea;
-import org.connectbot.service.BridgeDisconnectedListener;
-import org.connectbot.service.PromptHelper;
-import org.connectbot.service.TerminalBridge;
-import org.connectbot.service.TerminalKeyListener;
-import org.connectbot.service.TerminalManager;
-import org.connectbot.util.PreferenceConstants;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
 import de.mud.terminal.vt320;
 
 public class ConsoleActivity extends Activity implements BridgeDisconnectedListener {
-- 
cgit v1.2.3


From 2619786157dbc54de7178526c1ab493f86939119 Mon Sep 17 00:00:00 2001
From: adb2001 <adb2001@hotmail.com>
Date: Sat, 15 Aug 2015 10:42:36 +0200
Subject: :app:checkstyle

---
 app/src/main/java/org/connectbot/ConsoleActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 111b3e3..a0da120 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -256,7 +256,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 			autoHideEmulatedKeys();
 
 		terminal.bridge.tryKeyVibrate();
-		if(titleBarHide) {
+		if (titleBarHide) {
 			actionBar.hide();
 		}
 	}
-- 
cgit v1.2.3


From 4f612c85338f4fbba30dab2c0527c1b2980f30d9 Mon Sep 17 00:00:00 2001
From: adb2001 <adb2001@hotmail.com>
Date: Sat, 15 Aug 2015 12:51:46 +0200
Subject: Add an HorizontalScrollView in the keyboard and add virtual keys in
 it : Home, End, Page Up, Page Down, F1 -> F12

---
 .../main/java/org/connectbot/ConsoleActivity.java  |  78 +++++-
 app/src/main/res/layout-large/act_console.xml      | 303 +++++++++++---------
 app/src/main/res/layout/act_console.xml            | 304 ++++++++++++---------
 app/src/main/res/values/strings.xml                |  33 +++
 app/src/main/res/values/styles.xml                 |  20 ++
 5 files changed, 478 insertions(+), 260 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index a0da120..294b8f3 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -98,7 +98,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 
 	private static final int CLICK_TIME = 400;
 	private static final float MAX_CLICK_DISTANCE = 25f;
-	private static final int KEYBOARD_DISPLAY_TIME = 1500;
+	private static final int KEYBOARD_DISPLAY_TIME = 3000;
 
 	protected ViewPager pager = null;
 	protected TabLayout tabs = null;
@@ -220,33 +220,83 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		if (terminal == null) return;
 
 		TerminalKeyListener handler = terminal.bridge.getKeyHandler();
-		boolean hideKeys = true;
+		boolean hideKeys = false;
 
 		switch (v.getId())	{
 		case R.id.button_ctrl:
 			handler.metaPress(TerminalKeyListener.OUR_CTRL_ON, true);
+			hideKeys = true;
 			break;
 		case R.id.button_esc:
 			handler.sendEscape();
+			hideKeys = true;
 			break;
 		case R.id.button_tab:
 			handler.sendTab();
+			hideKeys = true;
 			break;
+
 		case R.id.button_up:
 			handler.sendPressedKey(vt320.KEY_UP);
-			hideKeys = false;
 			break;
 		case R.id.button_down:
 			handler.sendPressedKey(vt320.KEY_DOWN);
-			hideKeys = false;
 			break;
 		case R.id.button_left:
 			handler.sendPressedKey(vt320.KEY_LEFT);
-			hideKeys = false;
 			break;
 		case R.id.button_right:
 			handler.sendPressedKey(vt320.KEY_RIGHT);
-			hideKeys = false;
+			break;
+
+		case R.id.button_home:
+			handler.sendPressedKey(vt320.KEY_HOME);
+			break;
+		case R.id.button_end:
+			handler.sendPressedKey(vt320.KEY_END);
+			break;
+		case R.id.button_pgup:
+			handler.sendPressedKey(vt320.KEY_PAGE_UP);
+			break;
+		case R.id.button_pgdn:
+			handler.sendPressedKey(vt320.KEY_PAGE_DOWN);
+			break;
+
+		case R.id.button_f1:
+			handler.sendPressedKey(vt320.KEY_F1);
+			break;
+		case R.id.button_f2:
+			handler.sendPressedKey(vt320.KEY_F2);
+			break;
+		case R.id.button_f3:
+			handler.sendPressedKey(vt320.KEY_F3);
+			break;
+		case R.id.button_f4:
+			handler.sendPressedKey(vt320.KEY_F4);
+			break;
+		case R.id.button_f5:
+			handler.sendPressedKey(vt320.KEY_F5);
+			break;
+		case R.id.button_f6:
+			handler.sendPressedKey(vt320.KEY_F6);
+			break;
+		case R.id.button_f7:
+			handler.sendPressedKey(vt320.KEY_F7);
+			break;
+		case R.id.button_f8:
+			handler.sendPressedKey(vt320.KEY_F8);
+			break;
+		case R.id.button_f9:
+			handler.sendPressedKey(vt320.KEY_F9);
+			break;
+		case R.id.button_f10:
+			handler.sendPressedKey(vt320.KEY_F10);
+			break;
+		case R.id.button_f11:
+			handler.sendPressedKey(vt320.KEY_F11);
+			break;
+		case R.id.button_f12:
+			handler.sendPressedKey(vt320.KEY_F12);
 			break;
 		}
 
@@ -453,6 +503,22 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		findViewById(R.id.button_down).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_left).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_right).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_home).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_end).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_pgup).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_pgdn).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f1).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f2).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f3).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f4).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f5).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f6).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f7).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f8).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f9).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f10).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f11).setOnClickListener(emulatedKeysListener);
+		findViewById(R.id.button_f12).setOnClickListener(emulatedKeysListener);
 
 		actionBar = ActionBarWrapper.getActionBar(this);
 		actionBar.setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index d735333..110b4bf 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -142,155 +142,204 @@
 			android:layout_height="wrap_content"
 			android:layout_alignParentBottom="true"
 			android:background="#55000000"
+			android:orientation="horizontal"
 			android:padding="0dip"
 			android:visibility="gone">
 
-		<Button
-				android:id="@+id/button_ctrl"
-				android:layout_width="0px"
+		<HorizontalScrollView
+				android:id="@+id/keyboard_hscroll"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
 				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_toggle_control_character"
 				android:padding="0dp"
-				android:text="@string/button_key_ctrl"
-				android:textSize="10dip"
-				/>
+				android:scrollbars="none">
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:orientation="horizontal"
+					android:padding="0dp">
 
-		<Button
-				android:id="@+id/button_esc"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_send_escape_character"
-				android:padding="0dp"
-				android:text="@string/button_key_esc"
-				android:textSize="10dip"
-				/>
+				<Button
+						android:id="@+id/button_ctrl"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_toggle_control_character"
+						android:text="@string/button_key_ctrl" />
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-				android:id="@+id/button_tab"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_send_tab_character"
-				android:padding="0dp"
-				android:text="@string/button_key_tab"
-				android:textSize="10dip"
-				/>
+				<Button
+						android:id="@+id/button_esc"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_send_escape_character"
+						android:text="Esc" />
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-				android:id="@+id/button_up"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_up"
-				android:padding="0dp"
-				android:text="@string/button_key_up"
-				android:textSize="10dip"
-				/>
+				<Button
+						android:id="@+id/button_tab"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_send_tab_character"
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+						android:text="Tab" />
 
-		<Button
-				android:id="@+id/button_down"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_down"
-				android:padding="0dp"
-				android:text="@string/button_key_down"
-				android:textSize="10dip"
-				/>
+				<View style="@style/KeyboardSeparator" />
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+				<Button
+						android:id="@+id/button_up"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_up"
 
-		<Button
-				android:id="@+id/button_left"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_left"
-				android:padding="0dp"
-				android:text="@string/button_key_left"
-				android:textSize="10dip"
-				/>
+						android:text="@string/button_key_up" />
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-				android:id="@+id/button_right"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_right"
-				android:padding="0dp"
-				android:text="@string/button_key_right"
-				android:textSize="10dip"
-				/>
+				<Button
+						android:id="@+id/button_down"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_down"
+						android:text="@string/button_key_down" />
 
-		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_left"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_left"
+						android:text="@string/button_key_left" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_right"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_right"
+						android:text="@string/button_key_right" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_home"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_home" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_end"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_end" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_pgup"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_pgup" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_pgdn"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_pgdn" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f1"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f1"
+
+						/>
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f2"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f2" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f3"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f3" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f4"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f4" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f5"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f5" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f6"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f6" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f7"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f7" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f8"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f8" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f9"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f9" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f10"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f10" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f11"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f11" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+						android:id="@+id/button_f12"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f12" />
+			</LinearLayout>
+		</HorizontalScrollView>
+
+		<View style="@style/KeyboardSeparator" />
 
 		<ImageView
 				android:id="@+id/button_keyboard"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
+				style="@style/KeyboardKey"
+				android:background="#55b0b0f0"
 				android:contentDescription="@string/image_description_show_keyboard"
-				android:padding="0dp"
-				android:src="@drawable/button_keyboard"
-				android:background="#55f0f0f0"
-				android:textSize="10dip"
-				/>
-
+				android:src="@drawable/button_keyboard" />
 	</LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index 5cdd7d1..c268d51 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -126,155 +126,205 @@
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
 		android:background="#55000000"
+		android:orientation="horizontal"
 		android:padding="0dip"
 		android:visibility="gone">
 
-		<Button
-			android:id="@+id/button_ctrl"
-			android:layout_width="0px"
+		<HorizontalScrollView
+			android:id="@+id/keyboard_hscroll"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
 			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_toggle_control_character"
 			android:padding="0dp"
-			android:text="@string/button_key_ctrl"
-			android:textSize="10dip"
-			/>
+			android:scrollbars="none">
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:orientation="horizontal"
+				android:padding="0dp">
 
-		<Button
-			android:id="@+id/button_esc"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_send_escape_character"
-			android:padding="0dp"
-			android:text="@string/button_key_esc"
-			android:textSize="10dip"
-			/>
+				<Button
+					android:id="@+id/button_ctrl"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_toggle_control_character"
+					android:text="@string/button_key_ctrl" />
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-			android:id="@+id/button_tab"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_send_tab_character"
-			android:padding="0dp"
-			android:text="@string/button_key_tab"
-			android:textSize="10dip"
-			/>
+				<Button
+					android:id="@+id/button_esc"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_escape_character"
+					android:text="Esc" />
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-			android:id="@+id/button_up"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_up"
-			android:padding="0dp"
-			android:text="@string/button_key_up"
-			android:textSize="10dip"
-			/>
+				<Button
+					android:id="@+id/button_tab"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_tab_character"
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+					android:text="Tab" />
 
-		<Button
-			android:id="@+id/button_down"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_down"
-			android:padding="0dp"
-			android:text="@string/button_key_down"
-			android:textSize="10dip"
-			/>
+				<View style="@style/KeyboardSeparator" />
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+				<Button
+					android:id="@+id/button_up"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_up"
 
-		<Button
-			android:id="@+id/button_left"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_left"
-			android:padding="0dp"
-			android:text="@string/button_key_left"
-			android:textSize="10dip"
-			/>
+					android:text="@string/button_key_up" />
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+				<View style="@style/KeyboardSeparator" />
 
-		<Button
-			android:id="@+id/button_right"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_right"
-			android:padding="0dp"
-			android:text="@string/button_key_right"
-			android:textSize="10dip"
-			/>
+				<Button
+					android:id="@+id/button_down"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_down"
+					android:text="@string/button_key_down" />
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_left"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_left"
+					android:text="@string/button_key_left" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_right"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_right"
+					android:text="@string/button_key_right" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_home"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_home" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_end"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_end" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_pgup"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgup" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_pgdn"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgdn" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f1"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f1"
+
+					/>
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f2"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f2" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f3"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f3" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f4"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f4" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f5"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f5" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f6"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f6" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f7"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f7" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f8"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f8" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f9"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f9" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f10"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f10" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f11"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f11" />
+
+				<View style="@style/KeyboardSeparator" />
+
+				<Button
+					android:id="@+id/button_f12"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f12" />
+			</LinearLayout>
+		</HorizontalScrollView>
+
+		<View style="@style/KeyboardSeparator" />
 
 		<ImageView
 			android:id="@+id/button_keyboard"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
+			style="@style/KeyboardKey"
+			android:background="#55b0b0f0"
 			android:contentDescription="@string/image_description_show_keyboard"
-			android:padding="0dp"
-			android:src="@drawable/button_keyboard"
-			android:background="#55f0f0f0"
-			android:textSize="10dip"
-			/>
-
+			android:src="@drawable/button_keyboard" />
 	</LinearLayout>
 
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2ce2e7..b0b9e51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -548,4 +548,37 @@
 	<string name="button_key_ctrl">Ctrl</string>
 	<!-- Text for the "Tab" button in virtual keyboard. -->
 	<string name="button_key_tab">Tab</string>
+
+	<!-- Text for the "Home" button in virtual keyboard. -->
+	<string name="button_key_home">Home</string>
+	<!-- Text for the "End" button in virtual keyboard. -->
+	<string name="button_key_end">End</string>
+	<!-- Text for the "Page Up" button in virtual keyboard. -->
+	<string name="button_key_pgup">PgUp</string>
+	<!-- Text for the "Page Down" button in virtual keyboard. -->
+	<string name="button_key_pgdn">PgDn</string>
+	<!-- Text for the "F1" button in virtual keyboard. -->
+	<string name="button_key_f1">F1</string>
+	<!-- Text for the "F2" button in virtual keyboard. -->
+	<string name="button_key_f2">F2</string>
+	<!-- Text for the "F3" button in virtual keyboard. -->
+	<string name="button_key_f3">F3</string>
+	<!-- Text for the "F4" button in virtual keyboard. -->
+	<string name="button_key_f4">F4</string>
+	<!-- Text for the "F5" button in virtual keyboard. -->
+	<string name="button_key_f5">F5</string>
+	<!-- Text for the "F6" button in virtual keyboard. -->
+	<string name="button_key_f6">F6</string>
+	<!-- Text for the "F7" button in virtual keyboard. -->
+	<string name="button_key_f7">F7</string>
+	<!-- Text for the "F8" button in virtual keyboard. -->
+	<string name="button_key_f8">F8</string>
+	<!-- Text for the "F9" button in virtual keyboard. -->
+	<string name="button_key_f9">F9</string>
+	<!-- Text for the "F10" button in virtual keyboard. -->
+	<string name="button_key_f10">F10</string>
+	<!-- Text for the "F11" button in virtual keyboard. -->
+	<string name="button_key_f11">F11</string>
+	<!-- Text for the "F12" button in virtual keyboard. -->
+	<string name="button_key_f12">F12</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f0cd073..d158362 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,4 +22,24 @@
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowContentOverlay">@null</item>
 	</style>
+
+	<style name="KeyboardKey">
+		<item name="android:layout_width">45dip</item>
+		<item name="android:layout_height">30dip</item>
+		<item name="android:layout_margin">0dp</item>
+		<item name="android:padding">0dp</item>
+		<item name="android:textSize">10sp</item>
+	</style>
+
+
+	<style name="KeyboardButton" parent="KeyboardKey">
+		<item name="android:background">#55f0f0f0</item>
+	</style>
+
+
+	<style name="KeyboardSeparator">
+		<item name="android:layout_width">1dip</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:background">#90000000</item>
+	</style>
 </resources>
-- 
cgit v1.2.3


From 90ae8d41511323f7446d79d5469eb9eaaf64c291 Mon Sep 17 00:00:00 2001
From: adb2001 <adb2001@hotmail.com>
Date: Sun, 16 Aug 2015 09:37:13 +0200
Subject: Format XML and correct missing @string

---
 app/src/main/res/layout-large/act_console.xml |  98 +++++-----
 app/src/main/res/layout/act_console.xml       | 248 +++++++++++++-------------
 2 files changed, 169 insertions(+), 177 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index 110b4bf..1f8c51f 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -164,182 +164,178 @@
 						android:id="@+id/button_ctrl"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_toggle_control_character"
-						android:text="@string/button_key_ctrl" />
+						android:text="@string/button_key_ctrl"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_esc"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_send_escape_character"
-						android:text="Esc" />
+						android:text="@string/button_key_esc"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_tab"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_send_tab_character"
+						android:text="@string/button_key_tab"/>
 
-						android:text="Tab" />
-
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_up"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_up"
+						android:text="@string/button_key_up"/>
 
-						android:text="@string/button_key_up" />
-
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_down"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_down"
-						android:text="@string/button_key_down" />
+						android:text="@string/button_key_down"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_left"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_left"
-						android:text="@string/button_key_left" />
+						android:text="@string/button_key_left"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_right"
 						style="@style/KeyboardButton"
 						android:contentDescription="@string/image_description_right"
-						android:text="@string/button_key_right" />
+						android:text="@string/button_key_right"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_home"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_home" />
+						android:text="@string/button_key_home"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_end"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_end" />
+						android:text="@string/button_key_end"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_pgup"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgup" />
+						android:text="@string/button_key_pgup"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_pgdn"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgdn" />
+						android:text="@string/button_key_pgdn"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f1"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f1"
-
-						/>
+						android:text="@string/button_key_f1"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f2"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f2" />
+						android:text="@string/button_key_f2"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f3"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f3" />
+						android:text="@string/button_key_f3"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f4"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f4" />
+						android:text="@string/button_key_f4"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f5"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f5" />
+						android:text="@string/button_key_f5"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f6"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f6" />
+						android:text="@string/button_key_f6"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f7"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f7" />
+						android:text="@string/button_key_f7"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f8"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f8" />
+						android:text="@string/button_key_f8"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f9"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f9" />
+						android:text="@string/button_key_f9"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f10"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f10" />
+						android:text="@string/button_key_f10"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f11"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f11" />
+						android:text="@string/button_key_f11"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
 						android:id="@+id/button_f12"
 						style="@style/KeyboardButton"
-						android:text="@string/button_key_f12" />
+						android:text="@string/button_key_f12"/>
 			</LinearLayout>
 		</HorizontalScrollView>
 
-		<View style="@style/KeyboardSeparator" />
+		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
 				android:id="@+id/button_keyboard"
 				style="@style/KeyboardKey"
 				android:background="#55b0b0f0"
 				android:contentDescription="@string/image_description_show_keyboard"
-				android:src="@drawable/button_keyboard" />
+				android:src="@drawable/button_keyboard"/>
 	</LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index c268d51..a734882 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -121,209 +121,205 @@
 	</RelativeLayout>
 
 	<LinearLayout
-		android:id="@+id/keyboard_group"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:background="#55000000"
-		android:orientation="horizontal"
-		android:padding="0dip"
-		android:visibility="gone">
+			android:id="@+id/keyboard_group"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:background="#55000000"
+			android:orientation="horizontal"
+			android:padding="0dip"
+			android:visibility="gone">
 
 		<HorizontalScrollView
-			android:id="@+id/keyboard_hscroll"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:padding="0dp"
-			android:scrollbars="none">
-
-			<LinearLayout
+				android:id="@+id/keyboard_hscroll"
 				android:layout_width="0dp"
 				android:layout_height="match_parent"
-				android:orientation="horizontal"
-				android:padding="0dp">
+				android:layout_weight="1"
+				android:padding="0dp"
+				android:scrollbars="none">
+
+			<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:orientation="horizontal"
+					android:padding="0dp">
 
 				<Button
-					android:id="@+id/button_ctrl"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_toggle_control_character"
-					android:text="@string/button_key_ctrl" />
+						android:id="@+id/button_ctrl"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_toggle_control_character"
+						android:text="@string/button_key_ctrl"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_esc"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_send_escape_character"
-					android:text="Esc" />
+						android:id="@+id/button_esc"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_send_escape_character"
+						android:text="@string/button_key_esc"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_tab"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_send_tab_character"
+						android:id="@+id/button_tab"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_send_tab_character"
+						android:text="@string/button_key_tab"/>
 
-					android:text="Tab" />
-
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_up"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_up"
-
-					android:text="@string/button_key_up" />
+						android:id="@+id/button_up"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_up"
+						android:text="@string/button_key_up"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_down"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_down"
-					android:text="@string/button_key_down" />
+						android:id="@+id/button_down"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_down"
+						android:text="@string/button_key_down"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_left"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_left"
-					android:text="@string/button_key_left" />
+						android:id="@+id/button_left"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_left"
+						android:text="@string/button_key_left"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_right"
-					style="@style/KeyboardButton"
-					android:contentDescription="@string/image_description_right"
-					android:text="@string/button_key_right" />
+						android:id="@+id/button_right"
+						style="@style/KeyboardButton"
+						android:contentDescription="@string/image_description_right"
+						android:text="@string/button_key_right"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_home"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_home" />
+						android:id="@+id/button_home"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_home"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_end"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_end" />
+						android:id="@+id/button_end"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_end"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_pgup"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_pgup" />
+						android:id="@+id/button_pgup"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_pgup"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_pgdn"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_pgdn" />
+						android:id="@+id/button_pgdn"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_pgdn"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f1"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f1"
-
-					/>
+						android:id="@+id/button_f1"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f1"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f2"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f2" />
+						android:id="@+id/button_f2"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f2"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f3"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f3" />
+						android:id="@+id/button_f3"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f3"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f4"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f4" />
+						android:id="@+id/button_f4"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f4"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f5"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f5" />
+						android:id="@+id/button_f5"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f5"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f6"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f6" />
+						android:id="@+id/button_f6"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f6"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f7"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f7" />
+						android:id="@+id/button_f7"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f7"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f8"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f8" />
+						android:id="@+id/button_f8"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f8"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f9"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f9" />
+						android:id="@+id/button_f9"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f9"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f10"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f10" />
+						android:id="@+id/button_f10"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f10"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f11"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f11" />
+						android:id="@+id/button_f11"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f11"/>
 
-				<View style="@style/KeyboardSeparator" />
+				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-					android:id="@+id/button_f12"
-					style="@style/KeyboardButton"
-					android:text="@string/button_key_f12" />
+						android:id="@+id/button_f12"
+						style="@style/KeyboardButton"
+						android:text="@string/button_key_f12"/>
 			</LinearLayout>
 		</HorizontalScrollView>
 
-		<View style="@style/KeyboardSeparator" />
+		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
-			android:id="@+id/button_keyboard"
-			style="@style/KeyboardKey"
-			android:background="#55b0b0f0"
-			android:contentDescription="@string/image_description_show_keyboard"
-			android:src="@drawable/button_keyboard" />
+				android:id="@+id/button_keyboard"
+				style="@style/KeyboardKey"
+				android:background="#55b0b0f0"
+				android:contentDescription="@string/image_description_show_keyboard"
+				android:src="@drawable/button_keyboard"/>
 	</LinearLayout>
 
 
-- 
cgit v1.2.3


From 3f7146bf87b79cc6fd48cf79b65933199e24e9ba Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Sat, 22 Aug 2015 16:27:22 +0200
Subject: Scroll keyboard back a forth to give a hint to user about the
 scrollable keyboard.  Handle repeatable arrow keys (easily extendable to
 other keys if needed).

---
 .../main/java/org/connectbot/ConsoleActivity.java  | 140 ++++++++++++++----
 app/src/main/res/layout-large/act_console.xml      |  46 +++---
 app/src/main/res/layout/act_console.xml            | 156 ++++++++++-----------
 3 files changed, 210 insertions(+), 132 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 294b8f3..ef47794 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -83,6 +83,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -99,6 +100,8 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 	private static final int CLICK_TIME = 400;
 	private static final float MAX_CLICK_DISTANCE = 25f;
 	private static final int KEYBOARD_DISPLAY_TIME = 3000;
+	private static final int KEYBOARD_REPEAT_INITIAL = 500;
+	private static final int KEYBOARD_REPEAT = 100;
 
 	protected ViewPager pager = null;
 	protected TabLayout tabs = null;
@@ -215,6 +218,59 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		}
 	};
 
+	protected Handler keyRepeatHandler = new Handler();
+
+
+	/**
+	 * Handle repeatable virtual keys and touch events
+	 */
+	public class KeyRepeater implements Runnable, OnTouchListener {
+		private View mView;
+		private Handler mHandler;
+		private boolean mDown;
+
+		public KeyRepeater(Handler handler, View view) {
+			mView = view;
+			mHandler = handler;
+			mView.setOnTouchListener(this);
+			mDown = false;
+		}
+
+		@Override
+		public void run() {
+			mDown = true;
+			mHandler.removeCallbacks(this);
+			mHandler.postDelayed(this, KEYBOARD_REPEAT);
+			onEmulatedKeyClicked(mView);
+		}
+
+		@Override
+		public boolean onTouch(View v, MotionEvent event) {
+			Log.d(TAG, "KeyRepeater.onTouch(" + v.getId() + ", " +
+					event.getAction() + ", " +
+					event.getActionIndex() + ", " +
+					event.getActionMasked() + ");");
+			switch (event.getAction()) {
+			case MotionEvent.ACTION_DOWN:
+				mDown = false;
+				mHandler.postDelayed(this, KEYBOARD_REPEAT_INITIAL);
+				return (true);
+
+			case MotionEvent.ACTION_CANCEL:
+				keyRepeatHandler.removeCallbacks(this);
+				return (true);
+
+			case MotionEvent.ACTION_UP:
+				keyRepeatHandler.removeCallbacks(this);
+				if (!mDown) {
+					onEmulatedKeyClicked(mView);
+				}
+				return (true);
+			}
+			return false;
+		}
+	}
+
 	private void onEmulatedKeyClicked(View v) {
 		TerminalView terminal = adapter.getCurrentTerminalView();
 		if (terminal == null) return;
@@ -222,7 +278,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		TerminalKeyListener handler = terminal.bridge.getKeyHandler();
 		boolean hideKeys = false;
 
-		switch (v.getId())	{
+		switch (v.getId()) {
 		case R.id.button_ctrl:
 			handler.metaPress(TerminalKeyListener.OUR_CTRL_ON, true);
 			hideKeys = true;
@@ -499,10 +555,12 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		findViewById(R.id.button_ctrl).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_esc).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_tab).setOnClickListener(emulatedKeysListener);
-		findViewById(R.id.button_up).setOnClickListener(emulatedKeysListener);
-		findViewById(R.id.button_down).setOnClickListener(emulatedKeysListener);
-		findViewById(R.id.button_left).setOnClickListener(emulatedKeysListener);
-		findViewById(R.id.button_right).setOnClickListener(emulatedKeysListener);
+
+		new KeyRepeater(keyRepeatHandler, findViewById(R.id.button_up));
+		new KeyRepeater(keyRepeatHandler, findViewById(R.id.button_down));
+		new KeyRepeater(keyRepeatHandler, findViewById(R.id.button_left));
+		new KeyRepeater(keyRepeatHandler, findViewById(R.id.button_right));
+
 		findViewById(R.id.button_home).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_end).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_pgup).setOnClickListener(emulatedKeysListener);
@@ -520,6 +578,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 		findViewById(R.id.button_f11).setOnClickListener(emulatedKeysListener);
 		findViewById(R.id.button_f12).setOnClickListener(emulatedKeysListener);
 
+
 		actionBar = ActionBarWrapper.getActionBar(this);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		if (titleBarHide) {
@@ -534,6 +593,25 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 			}
 		});
 
+		// Show virtual keyboard and scroll back and forth
+		final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
+		showEmulatedKeys();
+		keyboardScroll.postDelayed(new Runnable() {
+			@Override
+			public void run() {
+				final int xscroll = keyboardScroll.getMaxScrollAmount();
+				Log.d(TAG, "smoothScrollBy(1)");
+				keyboardScroll.smoothScrollBy(xscroll, 0);
+				keyboardScroll.postDelayed(new Runnable() {
+					@Override
+					public void run() {
+						Log.d(TAG, "smoothScrollBy(2)");
+						keyboardScroll.smoothScrollBy(-xscroll, 0);
+					}
+				}, 1000);
+			}
+		}, 1000);
+
 		tabs = (TabLayout) findViewById(R.id.tabs);
 		if (tabs != null)
 			tabs.setupWithViewPager(pager);
@@ -855,26 +933,26 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 
 				final View resizeView = inflater.inflate(R.layout.dia_resize, null, false);
 				new AlertDialog.Builder(ConsoleActivity.this)
-					.setView(resizeView)
-					.setPositiveButton(R.string.button_resize, new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							int width, height;
-							try {
-								width = Integer.parseInt(((EditText) resizeView
-										.findViewById(R.id.width))
-										.getText().toString());
-								height = Integer.parseInt(((EditText) resizeView
-										.findViewById(R.id.height))
-										.getText().toString());
-							} catch (NumberFormatException nfe) {
-								// TODO change this to a real dialog where we can
-								// make the input boxes turn red to indicate an error.
-								return;
+						.setView(resizeView)
+						.setPositiveButton(R.string.button_resize, new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int which) {
+								int width, height;
+								try {
+									width = Integer.parseInt(((EditText) resizeView
+											.findViewById(R.id.width))
+											.getText().toString());
+									height = Integer.parseInt(((EditText) resizeView
+											.findViewById(R.id.height))
+											.getText().toString());
+								} catch (NumberFormatException nfe) {
+									// TODO change this to a real dialog where we can
+									// make the input boxes turn red to indicate an error.
+									return;
+								}
+
+								terminalView.forceSize(width, height);
 							}
-
-							terminalView.forceSize(width, height);
-						}
-					}).setNegativeButton(android.R.string.cancel, null).create().show();
+						}).setNegativeButton(android.R.string.cancel, null).create().show();
 
 				return true;
 			}
@@ -919,13 +997,13 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-			case android.R.id.home:
-				Intent intent = new Intent(this, HostListActivity.class);
-				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				startActivity(intent);
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		case android.R.id.home:
+			Intent intent = new Intent(this, HostListActivity.class);
+			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(intent);
+			return true;
+		default:
+			return super.onOptionsItemSelected(item);
 		}
 	}
 
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index 1f8c51f..ea40714 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -26,27 +26,27 @@
 		android:background="#ff000000">
 
 	<android.support.v7.widget.Toolbar
+			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:id="@+id/toolbar"
 			android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
 
 	<android.support.design.widget.TabLayout
 			android:id="@+id/tabs"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:background="#222222"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			app:tabIndicatorColor="@android:color/white"
-			android:background="#222222"/>
+			app:tabIndicatorColor="@android:color/white"/>
 
 	<TextView
 			android:id="@android:id/empty"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:text="@string/terminal_no_hosts_connected"
-			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_below="@id/toolbar"
 			android:gravity="center"
-			android:layout_below="@id/toolbar"/>
+			android:text="@string/terminal_no_hosts_connected"
+			android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
 			android:id="@+id/console_flip"
@@ -60,29 +60,29 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_alignParentBottom="true"
-			android:padding="5dip"
 			android:background="#80000000"
 			android:fadingEdge="horizontal"
 			android:fadingEdgeLength="25dip"
+			android:padding="5dip"
 			android:visibility="gone"
 			>
 
 		<TextView
 				android:id="@+id/console_password_instructions"
+				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
+				android:layout_marginBottom="5dip"
 				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_width="fill_parent"
 				android:visibility="gone"
-				android:layout_marginBottom="5dip"
 				/>
 
 		<EditText
 				android:id="@+id/console_password"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
+				android:layout_below="@+id/console_password_instructions"
 				android:password="true"
 				android:singleLine="true"
-				android:layout_below="@+id/console_password_instructions"
 				/>
 
 	</RelativeLayout>
@@ -92,46 +92,46 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_alignParentBottom="true"
-			android:padding="5dip"
 			android:background="#80000000"
 			android:fadingEdge="horizontal"
 			android:fadingEdgeLength="25dip"
+			android:padding="5dip"
 			android:visibility="gone"
 			>
 
 		<TextView
 				android:id="@+id/console_prompt"
-				android:layout_height="wrap_content"
 				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
 		<Button
 				android:id="@+id/console_prompt_no"
-				android:text="@string/button_no"
-				android:paddingTop="5dip"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentEnd="true"
 				android:layout_alignParentRight="true"
 				android:layout_below="@+id/console_prompt"
 				android:clickable="false"
+				android:paddingBottom="10dip"
+				android:paddingLeft="40dip"
+				android:paddingRight="40dip"
+				android:paddingTop="5dip"
+				android:text="@string/button_no"
 				/>
 
 		<Button
 				android:id="@+id/console_prompt_yes"
-				android:text="@string/button_yes"
-				android:paddingTop="5dip"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_toLeftOf="@+id/console_prompt_no"
 				android:layout_below="@+id/console_prompt"
+				android:layout_toLeftOf="@+id/console_prompt_no"
+				android:paddingBottom="10dip"
+				android:paddingLeft="40dip"
+				android:paddingRight="40dip"
+				android:paddingTop="5dip"
+				android:text="@string/button_yes"
 				/>
 
 	</RelativeLayout>
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index a734882..8d29942 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -19,104 +19,104 @@
 -->
 
 <RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:background="#ff000000">
-
-	<TextView
-		android:id="@android:id/empty"
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:app="http://schemas.android.com/apk/res-auto"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:text="@string/terminal_no_hosts_connected"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"/>
+		android:background="#ff000000">
+
+	<TextView
+			android:id="@android:id/empty"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:gravity="center"
+			android:text="@string/terminal_no_hosts_connected"
+			android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
-		android:id="@+id/console_flip"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		/>
+			android:id="@+id/console_flip"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			/>
 
 	<RelativeLayout
-		android:id="@+id/console_password_group"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:padding="5dip"
-		android:background="#80000000"
-		android:fadingEdge="horizontal"
-		android:fadingEdgeLength="25dip"
-		android:visibility="gone"
-		>
-
-		<TextView
-			android:id="@+id/console_password_instructions"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:id="@+id/console_password_group"
 			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:background="#80000000"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="25dip"
+			android:padding="5dip"
 			android:visibility="gone"
-			android:layout_marginBottom="5dip"
-			/>
+			>
+
+		<TextView
+				android:id="@+id/console_password_instructions"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="5dip"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:visibility="gone"
+				/>
 
 		<EditText
-			android:id="@+id/console_password"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:password="true"
-			android:singleLine="true"
-			android:layout_below="@+id/console_password_instructions"
-			/>
+				android:id="@+id/console_password"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_below="@+id/console_password_instructions"
+				android:password="true"
+				android:singleLine="true"
+				/>
 
 	</RelativeLayout>
 
 	<RelativeLayout
-		android:id="@+id/console_boolean_group"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:padding="5dip"
-		android:background="#80000000"
-		android:fadingEdge="horizontal"
-		android:fadingEdgeLength="25dip"
-		android:visibility="gone"
-		>
+			android:id="@+id/console_boolean_group"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:background="#80000000"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="25dip"
+			android:padding="5dip"
+			android:visibility="gone"
+			>
 
 		<TextView
-			android:id="@+id/console_prompt"
-			android:layout_height="wrap_content"
-			android:layout_width="fill_parent"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			/>
+				android:id="@+id/console_prompt"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
 
 		<Button
-			android:id="@+id/console_prompt_no"
-			android:text="@string/button_no"
-			android:paddingTop="5dip"
-			android:paddingBottom="10dip"
-			android:paddingLeft="40dip"
-			android:paddingRight="40dip"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/console_prompt"
-			android:clickable="false"
-			/>
+				android:id="@+id/console_prompt_no"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentEnd="true"
+				android:layout_alignParentRight="true"
+				android:layout_below="@+id/console_prompt"
+				android:clickable="false"
+				android:paddingBottom="10dip"
+				android:paddingLeft="40dip"
+				android:paddingRight="40dip"
+				android:paddingTop="5dip"
+				android:text="@string/button_no"
+				/>
 
 		<Button
-			android:id="@+id/console_prompt_yes"
-			android:text="@string/button_yes"
-			android:paddingTop="5dip"
-			android:paddingBottom="10dip"
-			android:paddingLeft="40dip"
-			android:paddingRight="40dip"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toLeftOf="@+id/console_prompt_no"
-			android:layout_below="@+id/console_prompt"
-			/>
+				android:id="@+id/console_prompt_yes"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@+id/console_prompt"
+				android:layout_toLeftOf="@+id/console_prompt_no"
+				android:paddingBottom="10dip"
+				android:paddingLeft="40dip"
+				android:paddingRight="40dip"
+				android:paddingTop="5dip"
+				android:text="@string/button_yes"
+				/>
 
 	</RelativeLayout>
 
-- 
cgit v1.2.3


From e8786cac42d92f0efa32a84417b4470e79a96bb9 Mon Sep 17 00:00:00 2001
From: alescdb <alescdb@users.noreply.github.com>
Date: Sat, 22 Aug 2015 22:19:50 +0200
Subject: Scroll hint to the end (F12 key) Only show scroll hint if hard
 keyboard is not detected Conditional Log.d()

---
 .../main/java/org/connectbot/ConsoleActivity.java  | 50 +++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index ef47794..31ad68c 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -246,10 +246,12 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 
 		@Override
 		public boolean onTouch(View v, MotionEvent event) {
-			Log.d(TAG, "KeyRepeater.onTouch(" + v.getId() + ", " +
-					event.getAction() + ", " +
-					event.getActionIndex() + ", " +
-					event.getActionMasked() + ");");
+			if (BuildConfig.DEBUG) {
+				Log.d(TAG, "KeyRepeater.onTouch(" + v.getId() + ", " +
+						event.getAction() + ", " +
+						event.getActionIndex() + ", " +
+						event.getActionMasked() + ");");
+			}
 			switch (event.getAction()) {
 			case MotionEvent.ACTION_DOWN:
 				mDown = false;
@@ -593,24 +595,30 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe
 			}
 		});
 
-		// Show virtual keyboard and scroll back and forth
-		final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
-		showEmulatedKeys();
-		keyboardScroll.postDelayed(new Runnable() {
-			@Override
-			public void run() {
-				final int xscroll = keyboardScroll.getMaxScrollAmount();
-				Log.d(TAG, "smoothScrollBy(1)");
-				keyboardScroll.smoothScrollBy(xscroll, 0);
-				keyboardScroll.postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						Log.d(TAG, "smoothScrollBy(2)");
-						keyboardScroll.smoothScrollBy(-xscroll, 0);
+		if(!hardKeyboard) {
+			// Show virtual keyboard and scroll back and forth
+			final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
+			showEmulatedKeys();
+			keyboardScroll.postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					final int xscroll = findViewById(R.id.button_f12).getRight();
+					if (BuildConfig.DEBUG) {
+						Log.d(TAG, "smoothScrollBy(toEnd[" + xscroll + "])");
 					}
-				}, 1000);
-			}
-		}, 1000);
+					keyboardScroll.smoothScrollBy(xscroll, 0);
+					keyboardScroll.postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							if (BuildConfig.DEBUG) {
+								Log.d(TAG, "smoothScrollBy(toStart[" + (-xscroll) + "])");
+							}
+							keyboardScroll.smoothScrollBy(-xscroll, 0);
+						}
+					}, 1000);
+				}
+			}, 1000);
+		}
 
 		tabs = (TabLayout) findViewById(R.id.tabs);
 		if (tabs != null)
-- 
cgit v1.2.3


From e98be2246b94ddf742e7675048fb99409600c9d6 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 23 Aug 2015 21:43:32 -0700
Subject: Fix XML formatting

---
 app/src/main/res/layout-large/act_console.xml | 376 +++++++++++++-------------
 app/src/main/res/layout/act_console.xml       | 352 ++++++++++++------------
 2 files changed, 364 insertions(+), 364 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index ea40714..7c084fb 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -19,323 +19,323 @@
 -->
 
 <RelativeLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="#ff000000">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:background="#ff000000">
 
 	<android.support.v7.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
 
 	<android.support.design.widget.TabLayout
-			android:id="@+id/tabs"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="#222222"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			app:tabIndicatorColor="@android:color/white"/>
+		android:id="@+id/tabs"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="#222222"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		app:tabIndicatorColor="@android:color/white"/>
 
 	<TextView
-			android:id="@android:id/empty"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:layout_below="@id/toolbar"
-			android:gravity="center"
-			android:text="@string/terminal_no_hosts_connected"
-			android:textAppearance="?android:attr/textAppearanceMedium"/>
+		android:id="@android:id/empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_below="@id/toolbar"
+		android:gravity="center"
+		android:text="@string/terminal_no_hosts_connected"
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
-			android:id="@+id/console_flip"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:layout_below="@id/toolbar"
-			/>
+		android:id="@+id/console_flip"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_below="@id/toolbar"
+		/>
 
 	<RelativeLayout
-			android:id="@+id/console_password_group"
+		android:id="@+id/console_password_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
+
+		<TextView
+			android:id="@+id/console_password_instructions"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
-			android:padding="5dip"
+			android:layout_marginBottom="5dip"
+			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:visibility="gone"
-			>
-
-		<TextView
-				android:id="@+id/console_password_instructions"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="5dip"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:visibility="gone"
-				/>
+			/>
 
 		<EditText
-				android:id="@+id/console_password"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/console_password_instructions"
-				android:password="true"
-				android:singleLine="true"
-				/>
+			android:id="@+id/console_password"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_password_instructions"
+			android:password="true"
+			android:singleLine="true"
+			/>
 
 	</RelativeLayout>
 
 	<RelativeLayout
-			android:id="@+id/console_boolean_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
-			android:padding="5dip"
-			android:visibility="gone"
-			>
+		android:id="@+id/console_boolean_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
 
 		<TextView
-				android:id="@+id/console_prompt"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				/>
+			android:id="@+id/console_prompt"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_no"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentEnd="true"
-				android:layout_alignParentRight="true"
-				android:layout_below="@+id/console_prompt"
-				android:clickable="false"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:paddingTop="5dip"
-				android:text="@string/button_no"
-				/>
+			android:id="@+id/console_prompt_no"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/console_prompt"
+			android:clickable="false"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_no"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_yes"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/console_prompt"
-				android:layout_toLeftOf="@+id/console_prompt_no"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:paddingTop="5dip"
-				android:text="@string/button_yes"
-				/>
+			android:id="@+id/console_prompt_yes"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_prompt"
+			android:layout_toLeftOf="@+id/console_prompt_no"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_yes"
+			/>
 
 	</RelativeLayout>
 
 	<LinearLayout
-			android:id="@+id/keyboard_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#55000000"
-			android:orientation="horizontal"
-			android:padding="0dip"
-			android:visibility="gone">
+		android:id="@+id/keyboard_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#55000000"
+		android:orientation="horizontal"
+		android:padding="0dip"
+		android:visibility="gone">
 
 		<HorizontalScrollView
-				android:id="@+id/keyboard_hscroll"
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1"
-				android:padding="0dp"
-				android:scrollbars="none">
+			android:id="@+id/keyboard_hscroll"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:padding="0dp"
+			android:scrollbars="none">
 
 			<LinearLayout
-					android:layout_width="0dp"
-					android:layout_height="match_parent"
-					android:orientation="horizontal"
-					android:padding="0dp">
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:orientation="horizontal"
+				android:padding="0dp">
 
 				<Button
-						android:id="@+id/button_ctrl"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_toggle_control_character"
-						android:text="@string/button_key_ctrl"/>
+					android:id="@+id/button_ctrl"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_toggle_control_character"
+					android:text="@string/button_key_ctrl"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_esc"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_send_escape_character"
-						android:text="@string/button_key_esc"/>
+					android:id="@+id/button_esc"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_escape_character"
+					android:text="@string/button_key_esc"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_tab"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_send_tab_character"
-						android:text="@string/button_key_tab"/>
+					android:id="@+id/button_tab"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_tab_character"
+					android:text="@string/button_key_tab"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_up"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_up"
-						android:text="@string/button_key_up"/>
+					android:id="@+id/button_up"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_up"
+					android:text="@string/button_key_up"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_down"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_down"
-						android:text="@string/button_key_down"/>
+					android:id="@+id/button_down"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_down"
+					android:text="@string/button_key_down"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_left"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_left"
-						android:text="@string/button_key_left"/>
+					android:id="@+id/button_left"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_left"
+					android:text="@string/button_key_left"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_right"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_right"
-						android:text="@string/button_key_right"/>
+					android:id="@+id/button_right"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_right"
+					android:text="@string/button_key_right"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_home"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_home"/>
+					android:id="@+id/button_home"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_home"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_end"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_end"/>
+					android:id="@+id/button_end"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_end"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_pgup"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgup"/>
+					android:id="@+id/button_pgup"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgup"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_pgdn"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgdn"/>
+					android:id="@+id/button_pgdn"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgdn"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f1"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f1"/>
+					android:id="@+id/button_f1"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f1"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f2"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f2"/>
+					android:id="@+id/button_f2"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f2"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f3"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f3"/>
+					android:id="@+id/button_f3"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f3"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f4"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f4"/>
+					android:id="@+id/button_f4"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f4"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f5"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f5"/>
+					android:id="@+id/button_f5"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f5"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f6"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f6"/>
+					android:id="@+id/button_f6"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f6"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f7"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f7"/>
+					android:id="@+id/button_f7"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f7"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f8"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f8"/>
+					android:id="@+id/button_f8"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f8"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f9"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f9"/>
+					android:id="@+id/button_f9"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f9"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f10"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f10"/>
+					android:id="@+id/button_f10"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f10"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f11"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f11"/>
+					android:id="@+id/button_f11"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f11"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f12"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f12"/>
+					android:id="@+id/button_f12"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f12"/>
 			</LinearLayout>
 		</HorizontalScrollView>
 
 		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
-				android:id="@+id/button_keyboard"
-				style="@style/KeyboardKey"
-				android:background="#55b0b0f0"
-				android:contentDescription="@string/image_description_show_keyboard"
-				android:src="@drawable/button_keyboard"/>
+			android:id="@+id/button_keyboard"
+			style="@style/KeyboardKey"
+			android:background="#55b0b0f0"
+			android:contentDescription="@string/image_description_show_keyboard"
+			android:src="@drawable/button_keyboard"/>
 	</LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index 8d29942..4bc5ccb 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -19,307 +19,307 @@
 -->
 
 <RelativeLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="#ff000000">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:background="#ff000000">
 
 	<TextView
-			android:id="@android:id/empty"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:gravity="center"
-			android:text="@string/terminal_no_hosts_connected"
-			android:textAppearance="?android:attr/textAppearanceMedium"/>
+		android:id="@android:id/empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:gravity="center"
+		android:text="@string/terminal_no_hosts_connected"
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
-			android:id="@+id/console_flip"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			/>
+		android:id="@+id/console_flip"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		/>
 
 	<RelativeLayout
-			android:id="@+id/console_password_group"
+		android:id="@+id/console_password_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
+
+		<TextView
+			android:id="@+id/console_password_instructions"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
-			android:padding="5dip"
+			android:layout_marginBottom="5dip"
+			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:visibility="gone"
-			>
-
-		<TextView
-				android:id="@+id/console_password_instructions"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="5dip"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:visibility="gone"
-				/>
+			/>
 
 		<EditText
-				android:id="@+id/console_password"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/console_password_instructions"
-				android:password="true"
-				android:singleLine="true"
-				/>
+			android:id="@+id/console_password"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_password_instructions"
+			android:password="true"
+			android:singleLine="true"
+			/>
 
 	</RelativeLayout>
 
 	<RelativeLayout
-			android:id="@+id/console_boolean_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
-			android:padding="5dip"
-			android:visibility="gone"
-			>
+		android:id="@+id/console_boolean_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
 
 		<TextView
-				android:id="@+id/console_prompt"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				/>
+			android:id="@+id/console_prompt"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_no"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentEnd="true"
-				android:layout_alignParentRight="true"
-				android:layout_below="@+id/console_prompt"
-				android:clickable="false"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:paddingTop="5dip"
-				android:text="@string/button_no"
-				/>
+			android:id="@+id/console_prompt_no"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/console_prompt"
+			android:clickable="false"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_no"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_yes"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/console_prompt"
-				android:layout_toLeftOf="@+id/console_prompt_no"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:paddingTop="5dip"
-				android:text="@string/button_yes"
-				/>
+			android:id="@+id/console_prompt_yes"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_prompt"
+			android:layout_toLeftOf="@+id/console_prompt_no"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_yes"
+			/>
 
 	</RelativeLayout>
 
 	<LinearLayout
-			android:id="@+id/keyboard_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#55000000"
-			android:orientation="horizontal"
-			android:padding="0dip"
-			android:visibility="gone">
+		android:id="@+id/keyboard_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#55000000"
+		android:orientation="horizontal"
+		android:padding="0dip"
+		android:visibility="gone">
 
 		<HorizontalScrollView
-				android:id="@+id/keyboard_hscroll"
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1"
-				android:padding="0dp"
-				android:scrollbars="none">
+			android:id="@+id/keyboard_hscroll"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:padding="0dp"
+			android:scrollbars="none">
 
 			<LinearLayout
-					android:layout_width="0dp"
-					android:layout_height="match_parent"
-					android:orientation="horizontal"
-					android:padding="0dp">
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:orientation="horizontal"
+				android:padding="0dp">
 
 				<Button
-						android:id="@+id/button_ctrl"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_toggle_control_character"
-						android:text="@string/button_key_ctrl"/>
+					android:id="@+id/button_ctrl"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_toggle_control_character"
+					android:text="@string/button_key_ctrl"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_esc"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_send_escape_character"
-						android:text="@string/button_key_esc"/>
+					android:id="@+id/button_esc"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_escape_character"
+					android:text="@string/button_key_esc"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_tab"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_send_tab_character"
-						android:text="@string/button_key_tab"/>
+					android:id="@+id/button_tab"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_send_tab_character"
+					android:text="@string/button_key_tab"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_up"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_up"
-						android:text="@string/button_key_up"/>
+					android:id="@+id/button_up"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_up"
+					android:text="@string/button_key_up"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_down"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_down"
-						android:text="@string/button_key_down"/>
+					android:id="@+id/button_down"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_down"
+					android:text="@string/button_key_down"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_left"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_left"
-						android:text="@string/button_key_left"/>
+					android:id="@+id/button_left"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_left"
+					android:text="@string/button_key_left"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_right"
-						style="@style/KeyboardButton"
-						android:contentDescription="@string/image_description_right"
-						android:text="@string/button_key_right"/>
+					android:id="@+id/button_right"
+					style="@style/KeyboardButton"
+					android:contentDescription="@string/image_description_right"
+					android:text="@string/button_key_right"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_home"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_home"/>
+					android:id="@+id/button_home"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_home"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_end"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_end"/>
+					android:id="@+id/button_end"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_end"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_pgup"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgup"/>
+					android:id="@+id/button_pgup"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgup"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_pgdn"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_pgdn"/>
+					android:id="@+id/button_pgdn"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_pgdn"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f1"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f1"/>
+					android:id="@+id/button_f1"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f1"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f2"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f2"/>
+					android:id="@+id/button_f2"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f2"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f3"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f3"/>
+					android:id="@+id/button_f3"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f3"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f4"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f4"/>
+					android:id="@+id/button_f4"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f4"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f5"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f5"/>
+					android:id="@+id/button_f5"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f5"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f6"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f6"/>
+					android:id="@+id/button_f6"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f6"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f7"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f7"/>
+					android:id="@+id/button_f7"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f7"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f8"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f8"/>
+					android:id="@+id/button_f8"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f8"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f9"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f9"/>
+					android:id="@+id/button_f9"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f9"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f10"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f10"/>
+					android:id="@+id/button_f10"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f10"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f11"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f11"/>
+					android:id="@+id/button_f11"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f11"/>
 
 				<View style="@style/KeyboardSeparator"/>
 
 				<Button
-						android:id="@+id/button_f12"
-						style="@style/KeyboardButton"
-						android:text="@string/button_key_f12"/>
+					android:id="@+id/button_f12"
+					style="@style/KeyboardButton"
+					android:text="@string/button_key_f12"/>
 			</LinearLayout>
 		</HorizontalScrollView>
 
 		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
-				android:id="@+id/button_keyboard"
-				style="@style/KeyboardKey"
-				android:background="#55b0b0f0"
-				android:contentDescription="@string/image_description_show_keyboard"
-				android:src="@drawable/button_keyboard"/>
+			android:id="@+id/button_keyboard"
+			style="@style/KeyboardKey"
+			android:background="#55b0b0f0"
+			android:contentDescription="@string/image_description_show_keyboard"
+			android:src="@drawable/button_keyboard"/>
 	</LinearLayout>
 
 
-- 
cgit v1.2.3


From 7e2c347ad188740612478df51e12e7b7c87980a6 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 23 Aug 2015 22:07:48 -0700
Subject: Move keyboard buttons to styles.xml

This will make it easier to merge to hscroll change from @alescdb
---
 app/src/main/res/layout-large/act_console.xml | 120 ++++---------------
 app/src/main/res/layout/act_console.xml       | 162 +++++++-------------------
 app/src/main/res/values/styles.xml            |  41 +++++++
 3 files changed, 106 insertions(+), 217 deletions(-)
 create mode 100644 app/src/main/res/values/styles.xml

(limited to 'app/src')

diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index 44d15af..c246bf2 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -147,136 +147,60 @@
 
 		<Button
 			android:id="@+id/button_ctrl"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_toggle_control_character"
-			android:padding="0dp"
-			android:text="@string/button_key_ctrl"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_ctrl"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<Button
 			android:id="@+id/button_esc"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_send_escape_character"
-			android:padding="0dp"
-			android:text="@string/button_key_esc"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_esc"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<Button
 			android:id="@+id/button_tab"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_send_tab_character"
-			android:padding="0dp"
-			android:text="@string/button_key_tab"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_tab"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<Button
 			android:id="@+id/button_up"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_up"
-			android:padding="0dp"
-			android:text="@string/button_key_up"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_up"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<Button
 			android:id="@+id/button_down"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_down"
-			android:padding="0dp"
-			android:text="@string/button_key_down"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_down"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<Button
 			android:id="@+id/button_left"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_left"
-			android:padding="0dp"
-			android:text="@string/button_key_left"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_left"/>
+
+		<View style="@style/KeyboardSeparator"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
 
 		<Button
 			android:id="@+id/button_right"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
+			style="@style/KeyboardButton"
 			android:contentDescription="@string/image_description_right"
-			android:padding="0dp"
-			android:text="@string/button_key_right"
-			android:textSize="10dip"
-			/>
+			android:text="@string/button_key_right"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
 			android:id="@+id/button_keyboard"
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index 8787265..0edae8c 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -129,138 +129,62 @@
 		android:padding="0dip"
 		android:visibility="gone">
 
-		<Button
-			android:id="@+id/button_ctrl"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_toggle_control_character"
-			android:padding="0dp"
-			android:text="@string/button_key_ctrl"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_ctrl"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_toggle_control_character"
+				android:text="@string/button_key_ctrl"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_esc"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_send_escape_character"
-			android:padding="0dp"
-			android:text="@string/button_key_esc"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_esc"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_send_escape_character"
+				android:text="@string/button_key_esc"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_tab"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_send_tab_character"
-			android:padding="0dp"
-			android:text="@string/button_key_tab"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_tab"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_send_tab_character"
+				android:text="@string/button_key_tab"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_up"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_up"
-			android:padding="0dp"
-			android:text="@string/button_key_up"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_up"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_up"
+				android:text="@string/button_key_up"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_down"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_down"
-			android:padding="0dp"
-			android:text="@string/button_key_down"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_down"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_down"
+				android:text="@string/button_key_down"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_left"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_left"
-			android:padding="0dp"
-			android:text="@string/button_key_left"
-			android:textSize="10dip"
-			/>
+			<Button
+				android:id="@+id/button_left"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_left"
+				android:text="@string/button_key_left"/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<View style="@style/KeyboardSeparator"/>
 
-		<Button
-			android:id="@+id/button_right"
-			android:layout_width="0px"
-			android:layout_height="30dip"
-			android:layout_margin="0dp"
-			android:layout_weight="1"
-			android:background="#55f0f0f0"
-			android:contentDescription="@string/image_description_right"
-			android:padding="0dp"
-			android:text="@string/button_key_right"
-			android:textSize="10dip"
-			/>
 
-		<View
-			android:layout_width="1dp"
-			android:layout_height="match_parent"
-			android:background="#90000000"
-			/>
+			<Button
+				android:id="@+id/button_right"
+				style="@style/KeyboardButton"
+				android:contentDescription="@string/image_description_right"
+				android:text="@string/button_key_right"/>
+
+		<View style="@style/KeyboardSeparator"/>
 
 		<ImageView
 			android:id="@+id/button_keyboard"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..3ad5fc0
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,41 @@
+<?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.
+ */
+-->
+<resources>
+
+	<style name="KeyboardKey">
+		<item name="android:layout_width">45dip</item>
+		<item name="android:layout_height">30dip</item>
+		<item name="android:layout_margin">0dp</item>
+		<item name="android:padding">0dp</item>
+		<item name="android:textSize">10sp</item>
+	</style>
+
+
+	<style name="KeyboardButton" parent="KeyboardKey">
+		<item name="android:background">#55f0f0f0</item>
+	</style>
+
+
+	<style name="KeyboardSeparator">
+		<item name="android:layout_width">1dip</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:background">#90000000</item>
+	</style>
+</resources>
-- 
cgit v1.2.3


From 5f52f3ec4ce648e7afbcf5156ffa45a985956e0d Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 23 Aug 2015 22:38:06 -0700
Subject: Fix checkstyle violation

---
 app/src/main/java/org/connectbot/ConsoleActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 2076e1a..9ac0c95 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -596,7 +596,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 			}
 		});
 
-		if(!hardKeyboard) {
+		if (!hardKeyboard) {
 			// Show virtual keyboard and scroll back and forth
 			final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
 			showEmulatedKeys();
-- 
cgit v1.2.3