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

Commit 310e7c59 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Split-shade: show status bar earlier when closing shade" into... 

Merge "Split-shade: show status bar earlier when closing shade" into tm-qpr-dev am: 0ddb66c9 am: 5eafbd82

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21018945



Change-Id: Ia4e68e40821688f4394fdf16876782a979993b1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae5da340 5eafbd82

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −4
Original line number Diff line number Diff line
@@ -4186,9 +4186,7 @@ public final class NotificationPanelViewController implements Dumpable { 
    }



    private void updateStatusBarIcons() {

        boolean showIconsWhenExpanded =

                (isPanelVisibleBecauseOfHeadsUp() || mIsFullWidth)

                        && getExpandedHeight() < getOpeningHeight();

        boolean showIconsWhenExpanded = getExpandedHeight() < getOpeningHeight();

        if (showIconsWhenExpanded && isOnKeyguard()) {

            showIconsWhenExpanded = false;

        }
@@ -4255,7 +4253,7 @@ public final class NotificationPanelViewController implements Dumpable { 
                && mHeadsUpAppearanceController.shouldBeVisible()) {

            return false;

        }

        return !mIsFullWidth || !mShowIconsWhenExpanded;

        return !mShowIconsWhenExpanded;

    }



    private void onQsPanelScrollChanged(int scrollY) {