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
2014-11-13 16:55:13 +00:00
parent 759d34cbd0 76c234c8df
commit 5fbd9950e7
1 changed files with 1 additions and 0 deletions
--- 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);
            }
        }
    }