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

Merge "Fixing duplicate status bars in unfolded mode"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-18 21:21:45 +00:00
committed by Android (Google) Code Review
parent e0e1771c36 d23d6bb38a
commit a78c119905
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -2439,7 +2439,7 @@ public class NotificationPanelViewController extends PanelViewController {
mSplitShadeHeaderController.setShadeExpandedFraction(shadeExpandedFraction);
mSplitShadeHeaderController.setQsExpandedFraction(qsExpansionFraction);
mSplitShadeHeaderController.setShadeExpanded(mQsVisible);
mKeyguardStatusBarViewController.updateViewState();
if (mCommunalViewController != null) {
mCommunalViewController.updateQsExpansion(qsExpansionFraction);
@@ -4736,8 +4736,6 @@ public class NotificationPanelViewController extends PanelViewController {
public interface NotificationPanelViewStateProvider {
/** Returns the expanded height of the panel view. */
float getPanelViewExpandedHeight();
/** Returns the fraction of QS that's expanded. */
float getQsExpansionFraction();
/**
* Returns true if heads up should be visible.
*
@@ -4757,11 +4755,6 @@ public class NotificationPanelViewController extends PanelViewController {
return getExpandedHeight();
}
@Override
public float getQsExpansionFraction() {
return computeQsExpansionFraction();
}
@Override
public boolean shouldHeadsUpBeVisible() {
return mHeadsUpAppearanceController.shouldBeVisible();
@@ -4769,7 +4762,9 @@ public class NotificationPanelViewController extends PanelViewController {
@Override
public float getLockscreenShadeDragProgress() {
return mLockscreenShadeTransitionController.getQSDragProgress();
return mTransitioningToFullShadeProgress > 0
? mLockscreenShadeTransitionController.getQSDragProgress()
: computeQsExpansionFraction();
}
};

10
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java
View File

@@ -354,7 +354,6 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {
TestNotificationPanelViewStateProvider() {}
private float mPanelViewExpandedHeight = 100f;
private float mQsExpansionFraction = 0f;
private boolean mShouldHeadsUpBeVisible = false;
private float mLockscreenShadeDragProgress = 0f;
@@ -363,11 +362,6 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {
return mPanelViewExpandedHeight;
}
@Override
public float getQsExpansionFraction() {
return mQsExpansionFraction;
}
@Override
public boolean shouldHeadsUpBeVisible() {
return mShouldHeadsUpBeVisible;
@@ -382,10 +376,6 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {
this.mPanelViewExpandedHeight = panelViewExpandedHeight;
}
public void setQsExpansionFraction(float qsExpansionFraction) {
this.mQsExpansionFraction = qsExpansionFraction;
}
public void setShouldHeadsUpBeVisible(boolean shouldHeadsUpBeVisible) {
this.mShouldHeadsUpBeVisible = shouldHeadsUpBeVisible;
}