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

Merge "Use full height (-navbars) for QS" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-04-28 13:13:05 +00:00
committed by Android (Google) Code Review
parent c761eed3ac c94934404b
commit eebbd44aef
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,11 +154,9 @@ public class QSContainerImpl extends FrameLayout {
// bottom and footer are inside the screen.
MarginLayoutParams layoutParams = (MarginLayoutParams) mQSPanelContainer.getLayoutParams();
// The footer is pinned to the bottom of QSPanel (same bottoms), therefore we don't need to
// subtract its height. We do not care if the collapsed notifications fit in the screen.
int maxQs = getDisplayHeight() - layoutParams.topMargin - layoutParams.bottomMargin
int availableScreenHeight = getDisplayHeight() - mNavBarInset;
int maxQs = availableScreenHeight - layoutParams.topMargin - layoutParams.bottomMargin
- getPaddingBottom();
maxQs -= mNavBarInset;
int padding = mPaddingLeft + mPaddingRight + layoutParams.leftMargin
+ layoutParams.rightMargin;
final int qsPanelWidthSpec = getChildMeasureSpec(widthMeasureSpec, padding,
@@ -169,7 +167,7 @@ public class QSContainerImpl extends FrameLayout {
int height = layoutParams.topMargin + layoutParams.bottomMargin
+ mQSPanelContainer.getMeasuredHeight() + getPaddingBottom();
super.onMeasure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
MeasureSpec.makeMeasureSpec(availableScreenHeight, MeasureSpec.EXACTLY));
// QSCustomizer will always be the height of the screen, but do this after
// other measuring to avoid changing the height of the QS.
mQSCustomizer.measure(widthMeasureSpec,