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 am: a6fc26dd45 am: bbff2d4bd3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634

Change-Id: Ibd5a8815b353591384cc624b81a9127a4b72c98f
This commit is contained in:
Shaowei Shen
2021-10-13 12:21:03 +00:00
committed by Automerger Merge Worker
parent 720bdc249f bbff2d4bd3
commit 7a4715c7fe
12 changed files with 116 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/dimens.xml
View File

@@ -426,8 +426,13 @@
<!-- Settings panel related dimensions -->
<dimen name="settings_panel_corner_radius">28dp</dimen>
<dimen name="settings_panel_title_margin">24dp</dimen>
<dimen name="settings_panel_title_margin_bottom">16dp</dimen>
<dimen name="settings_panel_width">@dimen/match_parent</dimen>
<!-- Panel slices dimensions -->
<dimen name="panel_slice_vertical_padding">8dp</dimen>
<dimen name="panel_slice_Horizontal_padding">24dp</dimen>
<!-- Text padding for EmptyTextSettings -->
<dimen name="empty_text_padding">24dp</dimen>

2
res/values/strings.xml
View File

@@ -12898,7 +12898,7 @@
<string name="manual_mode_disallowed_summary">Unavailable when connected to <xliff:g id="carrier" example="verizon">%1$s</xliff:g></string>
<!-- See more items in contextual homepage [CHAR LIMIT=30]-->
<string name="see_more">See more</string>
<string name="see_more">Settings</string>
<!-- See less items in contextual homepage [CHAR LIMIT=30]-->
<string name="see_less">See less</string>

16
res/values/styles.xml
View File

@@ -585,15 +585,16 @@
</style>
<style name="SliceRow.Slider">
<!-- Padding between content and the start icon is 0dp -->
<item name="contentStartPadding">0dp</item>
<item name="contentEndPadding">36dp</item>
<!-- Padding between content and the start icon is 5dp -->
<item name="contentStartPadding">5dp</item>
<item name="contentEndPadding">0dp</item>
<!-- 0dp start padding for the end item -->
<item name="endItemStartPadding">0dp</item>
<!-- 8dp end padding for the end item -->
<item name="endItemEndPadding">8dp</item>
<item name="titleSize">20sp</item>
<!-- Align text with slider -->
<item name="titleStartPadding">11dp</item>
<item name="subContentStartPadding">11dp</item>
@@ -624,6 +625,15 @@
<item name="android:paddingEnd">8dp</item>
</style>
<style name="PanelOptionRoundedOutlinedButton" parent="@android:style/Widget.Material.Button">
<item name="android:background">@drawable/volume_dialog_button_background_outline</item>
</style>
<style name="PanelOptionRoundedSolidButton" parent="@android:style/Widget.Material.Button">
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:background">@drawable/volume_dialog_button_background_solid</item>
</style>
<style name="SetupWizardPartnerResource">
<!-- Disable to use partner overlay theme for outside setupwizard flow. -->
<item name="sucUsePartnerResource">@bool/config_suc_use_partner_resource</item>