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

Merge "Fix the suggestion button distortion" into sc-dev am: b178c547e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied73c28a410cb4387bde0f8a9fdb233cdc862add
This commit is contained in:
Jason Chiu
2021-01-29 20:45:18 +00:00
committed by Automerger Merge Worker
parent 6b0e7b6d8c b178c547e4
commit 15bbb0c023
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/settings_homepage_container.xml
View File

@@ -70,13 +70,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/suggestion_height" android:layout_height="@dimen/suggestion_height"
android:paddingHorizontal="@dimen/suggestion_padding_horizontal" android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
android:paddingBottom="@dimen/suggestion_padding_bottom" android:paddingVertical="@dimen/suggestion_padding_vertical"
android:orientation="vertical" android:orientation="vertical"
android:gravity="bottom" android:gravity="bottom"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:id="@+id/suggestion_title" android:id="@+id/suggestion_title"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:text="@string/settings_label" android:text="@string/settings_label"
style="@style/ContextualSuggestionText"/> style="@style/ContextualSuggestionText"/>

6
res/values/dimens.xml
View File

@@ -141,10 +141,14 @@
<!-- Contextual suggestions --> <!-- Contextual suggestions -->
<dimen name="suggestion_height">232dp</dimen> <dimen name="suggestion_height">232dp</dimen>
<dimen name="suggestion_padding_horizontal">24dp</dimen> <dimen name="suggestion_padding_horizontal">24dp</dimen>
<dimen name="suggestion_padding_bottom">8dp</dimen> <dimen name="suggestion_padding_vertical">8dp</dimen>
<dimen name="suggestion_button_margin_top">16dp</dimen> <dimen name="suggestion_button_margin_top">16dp</dimen>
<dimen name="suggestion_button_padding_horizontal">24dp</dimen> <dimen name="suggestion_button_padding_horizontal">24dp</dimen>
<!-- Tool bar text -->
<dimen name="tool_bar_max_text_size">36sp</dimen>
<dimen name="tool_bar_min_text_size">24sp</dimen>
<!-- Dimensions for Wifi Assistant Card --> <!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen> <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
<dimen name="wifi_assistant_padding_start_end">16dp</dimen> <dimen name="wifi_assistant_padding_start_end">16dp</dimen>

19
res/values/styles.xml
View File

@@ -789,12 +789,13 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style> </style>
<style name="ContextualSuggestionText" parent="@android:style/TextAppearance.DeviceDefault"> <style name="ContextualSuggestionText"
<item name="android:layout_width">match_parent</item> parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:layout_height">wrap_content</item> <item name="android:autoSizeTextType">uniform</item>
<item name="android:textSize">36sp</item> <item name="android:autoSizeMaxTextSize">@dimen/tool_bar_max_text_size</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:autoSizeMinTextSize">@dimen/tool_bar_min_text_size</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:maxLines">3</item>
<item name="android:gravity">bottom</item>
</style> </style>
<style name="RequestManageCredentialsButtonPanel"> <style name="RequestManageCredentialsButtonPanel">
@@ -887,11 +888,11 @@
</style> </style>
<style name="ToolbarText" <style name="ToolbarText"
parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" > parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textSize">36sp</item> <item name="android:textSize">@dimen/tool_bar_max_text_size</item>
</style> </style>
<style name="ToolbarText.MoreThanTwoLines"> <style name="ToolbarText.MoreThanTwoLines">
<item name="android:textSize">24sp</item> <item name="android:textSize">@dimen/tool_bar_min_text_size</item>
</style> </style>
</resources> </resources>