PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev

Browse Source
This commit is contained in:
Shaowei Shen
2021-10-13 12:01:47 +00:00
committed by Android (Google) Code Review
parent 3c497cc715 fb164fe128
commit a6fc26dd45
12 changed files with 116 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout/panel_layout.xml
View File

@@ -86,7 +86,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_panel_title_margin"
android:layout_marginBottom="@dimen/settings_panel_title_margin"
android:layout_marginBottom="@dimen/settings_panel_title_margin_bottom"
android:gravity="center"
android:textColor="?android:attr/textColorPrimary"
android:textSize="24sp"
@@ -102,31 +102,23 @@
android:visibility="gone"
style="@style/TrimmedHorizontalProgressBar"/>
<include
android:id="@+id/header_divider"
layout="@layout/horizontal_divider"/>
<!-- Note: There is a landscape version of panel_slice_list which supports scrolling. -->
<include layout="@layout/panel_slice_list"/>
<include
android:id="@+id/footer_divider"
layout="@layout/horizontal_divider"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="8dp"
android:paddingBottom="8dp">
android:layout_marginTop="16dp"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="18dp">
<Button
android:id="@+id/see_more"
style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"
style="@style/PanelOptionRoundedOutlinedButton"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginStart="12dp"
android:layout_height="36dp"
android:minWidth="0dp"
android:text="@string/see_more"/>
<Space
@@ -136,10 +128,10 @@
<Button
android:id="@+id/done"
style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"
style="@style/PanelOptionRoundedSolidButton"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginEnd="12dp"
android:layout_height="36dp"
android:minWidth="0dp"
android:text="@string/done"/>
</LinearLayout>
</LinearLayout>

4
res/layout/panel_slice_row.xml
View File

@@ -25,6 +25,6 @@
style="@style/Widget.SliceView.Panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"/>
android:paddingVertical="@dimen/panel_slice_vertical_padding"
android:paddingHorizontal="@dimen/panel_slice_Horizontal_padding"/>
</LinearLayout>

4
res/layout/panel_slice_slider_row.xml
View File

@@ -26,6 +26,6 @@
style="@style/Widget.SliceView.Panel.Slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="0dp"
android:paddingEnd="0dp"/>
android:paddingVertical="@dimen/panel_slice_vertical_padding"
android:paddingHorizontal="@dimen/panel_slice_Horizontal_padding"/>
</LinearLayout>