Merge "Refine inputRange layout in output switcher" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-22 03:49:25 +00:00
committed by Android (Google) Code Review
3 changed files with 27 additions and 9 deletions

View File

@@ -36,11 +36,11 @@
android:visibility="gone">
<LinearLayout
android:layout_width="49dp"
android:layout_height="49dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal"
android:layout_marginStart="10dp">
android:layout_marginStart="16dp">
<ImageView
android:id="@+id/title_icon"
android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="9dp"

View File

@@ -25,6 +25,6 @@
style="@style/SliceViewSliderStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"/>
android:paddingStart="0dp"
android:paddingEnd="0dp"/>
</LinearLayout>

View File

@@ -511,10 +511,28 @@
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
<style name="SliceRowSliderStyle" parent="SliceRowStyle">
<style name="SliceRowSliderStyle">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<item name="titleItemEndPadding">0dp</item>
<!-- Padding between content and the start icon is 14dp -->
<item name="contentStartPadding">5dp</item>
<!-- Padding between content and end items is 16dp -->
<item name="contentEndPadding">16dp</item>
<!-- Both side margins of end item are 16dp -->
<item name="endItemStartPadding">0dp</item>
<item name="endItemEndPadding">24dp</item>
<!-- Both side margins of bottom divider are 12dp -->
<item name="bottomDividerStartPadding">12dp</item>
<item name="bottomDividerEndPadding">12dp</item>
<item name="actionDividerHeight">32dp</item>
<!-- Align text with slider -->
<item name="titleStartPadding">12dp</item>
<item name="subContentStartPadding">12dp</item>
<item name="titleStartPadding">6dp</item>
<item name="subContentStartPadding">6dp</item>
</style>
<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">