Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev

am: d4115f501d

Change-Id: I9dfa218bc30003581e8488d7b9d72bb192a19547
This commit is contained in:
Selim Cinek
2018-03-23 04:57:21 +00:00
committed by android-build-merger

View File

@@ -177,7 +177,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
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())