Merge "Simplifying all-apps search box" into ub-launcher3-master

This commit is contained in:
Sunny Goyal
2018-03-06 00:12:59 +00:00
committed by Android (Google) Code Review
13 changed files with 85 additions and 187 deletions

View File

@@ -187,7 +187,7 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
mHeader.reset();
}
// Reset the search bar and base recycler view after transitioning home
mSearchUiManager.reset();
mSearchUiManager.resetSearch();
}
@Override
@@ -274,11 +274,10 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
ViewGroup.MarginLayoutParams mlp = (MarginLayoutParams) getLayoutParams();
if (grid.isVerticalBarLayout()) {
mlp.leftMargin = insets.left;
mlp.topMargin = insets.top;
mlp.rightMargin = insets.right;
setPadding(grid.workspacePadding.left, 0, grid.workspacePadding.right, 0);
} else {
mlp.leftMargin = mlp.rightMargin = mlp.topMargin = 0;
mlp.leftMargin = mlp.rightMargin = 0;
setPadding(0, 0, 0, 0);
}
setLayoutParams(mlp);