Merge "Clip tile pages on horizontal with media" into sc-dev am: 20213382a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920128

Change-Id: I41a227fdad366b13772b860d1aa5e5e00c7560f5
This commit is contained in:
TreeHugger Robot
2021-06-14 15:09:44 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 2 deletions

View File

@@ -97,7 +97,7 @@ public class QSPanel extends LinearLayout implements Tunable {
private BrightnessMirrorController mBrightnessMirrorController;
private LinearLayout mHorizontalLinearLayout;
private LinearLayout mHorizontalContentContainer;
protected LinearLayout mHorizontalContentContainer;
// Only used with media
private QSTileLayout mHorizontalTileLayout;
@@ -132,7 +132,7 @@ public class QSPanel extends LinearLayout implements Tunable {
mHorizontalContentContainer = new RemeasuringLinearLayout(mContext);
mHorizontalContentContainer.setOrientation(LinearLayout.VERTICAL);
mHorizontalContentContainer.setClipChildren(false);
mHorizontalContentContainer.setClipChildren(true);
mHorizontalContentContainer.setClipToPadding(false);
mHorizontalTileLayout = createHorizontalTileLayout();

View File

@@ -52,6 +52,14 @@ public class QuickQSPanel extends QSPanel {
// Don't add brightness view
}
@Override
void initialize() {
super.initialize();
if (mHorizontalContentContainer != null) {
mHorizontalContentContainer.setClipChildren(false);
}
}
@Override
public TileLayout createRegularTileLayout() {
return new QQSSideLabelTileLayout(mContext);