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

Fixed too much padding in QQS with top corner cutout

Browse Source 
Set padding only for system icon view.

Bug: 149766935
Test: atest SystemUITests
Test: manual set corner cutout and expand qs panel
Change-Id: I0f1d485aed50410ebe189112468f2ab5faaa15ce
This commit is contained in:
shawnlin
2020-02-19 16:48:54 +08:00
parent b073a3eb54
commit 4b0cf98cdd
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,23 +435,22 @@ public class QuickStatusBarHeader extends RelativeLayout implements
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
// Handle padding of SystemIconsView
DisplayCutout cutout = insets.getDisplayCutout();
// Handle padding of QuickStatusBarHeader
Pair<Integer, Integer> cornerCutoutPadding = StatusBarWindowView.cornerCutoutMargins(
cutout, getDisplay());
Pair<Integer, Integer> padding =
StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(
cutout, cornerCutoutPadding, mRoundedCornerPadding);
setPadding(padding.first, 0, padding.second, getPaddingBottom());
// Handle padding of SystemIconsView
final int waterfallTopInset = cutout == null ? 0 : cutout.getWaterfallInsets().top;
mSystemIconsView.setPaddingRelative(
getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start),
waterfallTopInset,
getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end),
0);
int statusBarPaddingLeft = isLayoutRtl()
? getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end)
: getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start);
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);
return super.onApplyWindowInsets(insets);
}