diff options
| author | Winson <winsonc@google.com> | 2015-08-11 16:20:47 -0700 |
|---|---|---|
| committer | Winson <winsonc@google.com> | 2015-08-11 16:27:16 -0700 |
| commit | eea9fa4022b9cdc5b2f65bbd9ed6b314c883248d (patch) | |
| tree | 29c72817b5b199b9243d9c48ab09acaf0774d22c | |
| parent | 99eceebfaae1071cde2cf05f2874b8d94795b43a (diff) | |
| download | android_packages_apps_Trebuchet-eea9fa4022b9cdc5b2f65bbd9ed6b314c883248d.tar.gz android_packages_apps_Trebuchet-eea9fa4022b9cdc5b2f65bbd9ed6b314c883248d.tar.bz2 android_packages_apps_Trebuchet-eea9fa4022b9cdc5b2f65bbd9ed6b314c883248d.zip | |
Ensuring that AllAppsGridAdapter is public.
- Also show the search action when searching all apps
Change-Id: I3470b0da565e6d1bce637ce09384d966215a4ca7
| -rw-r--r-- | res/layout/all_apps_search_bar.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/DefaultAppSearchController.java | 2 |
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 cf30eac36..c1399715d 100644 --- a/res/layout/all_apps_search_bar.xml +++ b/res/layout/all_apps_search_bar.xml @@ -48,7 +48,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 e96567c41..e613d50bc 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -45,7 +45,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 83b920589..39b48aada 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 isn't exactly one item |