Merge "Update the drawer to match the specs" into nyc-car-dev
diff --git a/car-support-lib/res/values-w1024dp/dimens.xml b/car-support-lib/res/values-w1024dp/dimens.xml
index 3a7e6f2..74c3b0d 100644
--- a/car-support-lib/res/values-w1024dp/dimens.xml
+++ b/car-support-lib/res/values-w1024dp/dimens.xml
@@ -15,4 +15,20 @@
-->
<resources>
<dimen name="car_drawer_margin_right">320dp</dimen>
+ <dimen name="key_line1">112dp</dimen>
+ <dimen name="key_line2">228dp</dimen>
+ <!--same as key_line1, TODO: remove this and use key_line1 after key_lines are updated to work
+ for all screen sizes -->
+ <dimen name="car_list_item_right_icon_margin">112dp</dimen>
+
+ <dimen name="car_list_item_icon_right_margin">38dp</dimen>
+
+ <dimen name="car_title_size">32dp</dimen>
+ <dimen name="car_body_1_size">48dp</dimen>
+ <dimen name="car_body_2_size">32dp</dimen>
+
+ <dimen name="car_list_item_icon_size">124dp</dimen>
+
+ <dimen name="car_list_item_height">128dp</dimen>
+ <dimen name="car_list_item_height_small">128dp</dimen>
</resources>
diff --git a/car-support-lib/res/values-w1024dp/styles.xml b/car-support-lib/res/values-w1024dp/styles.xml
new file mode 100644
index 0000000..03e9a3b
--- /dev/null
+++ b/car-support-lib/res/values-w1024dp/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+ <style name="CarDrawerArrowDrawable" >
+ <item name="carArrowColor">@android:color/white</item>
+ <item name="carArrowSpinBars">true</item>
+ <item name="carArrowThickness">2.5dp</item>
+ <item name="carArrowDrawableSize">@dimen/car_drawer_header_menu_button_size</item>
+ <item name="carArrowTopBottomBarSize">36dp</item>
+ <item name="carArrowBarSize">56dp</item>
+ <item name="carArrowMiddleBarSize">52dp</item>
+ <item name="carArrowGapBetweenBars">16dp</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/car-support-lib/res/values/dimens.xml b/car-support-lib/res/values/dimens.xml
index d66c881..2dadd1a 100644
--- a/car-support-lib/res/values/dimens.xml
+++ b/car-support-lib/res/values/dimens.xml
@@ -83,4 +83,7 @@
<dimen name="car_card_margin">96dp</dimen>
<dimen name="car_drawer_margin_right">96dp</dimen>
<dimen name="rail_height">80dp</dimen>
+
+ <dimen name="key_line1">112dp</dimen>
+ <dimen name="key_line2">228dp</dimen>
</resources>
diff --git a/car-ui-provider/res/layout/car_paged_recycler_view.xml b/car-ui-provider/res/layout/car_paged_recycler_view.xml
index a01bf70..1caf9ea 100644
--- a/car-ui-provider/res/layout/car_paged_recycler_view.xml
+++ b/car-ui-provider/res/layout/car_paged_recycler_view.xml
@@ -31,7 +31,7 @@
android:id="@+id/max_width_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/car_card_margin"
+ android:layout_marginStart="@dimen/key_line1"
android:clipChildren="false"
app:carMaxWidth="@dimen/car_card_max_width" >