Merge "Prevent squishing of the QsMediaHost when not in split shade" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b9745ad64b
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user