app: harden mirroring lifecycle and state

1 files changed, 7 insertions, 21 deletions

diff --git a/app/src/main/res/layout/device_row.xml b/app/src/main/res/layout/device_row.xml
index f06ab20..0471639 100644
--- a/app/src/main/res/layout/device_row.xml
+++ b/app/src/main/res/layout/device_row.xml
@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Saved-device row: phone glyph + "host:port" label, with the platform
-     touch ripple. Bound by an ArrayAdapter via R.id.device_label. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Saved-device row with a platform touch ripple. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/device_label"
+    style="@style/DeviceLabel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:gravity="center_vertical"
     android:minHeight="56dp"
     android:paddingHorizontal="@dimen/space_sm"
     android:paddingVertical="@dimen/space_md"
-    android:background="?android:attr/selectableItemBackground">
-
-    <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:src="@drawable/ic_device"
-        android:contentDescription="@null"/>
-
-    <TextView
-        android:id="@+id/device_label"
-        style="@style/DeviceLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginStart="@dimen/space_md"/>
-
-</LinearLayout>
+    android:drawableStart="@drawable/ic_device"
+    android:drawablePadding="@dimen/space_md"
+    android:foreground="?android:attr/selectableItemBackground"/>