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

Merge "Fixed an issue where the qs position was wrong while bypassing" into sc-dev am: 2ce2914cf9

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

Change-Id: Ie67038d31dcf37fd5275f56cd5df128a847ce1f5
This commit is contained in:
Selim Cinek
2021-05-10 14:00:41 +00:00
committed by Automerger Merge Worker
parent 7051031f63 2ce2914cf9
commit 6f406540b3
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2574,16 +2574,19 @@ public class NotificationPanelViewController extends PanelViewController {
// Small parallax as we pull down and clip QS
startHeight = -mQsExpansionHeight * 0.2f;
}
if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()
&& mNotificationStackScrollLayoutController.isPulseExpanding()) {
if (!mPulseExpansionHandler.isExpanding()
&& !mPulseExpansionHandler.getLeavingLockscreen()) {
// If we aborted the expansion we need to make sure the header doesn't reappear
// again after the header has animated away
appearAmount = 0;
if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()) {
if (mNotificationStackScrollLayoutController.isPulseExpanding()) {
if (!mPulseExpansionHandler.isExpanding()
&& !mPulseExpansionHandler.getLeavingLockscreen()) {
// If we aborted the expansion we need to make sure the header doesn't reappear
// again after the header has animated away
appearAmount = 0;
} else {
appearAmount = mNotificationStackScrollLayoutController
.calculateAppearFractionBypass();
}
} else {
appearAmount = mNotificationStackScrollLayoutController
.calculateAppearFractionBypass();
appearAmount = 0.0f;
}
startHeight = -mQs.getQsMinExpansionHeight();
}