diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-11-13 16:55:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 16:55:13 +0000 |
| commit | 5fbd9950e72e74b094b16a59045400ffdb432ad4 (patch) | |
| tree | 8b58798bbd250048bd2db10a94df5ac939c3b690 /packages | |
| parent | 759d34cbd051c61b9f18bdb6576a943997a28510 (diff) | |
| parent | 76c234c8dfca8203521b022c15a38e041c294589 (diff) | |
| download | frameworks_base-5fbd9950e72e74b094b16a59045400ffdb432ad4.zip frameworks_base-5fbd9950e72e74b094b16a59045400ffdb432ad4.tar.gz frameworks_base-5fbd9950e72e74b094b16a59045400ffdb432ad4.tar.bz2 | |
am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev
* commit '76c234c8dfca8203521b022c15a38e041c294589':
Fix wrong states when waking up from doze via touch
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 1 |
1 files changed, 1 insertions, 0 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 988534b..2f0ce28 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -4065,6 +4065,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, pm.wakeUp(time); if (fromTouch) { mScreenOnComingFromTouch = true; + mNotificationPanel.setTouchDisabled(false); } } } |