From cb2b6737ae6db2384cfad6cae68211d669946c52 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 5 Sep 2014 16:17:22 +0200 Subject: Fixed a bug with the anti-falsing logic with dismissing Bug: 15433087 Change-Id: I48b96c1b8e081d6790d4cd9f5866f699b64e61fc --- .../com/android/systemui/statusbar/phone/NotificationPanelView.java | 2 +- .../systemui/statusbar/stack/NotificationStackScrollLayout.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 cf5aebc9780a..0499b148c1ad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -559,7 +559,7 @@ public class NotificationPanelView extends PanelView implements } private boolean isBelowFalsingThreshold() { - return !mQsTouchAboveFalsingThreshold && mStatusBar.isFalsingThresholdNeeded(); + return !mQsTouchAboveFalsingThreshold && mStatusBarState == StatusBarState.KEYGUARD; } private float getQsExpansionFraction() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 6f477ef278f8..6c559fbb88a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -40,6 +40,7 @@ import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.ExpandableView; import com.android.systemui.statusbar.SpeedBumpView; +import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.phone.PhoneStatusBar; import com.android.systemui.statusbar.policy.ScrollAdapter; import com.android.systemui.statusbar.stack.StackScrollState.ViewState; @@ -645,7 +646,7 @@ public class NotificationStackScrollLayout extends ViewGroup @Override public boolean isAntiFalsingNeeded() { - return mPhoneStatusBar.isFalsingThresholdNeeded(); + return mPhoneStatusBar.getBarState() == StatusBarState.KEYGUARD; } private void setSwipingInProgress(boolean isSwiped) { -- cgit v1.2.3-59-g8ed1b