diff options
author | Winson Chung <winsonc@google.com> | 2015-07-10 12:38:30 -0700 |
---|---|---|
committer | Winson <winsonc@google.com> | 2015-08-06 12:22:38 -0700 |
commit | bedf9232eb67a420f0372d3ca135ca13194e603b (patch) | |
tree | bcce2d55b9b90d760e874a506b3a0597b6006380 /src/com/android/launcher3/Launcher.java | |
parent | d1ea63f24a751521e6c35cc06be0e548e0b04f23 (diff) | |
download | android_packages_apps_Trebuchet-bedf9232eb67a420f0372d3ca135ca13194e603b.tar.gz android_packages_apps_Trebuchet-bedf9232eb67a420f0372d3ca135ca13194e603b.tar.bz2 android_packages_apps_Trebuchet-bedf9232eb67a420f0372d3ca135ca13194e603b.zip |
Adding market search.
Change-Id: Id41615653cd4fa76213add4595418ad0cc6e7852
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 9d04770af..2d338e3d4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2132,6 +2132,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(); } @@ -2533,6 +2542,10 @@ public class Launcher extends Activity if (!isAppsViewVisible()) { showAppsView(true /* animated */, false /* resetListToTop */, true /* updatePredictedApps */, false /* focusSearchBar */); + + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onClickAllAppsButton(v); + } } } @@ -2924,7 +2937,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(); |