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

Commit ee338da9 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where notifications could visually overlap" into qt-dev am: 5894d5b8 

am: 87d0dcee

Change-Id: I4c2f89ff3eb184db98c7bf117b489838f52a30bf
parents 90d6b553 87d0dcee

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 
                    // if we animate, we see the shelf briefly visible. Instead we fully animate

                    // the notification and its background out

                    animate = false

                } else {

                } else if (!mWakingUp && !willWakeUp){

                    entry.setAmbientGoingAway(true)

                    mEntrySetToClearWhenFinished.add(entry)

                }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+3 −0
Original line number Diff line number Diff line
@@ -648,6 +648,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        if (!getShowingLayout().isDimmable()) {

            return false;

        }

        if (showingAmbientPulsing()) {

            return false;

        }

        return super.isDimmable();

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -212,7 +212,9 @@ public class AmbientState { 
    }



    public boolean isDimmed() {

        return mDimmed;

        // While we are expanding from pulse, we want the notifications not to be dimmed, otherwise

        // you'd see the difference to the pulsing notification

        return mDimmed && !(isPulseExpanding() && mDozeAmount == 1.0f);

    }



    public boolean isDozing() {

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

+1 −0
Original line number Diff line number Diff line
@@ -5705,6 +5705,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
                view.setTranslationY(wakeUplocation);

            }

        }

        mDimmedNeedsAnimation = true;

    }



    @Override