Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0110c57f authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev

parents f8a52c06 cb2b6737

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {