Merge "Remove restriction for ItemCap extension." into oc-mr1-jetpack-dev
diff --git a/car/res/layout/car_drawer_list_item_normal.xml b/car/res/layout/car_drawer_list_item_normal.xml
index fa3b29f..9136aae 100644
--- a/car/res/layout/car_drawer_list_item_normal.xml
+++ b/car/res/layout/car_drawer_list_item_normal.xml
@@ -16,7 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/car_drawer_list_item_height"
+ android:layout_height="@dimen/car_double_line_list_item_height"
android:focusable="true"
android:orientation="horizontal"
android:background="@drawable/car_drawer_list_item_background" >
diff --git a/car/res/layout/car_drawer_list_item_small.xml b/car/res/layout/car_drawer_list_item_small.xml
index d7e7a75..2818eef 100644
--- a/car/res/layout/car_drawer_list_item_small.xml
+++ b/car/res/layout/car_drawer_list_item_small.xml
@@ -16,7 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/car_drawer_list_item_height_small"
+ android:layout_height="@dimen/car_single_line_list_item_height"
android:focusable="true"
android:orientation="horizontal"
android:background="@drawable/car_drawer_list_item_background" >
diff --git a/car/res/values-h1752dp/dimens.xml b/car/res/values-h1752dp/dimens.xml
index 8143fd6..93aa85f 100644
--- a/car/res/values-h1752dp/dimens.xml
+++ b/car/res/values-h1752dp/dimens.xml
@@ -27,7 +27,12 @@
<!-- Application Bar Height -->
<dimen name="car_app_bar_height">112dp</dimen>
+ <dimen name="car_touch_target">96dp</dimen>
+
<!-- Icon dimensions -->
<dimen name="car_primary_icon_size">56dp</dimen>
<dimen name="car_secondary_icon_size">36dp</dimen>
+
+ <!-- Line heights -->
+ <dimen name="car_double_line_list_item_height">128dp</dimen>
</resources>
diff --git a/car/res/values-h684dp/dimens.xml b/car/res/values-h684dp/dimens.xml
index 2011ae5..72b04f2 100644
--- a/car/res/values-h684dp/dimens.xml
+++ b/car/res/values-h684dp/dimens.xml
@@ -22,6 +22,6 @@
<dimen name="car_drawer_list_item_small_icon_size">56dp</dimen>
<dimen name="car_drawer_list_item_end_icon_size">56dp</dimen>
- <dimen name="car_drawer_list_item_height">128dp</dimen>
- <dimen name="car_drawer_list_item_height_small">128dp</dimen>
+ <!-- Line heights -->
+ <dimen name="car_double_line_list_item_height">116dp</dimen>
</resources>
diff --git a/car/res/values/colors.xml b/car/res/values/colors.xml
index d22e768..00c6cf9 100644
--- a/car/res/values/colors.xml
+++ b/car/res/values/colors.xml
@@ -128,7 +128,7 @@
<!-- The ripple colors. The "dark" and "light" designation here refers to the color of the
ripple itself. -->
- <color name="car_card_ripple_background_dark">#17000000</color>
+ <color name="car_card_ripple_background_dark">#8F000000</color>
<color name="car_card_ripple_background_light">#27ffffff</color>
<!-- The ripple color for a light colored card. -->
diff --git a/car/res/values/dimens.xml b/car/res/values/dimens.xml
index 12af4a3..c42437d 100644
--- a/car/res/values/dimens.xml
+++ b/car/res/values/dimens.xml
@@ -21,7 +21,7 @@
<dimen name="car_keyline_4">182dp</dimen>
<dimen name="car_keyline_1_neg">-48dp</dimen>
<dimen name="car_keyline_2_neg">-108dp</dimen>
- <dimen name="car_keyline_3_neg">-152dp</dimen>
+ <dimen name="car_keyline_3_neg">-152dp</dimen>
<!-- Type Sizings -->
<dimen name="car_title_size">26sp</dimen>
@@ -56,7 +56,13 @@
<!-- Car Component Dimensions -->
<!-- Application Bar Height -->
<dimen name="car_app_bar_height">80dp</dimen>
-
+
+ <!-- The height of the bar that contains an applications action buttons. -->
+ <dimen name="car_action_bar_height">128dp</dimen>
+
+ <!-- Minimum touch target size. -->
+ <dimen name="car_touch_target">76dp</dimen>
+
<!-- Button Dimensions -->
<dimen name="car_button_height">64dp</dimen>
<dimen name="car_button_min_width">158dp</dimen>
@@ -66,7 +72,11 @@
<!-- Icon dimensions -->
<dimen name="car_primary_icon_size">44dp</dimen>
<dimen name="car_secondary_icon_size">24dp</dimen>
-
+
+ <!-- Line heights -->
+ <dimen name="car_single_line_list_item_height">76dp</dimen>
+ <dimen name="car_double_line_list_item_height">96dp</dimen>
+
<!-- List and Drawer Dimensions -->
<!-- The margin on both sides of the screen before the contents of the PagedListView. -->
<dimen name="car_card_margin">96dp</dimen>
@@ -120,12 +130,6 @@
<dimen name="car_menu_bar_spacing">6dp</dimen>
<dimen name="car_menu_bar_length">40dp</dimen>
- <!-- The height of an individual item in the navigation drawer. -->
- <dimen name="car_drawer_list_item_height">88dp</dimen>
-
- <!-- The height of a small list item. -->
- <dimen name="car_drawer_list_item_height_small">64dp</dimen>
-
<!-- The size of the starting icon. -->
<dimen name="car_drawer_list_item_icon_size">64dp</dimen>