summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-08 16:55:45 -0700
committerXin Li <delphij@google.com>2020-09-08 16:55:45 -0700
commit9da26487860cbc8a80da6113432d556b81b1ab33 (patch)
treecd7349c75b671e0c438b0d1df8a42955f5a57e4a /res/values
parente301e0126d865e15fc748e773a52746c08f7c8d4 (diff)
parent6c9e0e935aff44297389142f7d5a6b40df82d3d3 (diff)
downloadplatform_packages_apps_Car_Radio-master.tar.gz
platform_packages_apps_Car_Radio-master.tar.bz2
platform_packages_apps_Car_Radio-master.zip
Merge Android RHEADmaster
Bug: 168057903 Merged-In: Ibd7349ce35b843d87e60f6168f7410967eb6c315 Change-Id: I371d22cf104a199aa8ba34671f4e6cc5be30f87b
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml4
-rw-r--r--res/values/styles.xml8
-rw-r--r--res/values/themes.xml2
3 files changed, 11 insertions, 3 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8edd032..3d60272 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -103,8 +103,8 @@ limitations under the License.
<dimen name="tab_icon_margin">@*android:dimen/car_padding_1</dimen>
<dimen name="tab_elevation">8dp</dimen>
<dimen name="tab_padding">@*android:dimen/car_padding_4</dimen>
- <dimen name="tab_margin_left">@*android:dimen/car_padding_4</dimen>
- <dimen name="tab_margin_right">@dimen/radio_margin</dimen>
+ <dimen name="tab_margin_start">@*android:dimen/car_padding_4</dimen>
+ <dimen name="tab_margin_end">@dimen/radio_margin</dimen>
<dimen name="band_selector_size">@dimen/tab_height</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 635a19f..20001dc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,6 +18,10 @@ limitations under the License.
<style name="RadioButton">
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:padding">@dimen/radio_controls_button_padding</item>
+ <!-- Added paddingStart/End explicitly since padding does not override paddingStart/End
+ when RTL support is enabled -->
+ <item name="android:paddingStart">@dimen/radio_controls_button_padding</item>
+ <item name="android:paddingEnd">@dimen/radio_controls_button_padding</item>
<item name="android:scaleType">center</item>
</style>
@@ -27,6 +31,10 @@ limitations under the License.
<item name="android:layout_height">@dimen/dialpad_button_size</item>
<item name="android:layout_marginBottom">@dimen/dialpad_space_vertical</item>
<item name="android:padding">@dimen/dialpad_button_padding</item>
+ <!-- Added paddingStart/End explicitly since padding does not override paddingStart/End
+ when RTL support is enabled -->
+ <item name="android:paddingStart">@dimen/dialpad_button_padding</item>
+ <item name="android:paddingEnd">@dimen/dialpad_button_padding</item>
<item name="android:gravity">center</item>
<item name="android:layout_gravity">center</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1c88003..90fdf5d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,7 +15,7 @@ limitations under the License.
-->
<resources>
<!--Theme for the app. -->
- <style name="Theme.Radio" parent="android:Theme.DeviceDefault.NoActionBar">
+ <style name="Theme.Radio" parent="Theme.CarUi.WithToolbar">
<item name="textAppearanceGridItem">@android:style/TextAppearance.DeviceDefault.Medium</item>
<item name="textAppearanceGridItemSecondary">@android:style/TextAppearance.DeviceDefault.Small</item>
</style>