diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-13 14:19:29 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-09-13 14:22:31 -0700 |
commit | 6f28e71e94aed69c71415ac5a5334fd0bb6c9ce5 (patch) | |
tree | a5359293016564f6ae70b9ba2061afd66c3f9f16 /src/com/android | |
parent | d139b0aa7d03f676dc7869dc5b39fd9f24ff0a1d (diff) | |
download | android_packages_apps_Trebuchet-6f28e71e94aed69c71415ac5a5334fd0bb6c9ce5.tar.gz android_packages_apps_Trebuchet-6f28e71e94aed69c71415ac5a5334fd0bb6c9ce5.tar.bz2 android_packages_apps_Trebuchet-6f28e71e94aed69c71415ac5a5334fd0bb6c9ce5.zip |
Simplifying the startSearch call in launcher callbacks
Change-Id: I722e110903cced237f05667c4d711468d7cd3daa
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 39 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherCallbacks.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherExterns.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/testing/LauncherExtension.java | 7 |
4 files changed, 15 insertions, 41 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9ac075d99..123c7d8bf 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1232,7 +1232,8 @@ public class Launcher extends Activity return mDefaultKeySsb.toString(); } - private void clearTypedText() { + @Override + public void clearTypedText() { mDefaultKeySsb.clear(); mDefaultKeySsb.clearSpans(); Selection.setSelection(mDefaultKeySsb, 0); @@ -1997,13 +1998,10 @@ public class Launcher extends Activity appSearchData.putString("source", "launcher-search"); } - // TODO send proper bounds. - Rect sourceBounds = null; - - boolean clearTextImmediately = startSearch(initialQuery, selectInitialQuery, - appSearchData, sourceBounds); - if (clearTextImmediately) { - clearTypedText(); + if (mLauncherCallbacks == null || + !mLauncherCallbacks.startSearch(initialQuery, selectInitialQuery, appSearchData)) { + // Starting search from the callbacks failed. Start the default global search. + startGlobalSearch(initialQuery, selectInitialQuery, appSearchData, null); } // We need to show the workspace after starting the search @@ -2011,28 +2009,9 @@ public class Launcher extends Activity } /** - * Start a text search. - * - * @return {@code true} if the search will start immediately, so any further keypresses - * will be handled directly by the search UI. {@code false} if {@link Launcher} should continue - * to buffer keypresses. - */ - public boolean startSearch(String initialQuery, - boolean selectInitialQuery, Bundle appSearchData, Rect sourceBounds) { - if (mLauncherCallbacks != null && mLauncherCallbacks.providesSearch()) { - return mLauncherCallbacks.startSearch(initialQuery, selectInitialQuery, appSearchData, - sourceBounds); - } - - startGlobalSearch(initialQuery, selectInitialQuery, - appSearchData, sourceBounds); - return false; - } - - /** * Starts the global search activity. This code is a copied from SearchManager */ - private void startGlobalSearch(String initialQuery, + public void startGlobalSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData, Rect sourceBounds) { final SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); @@ -3426,10 +3405,6 @@ public class Launcher extends Activity // TODO } - public boolean launcherCallbacksProvidesSearch() { - return (mLauncherCallbacks != null && mLauncherCallbacks.providesSearch()); - } - @Override public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { final boolean result = super.dispatchPopulateAccessibilityEvent(event); diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java index 4a58e51de..6394b9052 100644 --- a/src/com/android/launcher3/LauncherCallbacks.java +++ b/src/com/android/launcher3/LauncherCallbacks.java @@ -79,9 +79,11 @@ public interface LauncherCallbacks { @Deprecated public void onWorkspaceLockedChanged(); - public boolean providesSearch(); - public boolean startSearch(String initialQuery, boolean selectInitialQuery, - Bundle appSearchData, Rect sourceBounds); + /** + * Starts a search with {@param initialQuery}. Return false if search was not started. + */ + public boolean startSearch( + String initialQuery, boolean selectInitialQuery, Bundle appSearchData); public boolean hasCustomContentToLeft(); public void populateCustomContentContainer(); public View getQsbBar(); diff --git a/src/com/android/launcher3/LauncherExterns.java b/src/com/android/launcher3/LauncherExterns.java index c7a8668de..887859cb0 100644 --- a/src/com/android/launcher3/LauncherExterns.java +++ b/src/com/android/launcher3/LauncherExterns.java @@ -29,4 +29,6 @@ public interface LauncherExterns { public SharedPreferences getSharedPrefs(); public void setLauncherOverlay(Launcher.LauncherOverlay overlay); + + void clearTypedText(); } diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java index 0affc81f8..6797c7ba3 100644 --- a/src/com/android/launcher3/testing/LauncherExtension.java +++ b/src/com/android/launcher3/testing/LauncherExtension.java @@ -139,13 +139,8 @@ public class LauncherExtension extends Launcher { } @Override - public boolean providesSearch() { - return false; - } - - @Override public boolean startSearch(String initialQuery, boolean selectInitialQuery, - Bundle appSearchData, Rect sourceBounds) { + Bundle appSearchData) { return false; } |