commit cb66524cdffa8b6ed9d0778c5b35eb079321efd3
author Daniel Nishi <dhnishi@google.com> Wed Jul 05 20:44:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 05 20:44:43 2017 +0000
tree 6735962d2432091bc583f14e2b67e06927f2b450
parent e0fa4afc7112e62ca674e899e848c1835fdc418b
parent d7685ec8c86962cedda787a831b5c9fa2e01716e

Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
am: d7685ec8c8

Change-Id: I4686e307154220b5190262f97b2af97c115d9bbe

res/layout/storage_item.xml

diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 72c8ee3..4b14bb3 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -21,8 +21,8 @@
               android:minHeight="?android:attr/listPreferredItemHeightSmall"
               android:gravity="center_vertical"
               android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-              android:paddingTop="16dip"
-              android:paddingBottom="16dip"
+              android:paddingTop="14dp"
+              android:paddingBottom="14dp"
               android:background="?android:attr/selectableItemBackground"
               android:clipToPadding="false">
 
@@ -52,36 +52,41 @@
                 android:maxHeight="24dp"/>
         </LinearLayout>
 
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="0dp"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-            android:textAlignment="viewStart"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:gravity="center_vertical" >
 
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textAppearance="@android:style/TextAppearance.Material.Body1"
-            android:textColor="?android:attr/textColorSecondaryNoDisable"
-            android:maxLines="10" />
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                android:textAlignment="viewStart"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal" />
 
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondaryNoDisable"
+                android:maxLines="10"
+                android:layout_alignParentEnd="true"/>
+
+            <ProgressBar
+                android:id="@android:id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="4dp"
+                android:max="100"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                style="?android:attr/progressBarStyleHorizontal" />
+        </RelativeLayout>
     </LinearLayout>
-
-    <ProgressBar
-        android:id="@android:id/progress"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"
-        android:max="100"
-        style="?android:attr/progressBarStyleHorizontal" />
-
 </LinearLayout>