Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev

This commit is contained in:
Daniel Nishi
2017-07-05 20:40:41 +00:00
committed by Android (Google) Code Review

View File

@@ -21,8 +21,8 @@
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip" android:paddingTop="14dp"
android:paddingBottom="16dip" android:paddingBottom="14dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clipToPadding="false"> android:clipToPadding="false">
@@ -52,36 +52,41 @@
android:maxHeight="24dp"/> android:maxHeight="24dp"/>
</LinearLayout> </LinearLayout>
<TextView <RelativeLayout
android:id="@android:id/title" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:gravity="center_vertical" >
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textAlignment="viewStart"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView <TextView
android:id="@android:id/summary" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="viewStart" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="?android:attr/textColorSecondaryNoDisable" android:textAlignment="viewStart"
android:maxLines="10" /> 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> </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> </LinearLayout>