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

Merge "Fixed wrong QS padding" into rvc-dev

Browse Source
This commit is contained in:
Shawn Lin
2020-03-18 05:28:43 +00:00
committed by Android (Google) Code Review
parent 9144141d32 6aa582a731
commit 841f253cb1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,6 +436,10 @@ public class QuickStatusBarHeader extends RelativeLayout implements
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
// Handle padding of QuickStatusBarHeader
setPadding(mRoundedCornerPadding, getPaddingTop(), mRoundedCornerPadding,
getPaddingBottom());
// Handle padding of SystemIconsView
DisplayCutout cutout = insets.getDisplayCutout();
Pair<Integer, Integer> cornerCutoutPadding = StatusBarWindowView.cornerCutoutMargins(
@@ -450,8 +454,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements
int statusBarPaddingRight = isLayoutRtl()
? getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start)
: getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end);
mSystemIconsView.setPadding(padding.first + statusBarPaddingLeft, waterfallTopInset,
padding.second + statusBarPaddingRight, 0);
mSystemIconsView.setPadding(
Math.max(padding.first + statusBarPaddingLeft - mRoundedCornerPadding, 0),
waterfallTopInset,
Math.max(padding.second + statusBarPaddingRight - mRoundedCornerPadding, 0),
0);
return super.onApplyWindowInsets(insets);
}