commit | de932bdf90350379029ff3fc5b44b2245dc2b44e | [log] [tgz] |
---|---|---|
author | Selim Cinek <cinek@google.com> | Fri Mar 23 04:57:21 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 23 04:57:21 2018 +0000 |
tree | 1d6e1fece747aecffa8a7ade303ad30f7cfabf33 | |
parent | b16aa93d895d41eb212de9430030f17f42a3c6cb [diff] | |
parent | d4115f501dd1cc23546dd53df1c4393bfe43a419 [diff] |
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev am: d4115f501d Change-Id: I9dfa218bc30003581e8488d7b9d72bb192a19547
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())