PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 57dadda8: Merge "Make sure we set the QSB bar on the SearchDropTargetBar" into ub-launcher3-burnaby

Browse Source 
* commit '57dadda8442e3182081e7929bda940c098c147e5':
  Make sure we set the QSB bar on the SearchDropTargetBar
This commit is contained in:
Adam Cohen
2015-03-19 05:36:44 +00:00
committed by Android Git Automerger
parent 33c3c2fa0e 57dadda844
commit 7fed5a38c4
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+2 -5
View File
@@ -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());
}
/**