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

am: 01ddad3876

Change-Id: I43a1ca32d3d4b3be639b9bd796caab6402b4b39c

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

@@ -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

@@ -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

@@ -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

@@ -5705,6 +5705,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
                 view.setTranslationY(wakeUplocation);
             }
         }
+        mDimmedNeedsAnimation = true;
     }
 
     @Override