Merge remote-tracking branch 'upstream/master'

1 files changed, 274 insertions, 250 deletions

diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index a3f95f4..c368d09 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -17,255 +17,279 @@
  */
 -->
 
-<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">
-
-    <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.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" />
-
-    <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.support.v4.view.ViewPager
-        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: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_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" />
-
-    </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">
-
-        <TextView
-            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" />
-
-        <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" />
-
-    </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: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" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#90000000" />
-
-        <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" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#90000000" />
-
-        <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" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#90000000" />
-
-        <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" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#90000000" />
-
-        <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" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="#90000000" />
-
-        <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" />
-
-        <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"
-            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" />
-
-        <ImageView
-            android:id="@+id/button_keyboard"
-            android:layout_width="0px"
-            android:layout_height="30dip"
-            android:layout_margin="0dp"
-            android:layout_weight="1"
-            android:background="#55f0f0f0"
-            android:contentDescription="@string/image_description_show_keyboard"
-            android:padding="0dp"
-            android:src="@drawable/button_keyboard"
-            android:textSize="10dip" />
-
-    </LinearLayout>
+<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">
+
+	<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.support.design.widget.TabLayout
+		android:id="@+id/tabs"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/colorPrimary"
+		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.support.v4.view.ViewPager
+		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: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_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"
+			/>
+
+	</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"
+		>
+
+		<TextView
+			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"
+			/>
+
+		<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"
+			/>
+
+	</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: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"
+			/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
+
+		<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"
+			/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
+
+		<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"
+			/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
+
+		<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"
+			/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
+
+		<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"
+			/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
+
+		<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"
+			/>
+
+		<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"
+			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"
+			/>
+
+		<ImageView
+			android:id="@+id/button_keyboard"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_show_keyboard"
+			android:padding="0dp"
+			android:src="@drawable/button_keyboard"
+			android:textSize="10dip"
+			/>
+
+	</LinearLayout>
 
 </RelativeLayout>