aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Sanitizing various search container ids and layout names" into ub-launcher3-dorval-polish

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-04 09:06:53 +00:00
committed by Android (Google) Code Review
parent f593fb916e c7b8df8329
commit efbfcb838d
9 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Workspace.java
View File

@@ -600,12 +600,12 @@ public class Workspace extends PagedView
// In transposed layout, we add the QSB in the Grid. As workspace does not touch the
// edges, we do not need a full width QSB.
qsb = LayoutInflater.from(getContext())
.inflate(R.layout.qsb_container,firstPage, false);
.inflate(R.layout.search_container_workspace,firstPage, false);
}
CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(), 1);
lp.canReorder = false;
if (!firstPage.addViewToCellLayout(qsb, 0, R.id.qsb_container, lp, true)) {
if (!firstPage.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true)) {
Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");
}
}
@@ -623,7 +623,7 @@ public class Workspace extends PagedView
}
// Recycle the QSB widget
View qsb = findViewById(R.id.qsb_container);
View qsb = findViewById(R.id.search_container_workspace);
if (qsb != null) {
((ViewGroup) qsb.getParent()).removeView(qsb);
}