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

Merge "Prevent squishing of the QsMediaHost when not in split shade" into tm-qpr-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-11-23 15:52:40 +00:00
committed by Android (Google) Code Review
parent b7b84320d4 f707041f0c
commit b9745ad64b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -697,10 +697,12 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
if (mQSAnimator != null) { if (mQSAnimator != null) {
mQSAnimator.setPosition(expansion); mQSAnimator.setPosition(expansion);
} }
if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD if (!mInSplitShade
|| mStatusBarStateController.getState() == StatusBarState.KEYGUARD
|| mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED) { || mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED) {
// At beginning, state is 0 and will apply wrong squishiness to MediaHost in lockscreen // At beginning, state is 0 and will apply wrong squishiness to MediaHost in lockscreen
// and media player expect no change by squishiness in lock screen shade // and media player expect no change by squishiness in lock screen shade. Don't bother
// squishing mQsMediaHost when not in split shade to prevent problems with stale state.
mQsMediaHost.setSquishFraction(1.0F); mQsMediaHost.setSquishFraction(1.0F);
} else { } else {
mQsMediaHost.setSquishFraction(mSquishinessFraction); mQsMediaHost.setSquishFraction(mSquishinessFraction);