Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove extra padding in QS header" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-05-07 16:55:24 +00:00
committed by Android (Google) Code Review
parent 3d32b8f244 d8720dfa11
commit 2e218a0cee
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -297,9 +297,7 @@ public class QSContainerImpl extends FrameLayout {
// start margin of next page). // start margin of next page).
qsPanelController.setPageMargin(2 * mSideMargins); qsPanelController.setPageMargin(2 * mSideMargins);
} else if (view == mHeader) { } else if (view == mHeader) {
// The header contains the QQS panel which needs to have special padding, to // No content padding for the header.
// visually align them.
quickStatusBarHeaderController.setContentMargins(mContentPadding, mContentPadding);
} else { } else {
view.setPaddingRelative( view.setPaddingRelative(
mContentPadding, mContentPadding,

23
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -77,8 +77,6 @@ public class QuickStatusBarHeader extends FrameLayout {
private int mStatusBarPaddingTop = 0; private int mStatusBarPaddingTop = 0;
private int mRoundedCornerPadding = 0; private int mRoundedCornerPadding = 0;
private int mContentMarginStart;
private int mContentMarginEnd;
private int mWaterfallTopInset; private int mWaterfallTopInset;
private int mCutOutPaddingLeft; private int mCutOutPaddingLeft;
private int mCutOutPaddingRight; private int mCutOutPaddingRight;
@@ -361,6 +359,8 @@ public class QuickStatusBarHeader extends FrameLayout {
} }
private void updateHeadersPadding() { private void updateHeadersPadding() {
setContentMargins(mDatePrivacyView, 0, 0);
setContentMargins(mClockIconsView, 0, 0);
int paddingLeft = 0; int paddingLeft = 0;
int paddingRight = 0; int paddingRight = 0;
@@ -374,14 +374,12 @@ public class QuickStatusBarHeader extends FrameLayout {
if (mCutOutPaddingLeft > 0) { if (mCutOutPaddingLeft > 0) {
// if there's a cutout, let's use at least the rounded corner inset // if there's a cutout, let's use at least the rounded corner inset
int cutoutPadding = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding); int cutoutPadding = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding);
int contentMarginLeft = isLayoutRtl() ? mContentMarginEnd : mContentMarginStart; paddingLeft = Math.max(cutoutPadding - leftMargin, 0);
paddingLeft = Math.max(cutoutPadding - contentMarginLeft - leftMargin, 0);
} }
if (mCutOutPaddingRight > 0) { if (mCutOutPaddingRight > 0) {
// if there's a cutout, let's use at least the rounded corner inset // if there's a cutout, let's use at least the rounded corner inset
int cutoutPadding = Math.max(mCutOutPaddingRight, mRoundedCornerPadding); int cutoutPadding = Math.max(mCutOutPaddingRight, mRoundedCornerPadding);
int contentMarginRight = isLayoutRtl() ? mContentMarginStart : mContentMarginEnd; paddingRight = Math.max(cutoutPadding - rightMargin, 0);
paddingRight = Math.max(cutoutPadding - contentMarginRight - rightMargin, 0);
} }
mDatePrivacyView.setPadding(paddingLeft, mDatePrivacyView.setPadding(paddingLeft,
@@ -402,19 +400,6 @@ public class QuickStatusBarHeader extends FrameLayout {
mHeaderQsPanel.setCallback(qsPanelCallback); mHeaderQsPanel.setCallback(qsPanelCallback);
} }
/** */
public void setContentMargins(int marginStart, int marginEnd,
QuickQSPanelController quickQSPanelController) {
mContentMarginStart = marginStart;
mContentMarginEnd = marginEnd;
// The clock and QQS are not direct children, but the container should be just a wrapper to
// be able to move them together. So we set the margins to the actual views.
quickQSPanelController.setContentMargins(0, 0);
setContentMargins(mDatePrivacyView, marginStart, marginEnd);
setContentMargins(mClockIconsView, marginStart, marginEnd);
updateHeadersPadding();
}
private void setContentMargins(View view, int marginStart, int marginEnd) { private void setContentMargins(View view, int marginStart, int marginEnd) {
MarginLayoutParams lp = (MarginLayoutParams) view.getLayoutParams(); MarginLayoutParams lp = (MarginLayoutParams) view.getLayoutParams();
lp.setMarginStart(marginStart); lp.setMarginStart(marginStart);

6
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
View File

@@ -183,6 +183,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
mView.onAttach(mIconManager, mQSExpansionPathInterpolator); mView.onAttach(mIconManager, mQSExpansionPathInterpolator);
mDemoModeController.addCallback(mDemoModeReceiver); mDemoModeController.addCallback(mDemoModeReceiver);
mHeaderQsPanelController.setContentMargins(0, 0);
} }
@Override @Override
@@ -259,11 +260,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
return mMicCameraIndicatorsEnabled || mLocationIndicatorsEnabled; return mMicCameraIndicatorsEnabled || mLocationIndicatorsEnabled;
} }
public void setContentMargins(int contentPaddingStart, int contentPaddingEnd) {
mView.setContentMargins(contentPaddingStart, contentPaddingEnd, mHeaderQsPanelController);
}
private static class ClockDemoModeReceiver implements DemoMode { private static class ClockDemoModeReceiver implements DemoMode {
private Clock mClockView; private Clock mClockView;