diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-02 21:19:17 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-05-02 23:25:21 +0200 |
| commit | c1cf1aec53ec4bf201dbcd46b8950a16e9daf038 (patch) | |
| tree | 456b6fa72010075571a79734ab6d1dbbe31dd6e4 /packages/SystemUI | |
| parent | 9cbadd3c08a7d7dd3412743dd04aecb16c5a1595 (diff) | |
| download | frameworks_base-c1cf1aec53ec4bf201dbcd46b8950a16e9daf038.zip frameworks_base-c1cf1aec53ec4bf201dbcd46b8950a16e9daf038.tar.gz frameworks_base-c1cf1aec53ec4bf201dbcd46b8950a16e9daf038.tar.bz2 | |
Never close Keyguard automatically.
Also make the bouncer less translucent, so it looks better when
a user double-clicks on a notification (because it is now shown
behind, so we need more background protection).
Bug: 14059777
Change-Id: I2538b0e04ddc25c25a03c65c8a5bd7855720bbf2
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 0db6914..cdd3de8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1668,6 +1668,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } public void animateCollapsePanels(int flags) { + if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { + return; + } if (SPEW) { Log.d(TAG, "animateCollapse():" + " mExpandedVisible=" + mExpandedVisible diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index acc3a0b..4c9264d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -108,7 +108,9 @@ public class StatusBarWindowView extends FrameLayout { boolean intercept = false; if (mNotificationPanel.isFullyExpanded() && mStackScrollLayout.getVisibility() == View.VISIBLE - && mService.getBarState() != StatusBarState.KEYGUARD) { + && (mService.getBarState() == StatusBarState.SHADE + || (mService.getBarState() == StatusBarState.SHADE_LOCKED + && !mService.isBouncerShowing()))) { intercept = mExpandHelper.onInterceptTouchEvent(ev); } else if (mNotificationPanel.isFullyExpanded() && mStackScrollLayout.getVisibility() == View.VISIBLE |