Merge "Do not expand quick settings when shade first opens" into sc-dev
This commit is contained in:
@@ -2203,7 +2203,7 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());
|
final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());
|
||||||
final boolean visible = (computeQsExpansionFraction() > 0 || qsPanelBottomY > 0)
|
final boolean visible = (computeQsExpansionFraction() > 0 || qsPanelBottomY > 0)
|
||||||
&& !mShouldUseSplitNotificationShade;
|
&& !mShouldUseSplitNotificationShade;
|
||||||
setQsExpansionEnabled(mAmbientState.getScrollY() == 0);
|
setQsExpansionEnabled(mAmbientState.getScrollY() == 0 && !mAmbientState.isShadeOpening());
|
||||||
|
|
||||||
if (!mShouldUseSplitNotificationShade) {
|
if (!mShouldUseSplitNotificationShade) {
|
||||||
if (mTransitioningToFullShadeProgress > 0.0f) {
|
if (mTransitioningToFullShadeProgress > 0.0f) {
|
||||||
|
|||||||
Reference in New Issue
Block a user