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

Merge "Log when qs height is set to 0 but probably shouldn't" into tm-qpr-dev

Browse Source
This commit is contained in:
Michał Brzeziński
2023-02-23 12:18:48 +00:00
committed by Android (Google) Code Review
parent 6e0e72c8eb 77e88f613b
commit 3a09854101
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
View File

@@ -193,7 +193,12 @@ public class QuickSettingsController {
private boolean mAnimatingHiddenFromCollapsed; private boolean mAnimatingHiddenFromCollapsed;
private boolean mVisible; private boolean mVisible;
private float mExpansionHeight; private float mExpansionHeight;
/**
* QS height when QS expansion fraction is 0 so when QS is collapsed. That state doesn't really
* exist for split shade so currently this value is always 0 then.
*/
private int mMinExpansionHeight; private int mMinExpansionHeight;
/** QS height when QS expansion fraction is 1 so qs is fully expanded */
private int mMaxExpansionHeight; private int mMaxExpansionHeight;
/** Expansion fraction of the notification shade */ /** Expansion fraction of the notification shade */
private float mShadeExpandedFraction; private float mShadeExpandedFraction;
@@ -697,6 +702,7 @@ public class QuickSettingsController {
/** update Qs height state */ /** update Qs height state */
public void setExpansionHeight(float height) { public void setExpansionHeight(float height) {
checkCorrectSplitShadeState(height);
int maxHeight = getMaxExpansionHeight(); int maxHeight = getMaxExpansionHeight();
height = Math.min(Math.max( height = Math.min(Math.max(
height, getMinExpansionHeight()), maxHeight); height, getMinExpansionHeight()), maxHeight);
@@ -718,6 +724,14 @@ public class QuickSettingsController {
} }
} }
/** TODO(b/269742565) Remove this logging */
private void checkCorrectSplitShadeState(float height) {
if (mSplitShadeEnabled && height == 0
&& mPanelViewControllerLazy.get().isShadeFullyOpen()) {
Log.wtfStack(TAG, "qsExpansion set to 0 while split shade is expanding or open");
}
}
/** */ /** */
public void setHeightOverrideToDesiredHeight() { public void setHeightOverrideToDesiredHeight() {
if (isSizeChangeAnimationRunning() && isQsFragmentCreated()) { if (isSizeChangeAnimationRunning() && isQsFragmentCreated()) {