Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9745ad6 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

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

parents b7b84320 f707041f

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -697,10 +697,12 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        if (mQSAnimator != null) {

            mQSAnimator.setPosition(expansion);

        }

        if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD

        if (!mInSplitShade

                || mStatusBarStateController.getState() == StatusBarState.KEYGUARD

                || mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED) {

            // 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);

        } else {

            mQsMediaHost.setSquishFraction(mSquishinessFraction);