Merge "Tweak right padding for multiple preferences" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f6d0845783
@@ -21,6 +21,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
|
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||||
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||||
android:clipToPadding="false">
|
android:clipToPadding="false">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@@ -29,8 +31,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="start|center_vertical"
|
android:gravity="start|center_vertical"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
>
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/icon_frame"
|
android:id="@+id/icon_frame"
|
||||||
|
@@ -89,7 +89,7 @@
|
|||||||
android:id="@android:id/widget_frame"
|
android:id="@android:id/widget_frame"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:minWidth="64dp"
|
android:minWidth="@dimen/two_target_min_width"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
|
@@ -85,7 +85,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:minWidth="64dp"
|
android:minWidth="@dimen/two_target_min_width"
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@@ -21,8 +21,8 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
|
android:paddingStart="24dp"
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
android:paddingEnd="24dp"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:scaleType="center"
|
android:scaleType="center"
|
||||||
android:src="@drawable/ic_settings_accent"
|
android:src="@drawable/ic_settings_accent"
|
||||||
|
@@ -22,6 +22,4 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:minWidth="@dimen/two_target_min_width"
|
android:minWidth="@dimen/two_target_min_width"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:clickable="false" />
|
android:clickable="false" />
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
android:id="@+id/button_icon"
|
android:id="@+id/button_icon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:minWidth="64dp"
|
android:minWidth="@dimen/two_target_min_width"
|
||||||
android:minHeight="@dimen/min_tap_target_size"
|
android:minHeight="@dimen/min_tap_target_size"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:background="?android:attr/selectableItemBackground"/>
|
android:background="?android:attr/selectableItemBackground"/>
|
||||||
|
@@ -394,8 +394,6 @@
|
|||||||
<!-- Elevation of bluetooth icon -->
|
<!-- Elevation of bluetooth icon -->
|
||||||
<dimen name="bt_icon_elevation">4dp</dimen>
|
<dimen name="bt_icon_elevation">4dp</dimen>
|
||||||
|
|
||||||
<dimen name="two_target_min_width">80dp</dimen>
|
|
||||||
|
|
||||||
<!-- Maximum height for SliceView, override on slices/view/src/main/res/values/dimens.xml -->
|
<!-- Maximum height for SliceView, override on slices/view/src/main/res/values/dimens.xml -->
|
||||||
<dimen name="abc_slice_large_height">1800dp</dimen>
|
<dimen name="abc_slice_large_height">1800dp</dimen>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user