summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-08-11 23:38:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-11 23:38:00 +0000
commitd5b43b555673d86d4b561938bf807ed460173995 (patch)
tree0f13cdd92a4b922ceb511a99f958d37e8ae4d873 /res
parentd209f9e4e9cadf3f5c56c6ce25ec61f37493a2e9 (diff)
parenta2917f6a0b9a24accaf21d75c0e80701bb07e2ed (diff)
downloadandroid_packages_apps_Trebuchet-d5b43b555673d86d4b561938bf807ed460173995.tar.gz
android_packages_apps_Trebuchet-d5b43b555673d86d4b561938bf807ed460173995.tar.bz2
android_packages_apps_Trebuchet-d5b43b555673d86d4b561938bf807ed460173995.zip
am a2917f6a: Merge "Ensuring that AllAppsGridAdapter is public." into ub-launcher3-burnaby
* commit 'a2917f6a0b9a24accaf21d75c0e80701bb07e2ed': Ensuring that AllAppsGridAdapter is public.
Diffstat (limited to 'res')
-rw-r--r--res/layout/all_apps_search_bar.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 4947203df..0c183eaee 100644
--- a/res/layout/all_apps_search_bar.xml
+++ b/res/layout/all_apps_search_bar.xml
@@ -47,7 +47,7 @@
android:gravity="fill_horizontal|center_vertical"
android:hint="@string/all_apps_search_bar_hint"
android:inputType="text|textNoSuggestions|textCapWords"
- android:imeOptions="actionDone|flagNoExtractUi"
+ android:imeOptions="actionSearch|flagNoExtractUi"
android:maxLines="1"
android:paddingLeft="8dp"
android:scrollHorizontally="true"