summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-03-23 14:45:54 -0700
committerWinson Chung <winsonc@google.com>2015-03-24 10:30:05 -0700
commitf819dc2bc782e93ac9ecc163a99af0da62821d31 (patch)
tree6f16811baf4d92944e4a3d148cf28a8dc78741fd /res
parent27959c30394f629e0c551e1c8dacaad8b42817a5 (diff)
downloadandroid_packages_apps_Trebuchet-f819dc2bc782e93ac9ecc163a99af0da62821d31.tar.gz
android_packages_apps_Trebuchet-f819dc2bc782e93ac9ecc163a99af0da62821d31.tar.bz2
android_packages_apps_Trebuchet-f819dc2bc782e93ac9ecc163a99af0da62821d31.zip
Making the scrollbar scrubbable.
- This change in behavior will remove the ability to scrub anywhere in the gutter to start fast-scrolling, but requires the user to touch near the scroll bar to start fast-scrolling. - Also fixes issue with wonky scrollbar due to the fake section breaks Change-Id: I34b08ac46ea93f7f4cad7ccde1048a388ee6a55d
Diffstat (limited to 'res')
-rw-r--r--res/drawable-ldrtl/apps_list_fastscroll_bg.xml27
-rw-r--r--res/drawable/apps_list_scrollbar_thumb.xml2
-rw-r--r--res/layout/apps_list_view.xml5
-rw-r--r--res/values/dimens.xml5
4 files changed, 32 insertions, 7 deletions
diff --git a/res/drawable-ldrtl/apps_list_fastscroll_bg.xml b/res/drawable-ldrtl/apps_list_fastscroll_bg.xml
new file mode 100644
index 000000000..772975a71
--- /dev/null
+++ b/res/drawable-ldrtl/apps_list_fastscroll_bg.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/apps_view_scrollbar_thumb_color" />
+ <size
+ android:width="64dp"
+ android:height="64dp" />
+ <corners
+ android:topLeftRadius="64dp"
+ android:topRightRadius="64dp"
+ android:bottomRightRadius="64dp" />
+</shape> \ No newline at end of file
diff --git a/res/drawable/apps_list_scrollbar_thumb.xml b/res/drawable/apps_list_scrollbar_thumb.xml
index 59383a5bb..318d40678 100644
--- a/res/drawable/apps_list_scrollbar_thumb.xml
+++ b/res/drawable/apps_list_scrollbar_thumb.xml
@@ -17,5 +17,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/apps_view_scrollbar_thumb_color" />
- <size android:width="@dimen/apps_view_fast_scroll_bar_size" />
+ <size android:width="@dimen/apps_view_fast_scroll_bar_width" />
</shape> \ No newline at end of file
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index 59c04103f..3e42f8489 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -36,7 +36,7 @@
android:textSize="16sp"
android:textColor="#4c4c4c"
android:textColorHint="#9c9c9c"
- android:imeOptions="flagNoExtractUi"
+ android:imeOptions="actionDone|flagNoExtractUi"
android:background="@drawable/apps_list_search_bg"
android:elevation="4dp" />
<com.android.launcher3.AppsContainerRecyclerView
@@ -47,9 +47,6 @@
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:clipToPadding="false"
- android:fadeScrollbars="false"
- android:scrollbars="vertical"
- android:scrollbarThumbVertical="@drawable/apps_list_scrollbar_thumb"
android:focusable="true"
android:descendantFocusability="afterDescendants"
android:background="@drawable/apps_list_bg" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b9b9a2412..c327ec2d4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,8 +52,9 @@
<dimen name="apps_grid_view_start_margin">52dp</dimen>
<dimen name="apps_view_row_height">64dp</dimen>
<dimen name="apps_view_section_text_size">24sp</dimen>
- <dimen name="apps_view_fast_scroll_bar_size">6dp</dimen>
- <dimen name="apps_view_fast_scroll_gutter_size">40dp</dimen>
+ <dimen name="apps_view_fast_scroll_bar_width">6dp</dimen>
+ <dimen name="apps_view_fast_scroll_bar_min_height">64dp</dimen>
+ <dimen name="apps_view_fast_scroll_scrubber_touch_inset">-16dp</dimen>
<dimen name="apps_view_fast_scroll_popup_size">64dp</dimen>
<dimen name="apps_view_fast_scroll_text_size">40dp</dimen>