| commit | cb2b6737ae6db2384cfad6cae68211d669946c52 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Sep 05 16:17:22 2014 +0200 |
| committer | Selim Cinek <cinek@google.com> | Mon Sep 08 13:56:18 2014 +0200 |
| tree | 736abe1faaee6d7a22ac55a3fdb9b4c0b0514936 | |
| parent | 2dbf3eac537b9351d34649a9bd185f936ff6528c [diff] |
Fixed a bug with the anti-falsing logic with dismissing Bug: 15433087 Change-Id: I48b96c1b8e081d6790d4cd9f5866f699b64e61fc
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 cf5aebc..0499b14 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 @@ } 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 6f477ef..6c559fb 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.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 @@ @Override public boolean isAntiFalsingNeeded() { - return mPhoneStatusBar.isFalsingThresholdNeeded(); + return mPhoneStatusBar.getBarState() == StatusBarState.KEYGUARD; } private void setSwipingInProgress(boolean isSwiped) {