From 03cf2586faef0bc4971cbda99bd13d608ed23e0d Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 28 Mar 2017 17:54:05 -0700
Subject: [PATCH] AOD: prevent clicking shelf when dark

Fixes: 35718464
Test: Enable AOD, try clicking on shelf in AOD, make sure it's not clickable.
Change-Id: Iede88d1e0ab394f0db2acaac6a1ad8baaeef15f1
---
 .../src/com/android/systemui/statusbar/NotificationShelf.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index 8da17fa76bd7e..8ba4eb57f079d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -133,6 +133,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
             mViewInvertHelper.update(dark);
         }
         mShelfIcons.setAmbient(dark);
+        updateInteractiveness();
     }
 
     @Override
@@ -576,7 +577,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
     }
 
     private void updateInteractiveness() {
-        mInteractive = mStatusBarState == StatusBarState.KEYGUARD && mHasItemsInStableShelf;
+        mInteractive = mStatusBarState == StatusBarState.KEYGUARD && mHasItemsInStableShelf
+                && !mDark;
         setClickable(mInteractive);
         setFocusable(mInteractive);
         setImportantForAccessibility(mInteractive ? View.IMPORTANT_FOR_ACCESSIBILITY_YES