diff options
| author | Adam Cohen <adamcohen@google.com> | 2015-03-18 22:21:40 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2015-03-18 22:22:03 -0700 |
| commit | b0df1b0e1ac865818942851b6a0d1fdca4843834 (patch) | |
| tree | 95a7fb60999dca96956d99dd2c12d8144aab0215 /src/com/android/launcher3/Launcher.java | |
| parent | 40bff39b47c6989c795915cf5f47bc5be5682907 (diff) | |
| download | android_packages_apps_Trebuchet-b0df1b0e1ac865818942851b6a0d1fdca4843834.tar.gz android_packages_apps_Trebuchet-b0df1b0e1ac865818942851b6a0d1fdca4843834.tar.bz2 android_packages_apps_Trebuchet-b0df1b0e1ac865818942851b6a0d1fdca4843834.zip | |
Make sure we set the QSB bar on the SearchDropTargetBar
Change-Id: If106bae15b3d628d6385711bcb8059acd17d6147
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bf03f745b..d64296e79 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1441,10 +1441,7 @@ public class Launcher extends Activity dragController.addDropTarget(mWorkspace); if (mSearchDropTargetBar != null) { mSearchDropTargetBar.setup(this, dragController); - if (getOrCreateQsbBar() == null) { - // Explicitly set it to null during initialization. - mSearchDropTargetBar.setQsbSearchBar(null); - } + mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar()); } if (getResources().getBoolean(R.bool.debug_memory_enabled)) { @@ -4089,7 +4086,7 @@ public class Launcher extends Activity mSearchDropTargetBar.removeView(mQsb); mQsb = null; } - getOrCreateQsbBar(); + mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar()); } /** |