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

Browse Source
This commit is contained in:
Selim Cinek
2021-05-10 13:56:04 +00:00
committed by Android (Google) Code Review
parent 241f1e71c2 f2267af049
commit 2ce2914cf9
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2574,8 +2574,8 @@ public class NotificationPanelViewController extends PanelViewController {
// Small parallax as we pull down and clip QS // Small parallax as we pull down and clip QS
startHeight = -mQsExpansionHeight * 0.2f; startHeight = -mQsExpansionHeight * 0.2f;
} }
if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard() if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()) {
&& mNotificationStackScrollLayoutController.isPulseExpanding()) { if (mNotificationStackScrollLayoutController.isPulseExpanding()) {
if (!mPulseExpansionHandler.isExpanding() if (!mPulseExpansionHandler.isExpanding()
&& !mPulseExpansionHandler.getLeavingLockscreen()) { && !mPulseExpansionHandler.getLeavingLockscreen()) {
// If we aborted the expansion we need to make sure the header doesn't reappear // If we aborted the expansion we need to make sure the header doesn't reappear
@@ -2585,6 +2585,9 @@ public class NotificationPanelViewController extends PanelViewController {
appearAmount = mNotificationStackScrollLayoutController appearAmount = mNotificationStackScrollLayoutController
.calculateAppearFractionBypass(); .calculateAppearFractionBypass();
} }
} else {
appearAmount = 0.0f;
}
startHeight = -mQs.getQsMinExpansionHeight(); startHeight = -mQs.getQsMinExpansionHeight();
} }
float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount)); float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount));