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

Commit a3ec72cb authored by Selim Cinek's avatar Selim Cinek Committed by android-build-team Robot
Browse files

DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked 

Since we're using the pulsing state for docking, the icons would now
become clipped while pulsing.

Fixes: 139096431
Test: dock, observe notification icons showing
Change-Id: If251e6b18c03b2824b4d3ea4dab82d4a403565f1
Merged-In: I8f7bd7a6a0562942ed3e12f28705043722d177e8
(cherry picked from commit bdf71a04)
parent 474dda22

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+9 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import com.android.systemui.R; 
import com.android.systemui.SwipeHelper;

import com.android.systemui.classifier.FalsingManagerFactory;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
@@ -506,6 +507,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
     * If the {@link NotificationShelf} should be visible when dark.

     */

    private boolean mAnimateBottomOnLayout;

    private int mPulseReason;



    @Inject

    public NotificationStackScrollLayout(
@@ -1355,7 +1357,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
            mIsClipped = clipped;

        }



        if (!mPulsing && mAmbientState.isFullyDark()) {

        if ((!mPulsing || mPulseReason == DozeLog.PULSE_REASON_DOCKING)

                && mAmbientState.isFullyDark()) {

            setClipBounds(null);

        } else if (mAmbientState.isDarkAtAll()) {

            clipToOutline = true;
@@ -5179,6 +5182,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        notifyHeightChangeListener(null, animated);

    }



    public void setPulseReason(int pulseReason) {

        mPulseReason = pulseReason;

        updateClipping();

    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void setQsExpanded(boolean qsExpanded) {

        mQsExpanded = qsExpanded;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+4 −0
Original line number Diff line number Diff line
@@ -3134,6 +3134,10 @@ public class NotificationPanelView extends PanelView implements 
        mAnimateNextPositionUpdate = true;

    }



    public void setPulseReason(int reason) {

        mNotificationStackScroller.setPulseReason(reason);

    }



    /**

     * Panel and QS expansion callbacks.

     */

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −0
Original line number Diff line number Diff line
@@ -3928,6 +3928,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            // execute the transition. The pulse callback will then be invoked when the scrims

            // are black, indicating that StatusBar is ready to present the rest of the UI.

            mPulsing = true;

            mNotificationPanel.setPulseReason(reason);

            mDozeScrimController.pulse(new PulseCallback() {

                @Override

                public void onPulseStarted() {