1 files changed, 10 insertions, 17 deletions

diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 0053f4c73..75a6b3222 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -3,42 +3,35 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal|bottom"
     android:background="@drawable/listitem_bg"
-    android:paddingLeft="@dimen/overview_panel_list_padding"
-    android:paddingRight="@dimen/overview_panel_list_padding"
+    android:paddingStart="@dimen/overview_panel_list_padding"
+    android:paddingEnd="@dimen/overview_panel_list_padding"
+    android:paddingBottom="@dimen/overview_panel_list_padding"
+    android:paddingTop="@dimen/overview_panel_list_padding"
     android:orientation="horizontal" >
 
     <TextView
-        android:id="@+id/item_name"
+        android:id="@+id/item_state"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="4dp"
         android:fontFamily="sans-serif-condensed"
-        android:gravity="left"
-        android:paddingBottom="@dimen/overview_panel_list_padding"
-        android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
+        android:textAllCaps="true"
         android:textColor="@color/listitem_text"
-        android:layout_alignParentLeft="true"
-        android:scrollHorizontally="true"
+        android:layout_alignParentEnd="true"
         android:ellipsize="end"
         android:maxLines="1"/>
 
     <TextView
-        android:id="@+id/item_state"
+        android:id="@+id/item_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="4dp"
         android:fontFamily="sans-serif-condensed"
-        android:gravity="right"
-        android:paddingBottom="@dimen/overview_panel_list_padding"
-        android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
-        android:textAllCaps="true"
         android:textColor="@color/listitem_text"
-        android:layout_alignParentRight="true"
-        android:layout_toRightOf="@id/item_name"
-        android:scrollHorizontally="true"
+        android:layout_toStartOf="@id/item_state"
+        android:layout_alignParentStart="true"
         android:ellipsize="end"
         android:maxLines="1"/>
-
 </RelativeLayout>
\ No newline at end of file