Merge "AOD: Prevent KeyguardAffordanceViews from triggering in doze"

2017-01-27 17:11:57 +00:00
parent 0e73e5c4ff 2a31841e3d
commit adb520570f
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -762,7 +762,8 @@ public class NotificationPanelView extends PanelView implements
        }
        if ((!mIsExpanding || mHintAnimationRunning)
                && !mQsExpanded
-                && mStatusBar.getBarState() != StatusBarState.SHADE) {
+                && mStatusBar.getBarState() != StatusBarState.SHADE
+                && !mDozing) {
            mAffordanceHelper.onTouchEvent(event);
        }
        if (mOnlyAffordanceInThisMotion) {