summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2014-06-16 23:47:37 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-16 23:47:37 +0000
commit94d46abc7689613dc66f10cc853137384543516c (patch)
tree235bba14221edc34c8789013e8698824a2b05052
parent1c46ae419c8f04c0359fea82ef8c8718db14e9b4 (diff)
parentb688bf7ceb0b3a02ad761d98940b6afc01b5e399 (diff)
am 7cf7969c: Fixed a bug where the device could not be unlocked.
* commit '7cf7969c23caf59b9fd0fccb21e6b3ca3b966823': Fixed a bug where the device could not be unlocked.
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java3
1 files changed, 3 insertions, 0 deletions
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();
}