aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorRyan Hansberry <hansberry@google.com>2015-09-17 13:09:48 -0700
committerRyan Hansberry <hansberry@google.com>2015-09-17 13:09:48 -0700
commit83673e2a25130eea74faf0d3ae01c1786449d481 (patch)
tree20e9a74af1b5203ede4fa7652f7f52e166cd7abc /app/src/main/res/layout
parentf8a77f6d7ee4e8093525a9c5da4bb80fa41a1e72 (diff)
parentafaf6ea6a1a06a8b11fcbd75faa94e65049fabfe (diff)
downloadconnectbot-83673e2a25130eea74faf0d3ae01c1786449d481.tar.gz
connectbot-83673e2a25130eea74faf0d3ae01c1786449d481.tar.bz2
connectbot-83673e2a25130eea74faf0d3ae01c1786449d481.zip
Merge branch 'master' into use-switches-not-checkboxes
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/act_hostlist.xml7
-rw-r--r--app/src/main/res/layout/item_host.xml1
2 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml
index 647563c..bf80b1d 100644
--- a/app/src/main/res/layout/act_hostlist.xml
+++ b/app/src/main/res/layout/act_hostlist.xml
@@ -53,16 +53,15 @@
android:singleLine="true"/>
</LinearLayout>
-
- <ListView
- android:id="@android:id/list"
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@+id/quickconnect"
/>
<TextView
- android:id="@android:id/empty"
+ android:id="@+id/empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@+id/quickconnect"
diff --git a/app/src/main/res/layout/item_host.xml b/app/src/main/res/layout/item_host.xml
index 8c9f9fc..d39da8d 100644
--- a/app/src/main/res/layout/item_host.xml
+++ b/app/src/main/res/layout/item_host.xml
@@ -23,6 +23,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="72dp"
+ style="@style/SelectableItem"
>
<ImageView