From ecf0d1459a1544e989774fd9ddab32138905f28e Mon Sep 17 00:00:00 2001
From: Kyle Horimoto <khorimoto@gmail.com>
Date: Fri, 4 Sep 2015 14:16:32 -0700
Subject: Fix lint errors, make only one file.

---
 app/src/main/res/layout-land/item_host.xml | 72 ----------------------------
 app/src/main/res/layout-port/item_host.xml | 71 ----------------------------
 app/src/main/res/layout/item_host.xml      | 76 ++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 143 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/item_host.xml
 delete mode 100644 app/src/main/res/layout-port/item_host.xml
 create mode 100644 app/src/main/res/layout/item_host.xml

(limited to 'app/src')

diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
deleted file mode 100644
index a6e60d3..0000000
--- a/app/src/main/res/layout-land/item_host.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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.
- */
--->
-
-<RelativeLayout
-	android:id="@android:id/content"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:minHeight="72dp"
-	>
-
-	<ImageView
-		android:id="@android:id/icon"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:layout_marginRight="16dp"
-		android:contentDescription="@string/image_description_connected"
-		android:src="@drawable/connected"
-		/>
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:orientation="vertical"
-		android:layout_toLeftOf="@android:id/icon"
-		>
-
-		<TextView
-			android:id="@android:id/text1"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:paddingTop="20dp"
-			android:textAppearance="@style/ListItemFirstLineText"
-			/>
-
-		<TextView
-			android:id="@android:id/text2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingBottom="20dp"
-			android:textAppearance="@style/ListItemSecondLineText"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
deleted file mode 100644
index e9685b5..0000000
--- a/app/src/main/res/layout-port/item_host.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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.
- */
--->
-
-<RelativeLayout android:id="@android:id/content"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:minHeight="72dp"
-	>
-
-	<ImageView
-		android:id="@android:id/icon"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:layout_marginRight="16dp"
-		android:contentDescription="@string/image_description_connected"
-		android:src="@drawable/connected"
-		/>
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:orientation="vertical"
-		android:layout_toLeftOf="@android:id/icon"
-		>
-
-		<TextView
-			android:id="@android:id/text1"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:paddingTop="20dp"
-			android:textAppearance="@style/ListItemFirstLineText"
-			/>
-
-		<TextView
-			android:id="@android:id/text2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingBottom="20dp"
-			android:textAppearance="@style/ListItemSecondLineText"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_host.xml b/app/src/main/res/layout/item_host.xml
new file mode 100644
index 0000000..56c3d34
--- /dev/null
+++ b/app/src/main/res/layout/item_host.xml
@@ -0,0 +1,76 @@
+<?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.
+  -->
+
+<RelativeLayout
+    android:id="@android:id/content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="72dp"
+    >
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:contentDescription="@string/image_description_connected"
+        android:src="@drawable/connected"
+        />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:orientation="vertical"
+        android:layout_toStartOf="@android:id/icon"
+        android:layout_toLeftOf="@android:id/icon"
+        >
+
+        <TextView
+            android:id="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:paddingTop="20dp"
+            android:textAppearance="@style/ListItemFirstLineText"
+            />
+
+        <TextView
+            android:id="@android:id/text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="20dp"
+            android:textAppearance="@style/ListItemSecondLineText"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>
-- 
cgit v1.2.3