summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-03-24 17:33:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-24 17:33:30 +0000
commitdcb3fa6939c6f1c173e5c8ac3a52ae1093dbfb1a (patch)
tree6e36274efd690e8a9657f88cb1d0bc3541b600c8 /res/layout
parent10451a967f65c577010d359e1226fd0b5897dbe6 (diff)
parentf819dc2bc782e93ac9ecc163a99af0da62821d31 (diff)
downloadandroid_packages_apps_Trebuchet-dcb3fa6939c6f1c173e5c8ac3a52ae1093dbfb1a.tar.gz
android_packages_apps_Trebuchet-dcb3fa6939c6f1c173e5c8ac3a52ae1093dbfb1a.tar.bz2
android_packages_apps_Trebuchet-dcb3fa6939c6f1c173e5c8ac3a52ae1093dbfb1a.zip
Merge "Making the scrollbar scrubbable." into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/apps_list_view.xml5
1 files changed, 1 insertions, 4 deletions
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" />