resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary

Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
This commit is contained in:
Sunny Goyal committed 2016-02-19 11:12:14 -08:00
commit f940684626
4 files changed
+23 -21

No files matched your search

@@ -140,6 +140,10 @@ public abstract class BaseContainerView extends FrameLayout implements Insettabl
mRevealView.setBackground(background.getConstantState().newDrawable());
mContent.setBackground(background);
// We let the content have a intent background, but still have full width.
// This allows the scroll bar to be used responsive outside the background bounds as well.
mContent.setPadding(0, 0, 0, 0);
Rect bgPadding = new Rect();
background.getPadding(bgPadding);
onUpdateBgPadding(padding, bgPadding);