Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-07-07 03:01:56 +00:00
committed by Android (Google) Code Review

View File

@@ -24,15 +24,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="36dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal">
android:gravity="center_vertical">
<ImageView <ImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="@dimen/dashboard_tile_image_size" android:layout_width="@dimen/dashboard_tile_image_size"
android:layout_height="@dimen/dashboard_tile_image_size" android:layout_height="@dimen/dashboard_tile_image_size"
android:layout_marginTop="12dp"
android:layout_marginStart="14dp" android:layout_marginStart="14dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:tint="?android:attr/colorAccent" /> android:tint="?android:attr/colorAccent" />
@@ -41,6 +41,7 @@
android:id="@android:id/title" 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:layout_marginTop="14dp"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/colorAccent" /> android:textColor="?android:attr/colorAccent" />
@@ -62,7 +63,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="62dp" android:paddingStart="62dp"
android:paddingBottom="8dp" android:paddingBottom="1dp"
style="?android:attr/buttonBarStyle" style="?android:attr/buttonBarStyle"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">