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

Merge "Fix shade collapse on keyguard with bypass enabled" into tm-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-07 19:24:20 +00:00
committed by Android (Google) Code Review
parent 8b794e6a71 ed56528c31
commit a26c3d99a0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java
View File

@@ -397,7 +397,7 @@ public abstract class PanelViewController {
mInitialOffsetOnTouch = expandedHeight; mInitialOffsetOnTouch = expandedHeight;
mInitialExpandY = newY; mInitialExpandY = newY;
mInitialExpandX = newX; mInitialExpandX = newX;
mInitialTouchFromKeyguard = mStatusBarStateController.getState() == StatusBarState.KEYGUARD; mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();
if (startTracking) { if (startTracking) {
mTouchSlopExceeded = true; mTouchSlopExceeded = true;
setExpandedHeight(mInitialOffsetOnTouch); setExpandedHeight(mInitialOffsetOnTouch);
@@ -416,9 +416,7 @@ public abstract class PanelViewController {
float vectorVel = (float) Math.hypot( float vectorVel = (float) Math.hypot(
mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity()); mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());
final boolean onKeyguard = final boolean onKeyguard = mKeyguardStateController.isShowing();
mStatusBarStateController.getState() == StatusBarState.KEYGUARD;
final boolean expand; final boolean expand;
if (mKeyguardStateController.isKeyguardFadingAway() if (mKeyguardStateController.isKeyguardFadingAway()
|| (mInitialTouchFromKeyguard && !onKeyguard)) { || (mInitialTouchFromKeyguard && !onKeyguard)) {