From 6ef56cfec3ce625d1a16ca960417dac19ebca45c Mon Sep 17 00:00:00 2001
From: Alexandre Del Bigio <alescdb@users.noreply.github.com>
Date: Thu, 3 Sep 2015 13:56:17 +0200
Subject: Set Activity title to connection nick name

---
 .../main/java/org/connectbot/ConsoleActivity.java  |  1 +
 .../drawable-xhdpi/keyboard_keyboard_border.xml    | 27 ++++++++++++++++++++++
 app/src/main/res/layout/inc_keyboard.xml           |  2 +-
 app/src/main/res/values/colors.xml                 |  1 -
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/keyboard_keyboard_border.xml

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 5dc741f..ae5e3a7 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -1250,6 +1250,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 			return;
 		}
 		bound.defaultBridge = view.bridge;
+		setTitle(view.bridge.host.getNickname());
 	}
 
 	protected void updateEmptyVisible() {
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_keyboard_border.xml b/app/src/main/res/drawable-xhdpi/keyboard_keyboard_border.xml
new file mode 100644
index 0000000..3146ce4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/keyboard_keyboard_border.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ Copyright 2015 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.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="rectangle">
+      <stroke
+          android:width="1dp"
+          android:color="@color/key_separator" />
+      <solid android:color="@color/keyboard_background" />
+    </shape>
+  </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/inc_keyboard.xml b/app/src/main/res/layout/inc_keyboard.xml
index 27dbaa6..945e1b9 100644
--- a/app/src/main/res/layout/inc_keyboard.xml
+++ b/app/src/main/res/layout/inc_keyboard.xml
@@ -167,7 +167,7 @@
 	<ImageView
 		android:id="@+id/button_keyboard"
 		style="@style/KeyboardKey"
-		android:background="@color/keyboard_background"
+		android:background="@drawable/keyboard_keyboard_border"
 		android:contentDescription="@string/image_description_show_keyboard"
 		android:src="@drawable/ic_keyboard_white"/>
 </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6f3eb1c..eb99202 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,5 +22,4 @@
 	<color name="key_background_layout">#55000000</color>
 	<color name="key_separator">#00000000</color>
 	<color name="keyboard_background">#55b0b0f0</color>
-	<color name="colorPrimary">#ffffffff</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3