commit a9cb33dc885ade0c6e8b307c9ecb45a3959a1f8a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 28 03:18:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 03:18:17 2019 +0000
tree 810e18951efcff8f13538924e80083eb7f7b935b
parent b677f9684f81d5831f855289d6a0933a44c78555
parent c14131667ff87c8891df30bcb8df80efd753f920

Merge "Don't show notif icons in screen middle with custom clock"

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 520df97..ce20681 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -399,7 +399,7 @@
     private final ViewOutlineProvider mOutlineProvider = new ViewOutlineProvider() {
         @Override
         public void getOutline(View view, Outline outline) {
-            if (mAmbientState.isDarkAtAll() && !mAmbientState.isFullyDark()) {
+            if (mAmbientState.isDarkAtAll() && !mAmbientState.isFullyDark() || !mShowDarkShelf) {
                 outline.setRoundRect(mBackgroundAnimationRect, mCornerRadius);
             } else {
                 ViewOutlineProvider.BACKGROUND.getOutline(view, outline);