Merge "Update touch ripple size for small width screen" into pi-car-dev am: de5c700940
am: 13d85d12f7
Change-Id: I65e3cb814edb7059e8b216c1618bf85e3a084a02
diff --git a/car-media-common/res/values-h668dp/dimens.xml b/car-apps-common/res/values-h600dp/dimens.xml
similarity index 78%
copy from car-media-common/res/values-h668dp/dimens.xml
copy to car-apps-common/res/values-h600dp/dimens.xml
index 3ca1445..ffb0f6f 100644
--- a/car-media-common/res/values-h668dp/dimens.xml
+++ b/car-apps-common/res/values-h600dp/dimens.xml
@@ -15,7 +15,5 @@
limitations under the License.
-->
<resources>
- <!-- App bar -->
- <!-- The height of app bar when it expends to 2 rows. Equals 2 * @dimen/appbar_first_row_height. -->
- <dimen name="appbar_2_rows_height">192dp</dimen>
+ <dimen name="control_bar_button_background_radius">48dp</dimen>
</resources>
diff --git a/car-apps-common/res/values/dimens.xml b/car-apps-common/res/values/dimens.xml
index b2993e3..93af780 100644
--- a/car-apps-common/res/values/dimens.xml
+++ b/car-apps-common/res/values/dimens.xml
@@ -30,7 +30,7 @@
<dimen name="control_bar_button_slot_size">@dimen/control_bar_height</dimen>
<dimen name="control_bar_elevation">0dp</dimen>
<dimen name="control_bar_button_padding">16dp</dimen>
- <dimen name="control_bar_button_background_radius">48dp</dimen>
+ <dimen name="control_bar_button_background_radius">38dp</dimen>
<!-- Overflow button in control Bar -->
<dimen name="overflow_button_icon_size">44dp</dimen>
diff --git a/car-media-common/res/values-h668dp/dimens.xml b/car-media-common/res/values-h600dp/dimens.xml
similarity index 79%
rename from car-media-common/res/values-h668dp/dimens.xml
rename to car-media-common/res/values-h600dp/dimens.xml
index 3ca1445..b1bcd84 100644
--- a/car-media-common/res/values-h668dp/dimens.xml
+++ b/car-media-common/res/values-h600dp/dimens.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
<resources>
- <!-- App bar -->
- <!-- The height of app bar when it expends to 2 rows. Equals 2 * @dimen/appbar_first_row_height. -->
<dimen name="appbar_2_rows_height">192dp</dimen>
+ <dimen name="appbar_view_icon_touch_target_size">96dp</dimen>
+ <dimen name="appbar_view_icon_padding">26dp</dimen>
+ <dimen name="appbar_view_icon_background_radius">48dp</dimen>
</resources>
diff --git a/car-media-common/res/values/dimens.xml b/car-media-common/res/values/dimens.xml
index c5ea201..8bf9a60 100644
--- a/car-media-common/res/values/dimens.xml
+++ b/car-media-common/res/values/dimens.xml
@@ -27,10 +27,10 @@
<dimen name="appbar_second_row_height">0dp</dimen>
<!-- The height of app bar when it expends to 2 rows. Equals 2 * @dimen/appbar_first_row_height. -->
<dimen name="appbar_2_rows_height">160dp</dimen>
- <dimen name="appbar_view_icon_touch_target_size">96dp</dimen>
+ <dimen name="appbar_view_icon_touch_target_size">76dp</dimen>
<dimen name="appbar_view_icon_size">@*android:dimen/car_primary_icon_size</dimen>
<!-- Padding of primary icon, equals (@dimen/appbar_view_icon_touch_target_size - @dimen/appbar_view_icon_size) / 2. -->
- <dimen name="appbar_view_icon_padding">26dp</dimen>
+ <dimen name="appbar_view_icon_padding">16dp</dimen>
<!-- playback_fragment.xml -->
<dimen name="playback_fragment_text_margin_top">@*android:dimen/car_padding_4</dimen>
@@ -61,5 +61,5 @@
<dimen name="minimized_progress_bar_track_thickness">4dp</dimen>
<!-- appbar_view_icon_background.xml -->
- <dimen name="appbar_view_icon_background_radius">48dp</dimen>
+ <dimen name="appbar_view_icon_background_radius">38dp</dimen>
</resources>