resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary

Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
This commit is contained in:
Sunny Goyal
2016-02-19 11:12:14 -08:00
4 changed files with 23 additions and 21 deletions

View File

@@ -371,11 +371,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
mAdapter.updateBackgroundPadding(bgPadding);
mElevationController.updateBackgroundPadding(bgPadding);
// Hack: We are going to let the recycler view take the full width, so reset the padding on
// the container to zero after setting the background and apply the top-bottom padding to
// the content view instead so that the launcher transition clips correctly.
getContentView().setPadding(0, 0, 0, 0);
// Pad the recycler view by the background padding plus the start margin (for the section
// names)
int maxScrollBarWidth = mAppsRecyclerView.getMaxScrollbarWidth();