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

Merge "Fixing reading shade expansion progress when user pulls from the top of lockscreen" into tm-qpr-dev am: bfeb0ef632

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20065564

Change-Id: I3a8eced637952c7c93598fdeb00005bac6ed9239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2022-10-04 13:08:27 +00:00
committed by Automerger Merge Worker
parent 634b9cb61a bfeb0ef632
commit bea48a57e8
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -2482,17 +2482,23 @@ public final class NotificationPanelViewController extends PanelViewController {
mDepthController.setQsPanelExpansion(qsExpansionFraction); mDepthController.setQsPanelExpansion(qsExpansionFraction);
mStatusBarKeyguardViewManager.setQsExpansion(qsExpansionFraction); mStatusBarKeyguardViewManager.setQsExpansion(qsExpansionFraction);
// updateQsExpansion will get called whenever mTransitionToFullShadeProgress or float shadeExpandedFraction = isOnKeyguard()
// mLockscreenShadeTransitionController.getDragProgress change. ? getLockscreenShadeDragProgress()
// When in lockscreen, getDragProgress indicates the true expanded fraction of QS
float shadeExpandedFraction = mTransitioningToFullShadeProgress > 0
? mLockscreenShadeTransitionController.getQSDragProgress()
: getExpandedFraction(); : getExpandedFraction();
mLargeScreenShadeHeaderController.setShadeExpandedFraction(shadeExpandedFraction); mLargeScreenShadeHeaderController.setShadeExpandedFraction(shadeExpandedFraction);
mLargeScreenShadeHeaderController.setQsExpandedFraction(qsExpansionFraction); mLargeScreenShadeHeaderController.setQsExpandedFraction(qsExpansionFraction);
mLargeScreenShadeHeaderController.setQsVisible(mQsVisible); mLargeScreenShadeHeaderController.setQsVisible(mQsVisible);
} }
private float getLockscreenShadeDragProgress() {
// mTransitioningToFullShadeProgress > 0 means we're doing regular lockscreen to shade
// transition. If that's not the case we should follow QS expansion fraction for when
// user is pulling from the same top to go directly to expanded QS
return mTransitioningToFullShadeProgress > 0
? mLockscreenShadeTransitionController.getQSDragProgress()
: computeQsExpansionFraction();
}
private void onStackYChanged(boolean shouldAnimate) { private void onStackYChanged(boolean shouldAnimate) {
if (mQs != null) { if (mQs != null) {
if (shouldAnimate) { if (shouldAnimate) {
@@ -4759,9 +4765,7 @@ public final class NotificationPanelViewController extends PanelViewController {
@Override @Override
public float getLockscreenShadeDragProgress() { public float getLockscreenShadeDragProgress() {
return mTransitioningToFullShadeProgress > 0 return NotificationPanelViewController.this.getLockscreenShadeDragProgress();
? mLockscreenShadeTransitionController.getQSDragProgress()
: computeQsExpansionFraction();
} }
}; };