Update size of scroll bar buttons for PageListView
Bug: 31975881
Test: Manual
Change-Id: I1a02507173e45a5be6238bd3108ed0e2397ae11b
(cherry picked from commit 77931aa468e35c7588cdf17bd9d970332d3d0dbd)
diff --git a/car-support-lib/res/drawable/ic_down_button.xml b/car-support-lib/res/drawable/ic_down_button.xml
new file mode 100644
index 0000000..0565a63
--- /dev/null
+++ b/car-support-lib/res/drawable/ic_down_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<vector android:height="24dp" android:viewportHeight="48.0"
+ android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#FF000000" android:pathData="M24,0c-13.3,0 -24,10.7 -24,24s10.7,24 24,24s24,-10.7 24,-24S37.3,0 24,0zM24,46c-12.1,0 -22,-9.9 -22,-22s9.9,-22 22,-22s22,9.9 22,22S36.1,46 24,46z"/>
+ <path android:fillColor="#FF000000" android:pathData="M17.1,19.2l6.9,6.9l6.9,-6.9l2.1,2.1l-9,9.1l-9,-9.1z"/>
+</vector>
diff --git a/car-support-lib/res/drawable/ic_up_button.xml b/car-support-lib/res/drawable/ic_up_button.xml
new file mode 100644
index 0000000..8ac579a
--- /dev/null
+++ b/car-support-lib/res/drawable/ic_up_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<vector android:height="24dp" android:viewportHeight="48.0"
+ android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#FF000000" android:pathData="M24,48c13.3,0 24,-10.7 24,-24s-10.7,-24 -24,-24s-24,10.7 -24,24S10.7,48 24,48zM24,2c12.1,0 22,9.9 22,22s-9.9,22 -22,22s-22,-9.9 -22,-22S11.9,2 24,2z"/>
+ <path android:fillColor="#FF000000" android:pathData="M30.9,28.8l-6.9,-6.9l-6.9,6.9l-2.1,-2.1l9,-9.1l9,9.1z"/>
+</vector>
diff --git a/car-support-lib/res/layout/car_paged_recycler_view.xml b/car-support-lib/res/layout/car_paged_recycler_view.xml
index ce0f59e..7888721 100644
--- a/car-support-lib/res/layout/car_paged_recycler_view.xml
+++ b/car-support-lib/res/layout/car_paged_recycler_view.xml
@@ -21,6 +21,7 @@
android:id="@+id/paged_scroll_view"
android:layout_width="@dimen/car_paged_list_view_pagination_width"
android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/key_line1"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:visibility="invisible" />
diff --git a/car-support-lib/res/layout/car_paged_scrollbar_buttons.xml b/car-support-lib/res/layout/car_paged_scrollbar_buttons.xml
index 6a30470..e976f1c 100644
--- a/car-support-lib/res/layout/car_paged_scrollbar_buttons.xml
+++ b/car-support-lib/res/layout/car_paged_scrollbar_buttons.xml
@@ -22,9 +22,9 @@
android:orientation="vertical" >
<ImageView
android:id="@+id/page_up"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:scaleType="center"
+ android:layout_width="@dimen/scroll_button_size"
+ android:layout_height="@dimen/scroll_button_size"
+ android:scaleType="fitCenter"
android:background="@drawable/car_pagination_background"
android:focusable="false"
android:hapticFeedbackEnabled="false" />
@@ -37,16 +37,16 @@
android:layout_marginBottom="@dimen/car_paged_list_view_scrollbar_thumb_margin" >
<ImageView
android:id="@+id/scrollbar_thumb"
- android:layout_width="6dp"
+ android:layout_width="@dimen/scroll_bar_thumb_width"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:src="@color/car_scrollbar_thumb" />
</FrameLayout>
<ImageView
android:id="@+id/page_down"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:scaleType="center"
+ android:layout_width="@dimen/scroll_button_size"
+ android:layout_height="@dimen/scroll_button_size"
+ android:scaleType="fitCenter"
android:background="@drawable/car_pagination_background"
android:focusable="false"
android:hapticFeedbackEnabled="false" />
diff --git a/car-support-lib/res/values-w720dp/dimens.xml b/car-support-lib/res/values-w720dp/dimens.xml
new file mode 100644
index 0000000..d72006e
--- /dev/null
+++ b/car-support-lib/res/values-w720dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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_paged_list_view_pagination_width">76dp</dimen>
+ <dimen name="scroll_button_size">76dp</dimen>
+ <dimen name="scroll_bar_thumb_width">16dp</dimen>
+</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 0fa24f0..5349af9 100644
--- a/car-support-lib/res/values/dimens.xml
+++ b/car-support-lib/res/values/dimens.xml
@@ -50,9 +50,13 @@
<!-- The amount of space the LayoutManager will make sure the last item on the screen is
peeking before scrolling down -->
<dimen name="car_last_card_peek_amount">16dp</dimen>
- <dimen name="car_paged_list_view_pagination_width">96dp</dimen>
+ <dimen name="car_paged_list_view_pagination_width">48dp</dimen>
<dimen name="car_paged_list_view_button_background_inset">24dp</dimen>
<dimen name="car_paged_list_view_scrollbar_thumb_margin">8dp</dimen>
+
+ <dimen name="scroll_button_size">48dp</dimen>
+ <dimen name="scroll_bar_thumb_width">12dp</dimen>
+
<!-- height of list dividers -->
<dimen name="car_divider_height">1dp</dimen>
@@ -88,6 +92,6 @@
<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>
+ <dimen name="key_line1">32dp</dimen>
+ <dimen name="key_line2">132dp</dimen>
</resources>
diff --git a/car-support-lib/src/android/support/car/ui/PagedScrollBarView.java b/car-support-lib/src/android/support/car/ui/PagedScrollBarView.java
index 18c9ba3..997366f 100644
--- a/car-support-lib/src/android/support/car/ui/PagedScrollBarView.java
+++ b/car-support-lib/src/android/support/car/ui/PagedScrollBarView.java
@@ -76,11 +76,11 @@
R.layout.car_paged_scrollbar_buttons, this /*root*/, true /*attachToRoot*/);
mUpButton = (ImageView) findViewById(R.id.page_up);
- mUpButton.setImageDrawable(CarUiResourceLoader.getDrawable(context, "ic_up"));
+ mUpButton.setImageDrawable(context.getDrawable(R.drawable.ic_up_button));
mUpButton.setOnClickListener(this);
mUpButton.setOnLongClickListener(this);
mDownButton = (ImageView) findViewById(R.id.page_down);
- mDownButton.setImageDrawable(CarUiResourceLoader.getDrawable(context, "ic_down"));
+ mDownButton.setImageDrawable(context.getDrawable(R.drawable.ic_down_button));
mDownButton.setOnClickListener(this);
mDownButton.setOnLongClickListener(this);