commit 1b77246894275d534ac353216d954193d8cbaca9
author Daniel Nishi <dhnishi@google.com> Thu Jul 06 22:05:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 06 22:05:35 2017 +0000
tree 5f9fde7ef12403a89c5d7a596b1d4b04d3ffc0e9
parent 339c8e106b348018706f2b19c9c94d8da79f778c
parent 9f77810b54de40f14e4f32f828aad2050417619c

Merge "Expand deletion preferences." into oc-dr1-dev

res/layout/deletion_preference.xml

diff --git a/res/layout/deletion_preference.xml b/res/layout/deletion_preference.xml
index 2092e50..88c74b1 100644
--- a/res/layout/deletion_preference.xml
+++ b/res/layout/deletion_preference.xml
@@ -30,7 +30,7 @@
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
+        android:layout_weight="1"
         android:minHeight="72dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
@@ -62,9 +62,8 @@
 
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:minHeight="72dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"

res/layout/preference_nested.xml

diff --git a/res/layout/preference_nested.xml b/res/layout/preference_nested.xml
index e654b00..1ec0ed5 100644
--- a/res/layout/preference_nested.xml
+++ b/res/layout/preference_nested.xml
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_toEndOf="@android:id/icon"
             android:singleLine="true"
-            android:ellipsize="marquee"
+            android:ellipsize="middle"
             android:textAppearance="@android:style/TextAppearance.Material.Subhead"
             android:textColor="?android:attr/textColorPrimary"
             android:textAlignment="viewStart"
@@ -60,28 +60,30 @@
             android:maxLines="4" />
 
     </LinearLayout>
+
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:minHeight="72dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
         android:gravity="end|center_vertical"
         android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/deletion_type_size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="@color/text_color_state" />
+        <TextView
+            android:id="@+id/deletion_type_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="@color/text_color_state" />
 
-    <LinearLayout android:id="@android:id/widget_frame"
+        <LinearLayout android:id="@android:id/widget_frame"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:orientation="vertical" />
+
     </LinearLayout>