Merge "Convert up and down buttons to VectorDrawables." into oc-mr1-jetpack-dev
diff --git a/car/res/drawable-hdpi/ic_down.png b/car/res/drawable-hdpi/ic_down.png
deleted file mode 100644
index 399510d..0000000
--- a/car/res/drawable-hdpi/ic_down.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-hdpi/ic_up.png b/car/res/drawable-hdpi/ic_up.png
deleted file mode 100644
index 6c62aa8..0000000
--- a/car/res/drawable-hdpi/ic_up.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-mdpi/ic_down.png b/car/res/drawable-mdpi/ic_down.png
deleted file mode 100644
index 802d95f..0000000
--- a/car/res/drawable-mdpi/ic_down.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-mdpi/ic_up.png b/car/res/drawable-mdpi/ic_up.png
deleted file mode 100644
index 7c74671..0000000
--- a/car/res/drawable-mdpi/ic_up.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-xhdpi/ic_down.png b/car/res/drawable-xhdpi/ic_down.png
deleted file mode 100644
index 72e42cb..0000000
--- a/car/res/drawable-xhdpi/ic_down.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-xhdpi/ic_up.png b/car/res/drawable-xhdpi/ic_up.png
deleted file mode 100644
index 627328f..0000000
--- a/car/res/drawable-xhdpi/ic_up.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-xxhdpi/ic_down.png b/car/res/drawable-xxhdpi/ic_down.png
deleted file mode 100644
index d9b28bf..0000000
--- a/car/res/drawable-xxhdpi/ic_down.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable-xxhdpi/ic_up.png b/car/res/drawable-xxhdpi/ic_up.png
deleted file mode 100644
index 7a967658..0000000
--- a/car/res/drawable-xxhdpi/ic_up.png
+++ /dev/null
Binary files differ
diff --git a/car/res/drawable/ic_down.xml b/car/res/drawable/ic_down.xml
new file mode 100644
index 0000000..c6bb32d
--- /dev/null
+++ b/car/res/drawable/ic_down.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="76dp"
+ android:height="76dp"
+ android:viewportWidth="76.0"
+ android:viewportHeight="76.0">
+ <path
+ android:pathData="M38,0.96C17.01,0.96 0,17.75 0,38.47C0,59.18 17.01,75.97 38,75.97C58.99,75.97 76,59.18 76,38.47C76,17.75 58.99,0.96 38,0.96M38,3.3C57.64,3.3 73.62,19.08 73.62,38.47C73.62,57.85 57.64,73.63 38,73.63C18.36,73.63 2.38,57.86 2.38,38.47C2.38,19.08 18.36,3.3 38,3.3"
+ android:strokeColor="#00000000"
+ android:fillColor="#212121"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M26.63,31.09l11.37,11.08l11.37,-11.08l3.5,3.42l-14.87,14.5l-14.87,-14.5z"
+ android:strokeColor="#00000000"
+ android:fillColor="#212121"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/car/res/drawable/ic_up.xml b/car/res/drawable/ic_up.xml
new file mode 100644
index 0000000..05f69b9
--- /dev/null
+++ b/car/res/drawable/ic_up.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="76dp"
+ android:height="76dp"
+ android:viewportWidth="76.0"
+ android:viewportHeight="76.0">
+ <path
+ android:pathData="M38,75.04C58.99,75.04 76,58.27 76,37.57C76,16.88 58.99,0.11 38,0.11C17.01,0.11 0,16.88 0,37.57C0,58.27 17.01,75.04 38,75.04M38,72.7C18.36,72.7 2.38,56.94 2.38,37.57C2.38,18.21 18.36,2.45 38,2.45C57.64,2.45 73.62,18.21 73.62,37.57C73.62,56.94 57.64,72.7 38,72.7"
+ android:strokeColor="#00000000"
+ android:fillColor="#212121"
+ android:strokeWidth="1"/>
+ <path
+ android:pathData="M49.37,44.9l-11.37,-11.08l-11.37,11.08l-3.5,-3.42l14.87,-14.5l14.87,14.5z"
+ android:strokeColor="#00000000"
+ android:fillColor="#212121"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/car/res/layout/car_paged_recycler_view.xml b/car/res/layout/car_paged_recycler_view.xml
index 30129df..1b8a6ac 100644
--- a/car/res/layout/car_paged_recycler_view.xml
+++ b/car/res/layout/car_paged_recycler_view.xml
@@ -14,23 +14,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <android.support.car.widget.PagedScrollBarView
- android:id="@+id/paged_scroll_view"
- android:layout_width="@dimen/car_paged_list_view_pagination_width"
- android:layout_height="match_parent"
- android:paddingBottom="@dimen/car_scroll_bar_padding"
- android:paddingTop="@dimen/car_scroll_bar_padding"
- android:visibility="invisible" />
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<android.support.car.widget.CarRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <!-- Putting this as the last child so that it can intercept any touch events on the
+ scroll buttons. -->
+ <android.support.car.widget.PagedScrollBarView
+ android:id="@+id/paged_scroll_view"
+ android:layout_width="@dimen/car_screen_margin_size"
android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:layout_marginStart="@dimen/car_paged_list_view_pagination_width"
- android:clipChildren="false" />
-</merge>
+ android:paddingBottom="@dimen/car_scroll_bar_padding"
+ android:paddingTop="@dimen/car_scroll_bar_padding"
+ android:visibility="invisible" />
+</FrameLayout>
diff --git a/car/res/layout/car_paged_scrollbar_buttons.xml b/car/res/layout/car_paged_scrollbar_buttons.xml
index ac96327..7dd213a 100644
--- a/car/res/layout/car_paged_scrollbar_buttons.xml
+++ b/car/res/layout/car_paged_scrollbar_buttons.xml
@@ -18,14 +18,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="left"
+ android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/page_up"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/car_scroll_bar_button_size"
+ android:layout_height="@dimen/car_scroll_bar_button_size"
android:background="@drawable/car_pagination_background"
android:focusable="false"
android:hapticFeedbackEnabled="false"
@@ -50,11 +50,11 @@
<ImageView
android:id="@+id/page_down"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/car_scroll_bar_button_size"
+ android:layout_height="@dimen/car_scroll_bar_button_size"
android:background="@drawable/car_pagination_background"
android:focusable="false"
android:hapticFeedbackEnabled="false"
android:scaleType="center"
android:src="@drawable/ic_down" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/car/res/values-w1280dp/dimens.xml b/car/res/values-w1280dp/dimens.xml
new file mode 100644
index 0000000..1799010
--- /dev/null
+++ b/car/res/values-w1280dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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>
+ <dimen name="car_screen_margin_size">148dp</dimen>
+ <dimen name="car_scroll_bar_button_size">76dp</dimen>
+</resources>
diff --git a/car/res/values-w720dp/dimens.xml b/car/res/values-w720dp/dimens.xml
new file mode 100644
index 0000000..b1ae5ba
--- /dev/null
+++ b/car/res/values-w720dp/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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>
+ <dimen name="car_screen_margin_size">112dp</dimen>
+</resources>
diff --git a/car/res/values-w840dp/dimens.xml b/car/res/values-w840dp/dimens.xml
index 6428ce0..9d6167e 100644
--- a/car/res/values-w840dp/dimens.xml
+++ b/car/res/values-w840dp/dimens.xml
@@ -15,6 +15,5 @@
-->
<resources>
<dimen name="car_keyline_1">32dp</dimen>
- <dimen name="car_screen_margin_size">40dp</dimen>
<dimen name="car_screen_gutter_size">24dp</dimen>
</resources>
diff --git a/car/res/values/dimens.xml b/car/res/values/dimens.xml
index d7bf4ad..09ba50f 100644
--- a/car/res/values/dimens.xml
+++ b/car/res/values/dimens.xml
@@ -45,12 +45,12 @@
determined by integer/car_screen_num_of_columns. -->
<dimen name="car_screen_gutter_size">16dp</dimen>
- <!-- The size of the container that holds the scroll bars in the PagedListView. -->
- <dimen name="car_paged_list_view_pagination_width">96dp</dimen>
-
<!-- The margin on both sizes of the scroll bar thumb. -->
<dimen name="car_paged_list_view_scrollbar_thumb_margin">8dp</dimen>
+ <!-- The size of the scroll bar up and down arrows. -->
+ <dimen name="car_scroll_bar_button_size">44dp</dimen>
+
<!-- The padding around the scroll bar. -->
<dimen name="car_scroll_bar_padding">16dp</dimen>
diff --git a/car/src/main/java/android/support/car/widget/PagedListView.java b/car/src/main/java/android/support/car/widget/PagedListView.java
index d87c943..4652700 100644
--- a/car/src/main/java/android/support/car/widget/PagedListView.java
+++ b/car/src/main/java/android/support/car/widget/PagedListView.java
@@ -162,7 +162,7 @@
if (offsetScrollBar) {
MarginLayoutParams params = (MarginLayoutParams) mRecyclerView.getLayoutParams();
params.setMarginStart(getResources().getDimensionPixelSize(
- R.dimen.car_paged_list_view_pagination_width));
+ R.dimen.car_screen_margin_size));
params.setMarginEnd(
a.getDimensionPixelSize(R.styleable.PagedListView_listEndMargin, 0));
mRecyclerView.setLayoutParams(params);
