commit 0664e31355f3cbbdc6c5586a61837623c728a946
author Selim Cinek <cinek@google.com> Fri Mar 23 07:12:20 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 23 07:12:20 2018 +0000
tree 07a900f7e6c813c505a9ee4892656583f8b3c747
parent fa11a4221296ac0d1b57c4390218fc4bb7eae240
parent de932bdf90350379029ff3fc5b44b2245dc2b44e

Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev am: d4115f501d
am: de932bdf90

Change-Id: Icdea366821e0365bce7115c4b2a34f9c22e0fb79

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index aecf5fb..41c7559 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -177,7 +177,7 @@
             mShelfState.yTranslation = Math.max(Math.min(viewEnd, maxShelfEnd) - mShelfState.height,
                     getFullyClosedTranslation());
             mShelfState.zTranslation = ambientState.getBaseZHeight();
-            if (mAmbientState.isDark()) {
+            if (mAmbientState.isDark() && !mAmbientState.hasPulsingNotifications()) {
                 mShelfState.yTranslation = mAmbientState.getDarkTopPadding();
             }
             float openedAmount = (mShelfState.yTranslation - getFullyClosedTranslation())