Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Dialog button text to have medium font weight" into tm-qpr-dev am: 13f6aed5d6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19261457

Change-Id: Ife45f8c963ffa2cbdf3ca9a7a119ccbc98700cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mac Young
2022-07-21 16:39:22 +00:00
committed by Automerger Merge Worker
parent 25c8cc59a5 13f6aed5d6
commit 0575683d13
3 changed files with 17 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout-car/car_alert_dialog.xml
View File

@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/text_view_start_margin"
android:layout_marginEnd="@dimen/text_view_end_margin"
style="@style/CarBody4"/>
style="@style/CarDialogMessageText"/>
<!-- we don't need this spacer, but the id needs to be here for compatibility -->
<Space

20
core/res/res/layout-car/car_alert_dialog_button_bar.xml
View File

@@ -16,13 +16,13 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/buttonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollIndicators="top|bottom"
android:fillViewport="true"
style="?attr/buttonBarStyle">
android:id="@+id/buttonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollIndicators="top|bottom"
android:fillViewport="true"
style="?attr/buttonBarStyle">
<com.android.internal.widget.ButtonBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
<Button
android:id="@+id/button3"
style="@style/CarAction1"
style="@style/CarDialogButtonText"
android:minWidth="@dimen/car_touch_target_size"
android:paddingStart="@dimen/car_padding_2"
android:paddingEnd="@dimen/car_padding_2"
@@ -46,7 +46,7 @@
<Button
android:id="@+id/button2"
style="@style/CarAction1"
style="@style/CarDialogButtonText"
android:minWidth="@dimen/car_touch_target_size"
android:paddingStart="@dimen/car_padding_2"
android:paddingEnd="@dimen/car_padding_2"
@@ -57,7 +57,7 @@
<Button
android:id="@+id/button1"
style="@style/CarAction1"
style="@style/CarDialogButtonText"
android:minWidth="@dimen/car_touch_target_size"
android:paddingStart="@dimen/car_padding_2"
android:paddingEnd="@dimen/car_padding_2"

93
core/res/res/values/styles_car.xml
View File

@@ -14,96 +14,15 @@
limitations under the License.
-->
<resources>
<!-- Car text -->
<style name="CarBody1">
<item name="textStyle">normal</item>
<item name="textSize">@dimen/car_body1_size</item>
<item name="textColor">@color/car_body1</item>
</style>
<style name="CarBody1.Light">
<item name="textColor">@color/car_body1_light</item>
</style>
<style name="CarBody1.Dark">
<item name="textColor">@color/car_body2_dark</item>
</style>
<style name="CarBody2">
<item name="textStyle">normal</item>
<item name="textSize">@dimen/car_body2_size</item>
<item name="textColor">@color/car_body2</item>
</style>
<style name="CarBody2.Dark">
<item name="textColor">@color/car_body2_dark</item>
</style>
<style name="CarBody2.Light">
<item name="textColor">@color/car_body2_light</item>
</style>
<style name="CarBody3">
<item name="textStyle">normal</item>
<item name="textSize">@dimen/car_body3_size</item>
<item name="textColor">@color/car_body3</item>
</style>
<!-- The smallest styling for body text. The color of this text changes based on the day/night
mode. -->
<style name="CarBody4">
<!-- The Dialog message text style-->
<style name="CarDialogMessageText">
<item name="textStyle">normal</item>
<item name="textSize">@dimen/car_body4_size</item>
<item name="textColor">@color/car_body4</item>
</style>
<style name="CarAction1">
<item name="textStyle">bold</item>
<item name="textSize">@dimen/car_action1_size</item>
<item name="textColor">@color/control_default_material</item>
</style>
<style name="CarAction1.Dark">
<item name="textColor">@color/car_highlight_dark</item>
</style>
<style name="CarAction1.Light">
<item name="textColor">@color/car_highlight_light</item>
</style>
<!-- The styling for title text. The color of this text changes based on day/night mode. -->
<style name="CarTitle" >
<item name="textStyle">bold</item>
<item name="textSize">@dimen/car_title2_size</item>
<item name="textColor">@color/car_title</item>
</style>
<!-- Title text that is permanently a dark color. -->
<style name="CarTitle.Dark" >
<item name="textColor">@color/car_title_dark</item>
</style>
<!-- Title text that is permanently a light color. -->
<style name="CarTitle.Light" >
<item name="textColor">@color/car_title_light</item>
</style>
<!-- Action bar -->
<style name="ActionBarTitle" parent="@style/Widget.DeviceDefault.TextView">
<item name="android:singleLine">true</item>
<item name="android:textAppearance">?attr/textAppearanceLarge</item>
</style>
<style name="ActionBarButton"
parent="@style/Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:textAppearance">@style/ActionBarButtonTextAppearance</item>
<!-- Button's internal horizontal padding -->
<item name="android:paddingStart">@*android:dimen/car_padding_3</item>
<item name="android:paddingEnd">@*android:dimen/car_padding_3</item>
<item name="android:drawablePadding">@*android:dimen/car_padding_2</item>
<item name="android:maxWidth">@*android:dimen/action_bar_button_max_width</item>
</style>
<style name="ActionBarButtonTextAppearance"
parent="@style/TextAppearance.DeviceDefault.Widget.Button.Borderless.Colored">
<item name="android:textAllCaps">false</item>
<!-- This style makes Dialog button text use medium font weight. -->
<style name="CarDialogButtonText">
<item name="android:textAppearance">@style/TextAppearance.DeviceDefault.Widget.Button</item>
<item name="android:textColor">@color/control_default_material</item>
</style>
</resources>