Merge "Do not expand quick settings when shade first opens" into sc-dev am: 8b6cc5fd2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846827 Change-Id: I4a67f0c89ffc34814f11418d86e8a170b4ae0b03
This commit is contained in:
@@ -2210,7 +2210,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