diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-06 20:24:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-08-06 20:24:07 +0000 |
| commit | ca2ad3041c664ee727615f16d48a57e6ccffcb36 (patch) | |
| tree | 64609bed1eeaf4eef36b001d67b06915c7912a57 /res | |
| parent | 9beef67659116d7739603d55d72b64617f6d76a1 (diff) | |
| parent | cfe6350acc980c61bdd74213f32c9a177c206f49 (diff) | |
| download | platform_packages_apps_Car_Dialer-ca2ad3041c664ee727615f16d48a57e6ccffcb36.tar.gz platform_packages_apps_Car_Dialer-ca2ad3041c664ee727615f16d48a57e6ccffcb36.tar.bz2 platform_packages_apps_Car_Dialer-ca2ad3041c664ee727615f16d48a57e6ccffcb36.zip | |
Merge "Bring nfp page up to specs" into pi-car-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/no_hfp.xml | 7 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/res/layout/no_hfp.xml b/res/layout/no_hfp.xml index 115c9bba..a4f3ec5f 100644 --- a/res/layout/no_hfp.xml +++ b/res/layout/no_hfp.xml @@ -48,7 +48,7 @@ <TextView android:id="@id/error_string" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_hfp" style="@style/NoHfpText" @@ -64,9 +64,10 @@ android:text="@string/connect_bluetooth_button_text" android:minWidth="@dimen/connect_bluetooth_button_min_width" android:minHeight="@dimen/connect_bluetooth_button_min_height" - android:background="?android:attr/selectableItemBackground" - android:textColor="@color/connect_bluetooth_text_color" + android:textAppearance="?android:attr/textAppearanceMedium" + android:background="@drawable/hero_button_background" app:carUxRestrictions="UX_RESTRICTIONS_FULLY_RESTRICTED" + android:layout_marginTop="@dimen/connect_bluetooth_button_margin_top" app:layout_constraintTop_toBottomOf="@+id/error_string" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/res/values/colors.xml b/res/values/colors.xml index 2b99d101..7286bf54 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -30,7 +30,6 @@ <color name="car_key2_dark">@*android:color/car_grey_700</color> <color name="emergency_text_color">@*android:color/car_red_500a</color> - <color name="connect_bluetooth_text_color">@*android:color/accent_device_default_light</color> <!-- Components --> <color name="divider_color">@color/divider_color_light</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 33ad3a0c..93068b0b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -119,6 +119,7 @@ <dimen name="connect_bluetooth_button_min_height">@dimen/touch_target_size</dimen> <dimen name="connect_bluetooth_button_min_width">@dimen/touch_target_width</dimen> <dimen name="emergency_button_bottom_margin">@*android:dimen/car_padding_4</dimen> + <dimen name="connect_bluetooth_button_margin_top">@*android:dimen/car_padding_5</dimen> <dimen name="list_top_padding">@*android:dimen/car_padding_2</dimen> <!-- Components --> diff --git a/res/values/styles.xml b/res/values/styles.xml index aa6d7325..fcbdcdb4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -63,7 +63,7 @@ </style> <style name="NoHfpText"> - <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:textAppearance">?android:attr/textAppearanceLarge</item> <item name="android:gravity">center</item> <item name="android:maxLines">3</item> </style> |