Merge "Clip tile pages on horizontal with media" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
20213382a9
@@ -97,7 +97,7 @@ public class QSPanel extends LinearLayout implements Tunable {
|
|||||||
|
|
||||||
private BrightnessMirrorController mBrightnessMirrorController;
|
private BrightnessMirrorController mBrightnessMirrorController;
|
||||||
private LinearLayout mHorizontalLinearLayout;
|
private LinearLayout mHorizontalLinearLayout;
|
||||||
private LinearLayout mHorizontalContentContainer;
|
protected LinearLayout mHorizontalContentContainer;
|
||||||
|
|
||||||
// Only used with media
|
// Only used with media
|
||||||
private QSTileLayout mHorizontalTileLayout;
|
private QSTileLayout mHorizontalTileLayout;
|
||||||
@@ -132,7 +132,7 @@ public class QSPanel extends LinearLayout implements Tunable {
|
|||||||
|
|
||||||
mHorizontalContentContainer = new RemeasuringLinearLayout(mContext);
|
mHorizontalContentContainer = new RemeasuringLinearLayout(mContext);
|
||||||
mHorizontalContentContainer.setOrientation(LinearLayout.VERTICAL);
|
mHorizontalContentContainer.setOrientation(LinearLayout.VERTICAL);
|
||||||
mHorizontalContentContainer.setClipChildren(false);
|
mHorizontalContentContainer.setClipChildren(true);
|
||||||
mHorizontalContentContainer.setClipToPadding(false);
|
mHorizontalContentContainer.setClipToPadding(false);
|
||||||
|
|
||||||
mHorizontalTileLayout = createHorizontalTileLayout();
|
mHorizontalTileLayout = createHorizontalTileLayout();
|
||||||
|
|||||||
@@ -52,6 +52,14 @@ public class QuickQSPanel extends QSPanel {
|
|||||||
// Don't add brightness view
|
// Don't add brightness view
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
void initialize() {
|
||||||
|
super.initialize();
|
||||||
|
if (mHorizontalContentContainer != null) {
|
||||||
|
mHorizontalContentContainer.setClipChildren(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TileLayout createRegularTileLayout() {
|
public TileLayout createRegularTileLayout() {
|
||||||
return new QQSSideLabelTileLayout(mContext);
|
return new QQSSideLabelTileLayout(mContext);
|
||||||
|
|||||||
Reference in New Issue
Block a user