From b688bf7ceb0b3a02ad761d98940b6afc01b5e399 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Mon, 16 Jun 2014 16:36:51 -0700
Subject: Fixed a bug where the device could not be unlocked.

When the Notifications could be scrolled, the shade could not
be closed.

Bug: 15643474
Change-Id: I59b9f55c0290da7683ce7fd40effc4b5413e4267
---
 .../com/android/systemui/statusbar/phone/NotificationPanelView.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 34179cb5b971..dde95bf46a77 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -688,6 +688,9 @@ public class NotificationPanelView extends PanelView implements
 
     @Override
     protected boolean isScrolledToBottom() {
+        if (mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
+            return true;
+        }
         if (!isInSettings()) {
             return mNotificationStackScroller.isScrolledToBottom();
         }
-- 
cgit v1.2.3-59-g8ed1b