summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-08-11 23:33:55 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-11 23:33:55 (GMT)
commita2917f6a0b9a24accaf21d75c0e80701bb07e2ed (patch)
tree2c35917cb2c6857669a95b0e81b77cf519bbee8b
parentb0d868f73037e0f732fa71d4bf557d4fcb1ed36c (diff)
parenteea9fa4022b9cdc5b2f65bbd9ed6b314c883248d (diff)
downloadandroid_packages_apps_Trebuchet-a2917f6a0b9a24accaf21d75c0e80701bb07e2ed.zip
android_packages_apps_Trebuchet-a2917f6a0b9a24accaf21d75c0e80701bb07e2ed.tar.gz
android_packages_apps_Trebuchet-a2917f6a0b9a24accaf21d75c0e80701bb07e2ed.tar.bz2
Merge "Ensuring that AllAppsGridAdapter is public." into ub-launcher3-burnaby
-rw-r--r--res/layout/all_apps_search_bar.xml2
-rw-r--r--src/com/android/launcher3/allapps/AllAppsGridAdapter.java2
-rw-r--r--src/com/android/launcher3/allapps/DefaultAppSearchController.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 4947203..0c183ea 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"
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 4acfc5c..f7c4489 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -49,7 +49,7 @@ import java.util.List;
/**
* The grid view adapter of all the apps.
*/
-class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> {
+public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> {
public static final String TAG = "AppsGridAdapter";
private static final boolean DEBUG = false;
diff --git a/src/com/android/launcher3/allapps/DefaultAppSearchController.java b/src/com/android/launcher3/allapps/DefaultAppSearchController.java
index 14cbb95..e1a2b7f 100644
--- a/src/com/android/launcher3/allapps/DefaultAppSearchController.java
+++ b/src/com/android/launcher3/allapps/DefaultAppSearchController.java
@@ -166,7 +166,7 @@ final class DefaultAppSearchController extends AllAppsSearchBarController
return false;
}
// Skip if it's not the right action
- if (actionId != EditorInfo.IME_ACTION_DONE) {
+ if (actionId != EditorInfo.IME_ACTION_SEARCH) {
return false;
}
// Skip if there are more than one icon