diff options
| author | Winson Chung <winsonc@google.com> | 2015-04-17 23:30:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 23:30:44 +0000 |
| commit | 10d336310b434b45ff2c4b8868b62c60350cc92d (patch) | |
| tree | 302c8f60cef437ae74e3bb5d5a30acc8cb0f5dbe | |
| parent | 682deae3eb4f030a430eac00190a8580fa7f55d6 (diff) | |
| parent | 7af216ff04b7f0c3852119b476d8f692edfcaaa7 (diff) | |
| download | android_packages_apps_Trebuchet-10d336310b434b45ff2c4b8868b62c60350cc92d.tar.gz android_packages_apps_Trebuchet-10d336310b434b45ff2c4b8868b62c60350cc92d.tar.bz2 android_packages_apps_Trebuchet-10d336310b434b45ff2c4b8868b62c60350cc92d.zip | |
am 7af216ff: Merge "Fixing build." into ub-launcher3-burnaby
* commit '7af216ff04b7f0c3852119b476d8f692edfcaaa7':
Fixing build.
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 3d8cf31c7..2bfb29ef6 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4415,6 +4415,17 @@ public class Launcher extends Activity return null; } + /** + * Returns whether the launcher callbacks overrides search in all apps. + * @return + */ + @Thunk boolean isAllAppsSearchOverridden() { + if (mLauncherCallbacks != null) { + return mLauncherCallbacks.overrideAllAppsSearch(); + } + return false; + } + private boolean shouldRunFirstRunActivity() { return !ActivityManager.isRunningInTestHarness() && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false); |