diff options
| author | Selim Cinek <cinek@google.com> | 2014-06-16 16:36:51 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-06-16 16:36:51 -0700 |
| commit | b688bf7ceb0b3a02ad761d98940b6afc01b5e399 (patch) | |
| tree | a5301d6702ffab108cb7e0bfaeacab4c40d40e04 /packages/SystemUI | |
| parent | 56a78265bff987b715e6bd1aad087d52e255a4e7 (diff) | |
| download | frameworks_base-b688bf7ceb0b3a02ad761d98940b6afc01b5e399.zip frameworks_base-b688bf7ceb0b3a02ad761d98940b6afc01b5e399.tar.gz frameworks_base-b688bf7ceb0b3a02ad761d98940b6afc01b5e399.tar.bz2 | |
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
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 3 |
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 34179cb..dde95bf 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(); } |