diff options
author | Winson Chung <winsonc@google.com> | 2015-08-10 22:55:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-10 22:55:40 +0000 |
commit | a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44 (patch) | |
tree | 40e766625450a2176c07890591e733f782144316 /src/com/android/launcher3/Launcher.java | |
parent | b33e09a93cda9793b84ec70e1d85c9038f5d3ee6 (diff) | |
parent | bedf9232eb67a420f0372d3ca135ca13194e603b (diff) | |
download | android_packages_apps_Trebuchet-a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44.tar.gz android_packages_apps_Trebuchet-a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44.tar.bz2 android_packages_apps_Trebuchet-a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44.zip |
Merge "Adding market search." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 32e7ee681..298b2c469 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2137,6 +2137,15 @@ public class Launcher extends Activity } } + public void startSearchFromAllApps(View v, Intent searchIntent, String searchQuery) { + if (mLauncherCallbacks != null && mLauncherCallbacks.startSearchFromAllApps(searchQuery)) { + return; + } + + // If not handled, then just start the provided search intent + startActivitySafely(v, searchIntent, null); + } + public boolean isOnCustomContent() { return mWorkspace.isOnOrMovingToCustomContent(); } @@ -2538,6 +2547,10 @@ public class Launcher extends Activity if (!isAppsViewVisible()) { showAppsView(true /* animated */, false /* resetListToTop */, true /* updatePredictedApps */, false /* focusSearchBar */); + + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onClickAllAppsButton(v); + } } } @@ -2929,7 +2942,7 @@ public class Launcher extends Activity return false; } - @Thunk boolean startActivitySafely(View v, Intent intent, Object tag) { + public boolean startActivitySafely(View v, Intent intent, Object tag) { boolean success = false; if (mIsSafeModeEnabled && !Utilities.isSystemApp(this, intent)) { Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show(); |