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

Commit 61fb28d5 authored by Justin Weir's avatar Justin Weir
Browse files

Choose a better impossible value for mStatusBarLongPressDowntime 

Lots of tests use 0L for the event time, so I'm switching to -1L,
which is equally impossible in production but more impossible in tests.

Test: ran the test with shade_expands_on_status_bar_long_press on
Bug: 371224114
Flag: com.android.systemui.shade_expands_on_status_bar_long_press
Change-Id: Id406aa056d2f8ccceb42aaaa3a93cb835acbc47e
parent fc3f2de6

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+4 −4
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ import com.android.systemui.statusbar.VibratorHelper; 
import com.android.systemui.statusbar.notification.AnimatableProperty;

import com.android.systemui.statusbar.notification.ConversationNotificationManager;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.headsup.HeadsUpTouchHelper;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.PropertyAnimator;

import com.android.systemui.statusbar.notification.ViewGroupFadeHelper;
@@ -195,6 +194,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; 
import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor;

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager;

import com.android.systemui.statusbar.notification.headsup.HeadsUpTouchHelper;

import com.android.systemui.statusbar.notification.headsup.OnHeadsUpChangedListener;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableView;
@@ -366,7 +366,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private final TouchHandler mTouchHandler = new TouchHandler();



    private long mDownTime;

    private long mStatusBarLongPressDowntime;

    private long mStatusBarLongPressDowntime = -1L;

    private boolean mTouchSlopExceededBeforeDown;

    private float mOverExpansion;

    private CentralSurfaces mCentralSurfaces;
@@ -3795,7 +3795,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) {

        mShadeLog.logEndMotionEvent("endMotionEvent called", forceCancel, false);

        mTrackingPointer = -1;

        mStatusBarLongPressDowntime = 0L;

        mStatusBarLongPressDowntime = -1L;

        mAmbientState.setSwipingUp(false);

        if ((isTracking() && mTouchSlopExceeded) || Math.abs(x - mInitialExpandX) > mTouchSlop

                || Math.abs(y - mInitialExpandY) > mTouchSlop
@@ -5199,7 +5199,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    mUpdateFlingOnLayout = false;

                    mMotionAborted = false;

                    mDownTime = mSystemClock.uptimeMillis();

                    mStatusBarLongPressDowntime = 0L;

                    mStatusBarLongPressDowntime = -1L;

                    mTouchAboveFalsingThreshold = false;

                    mCollapsedAndHeadsUpOnDown =

                            isFullyCollapsed() && mHeadsUpManager.hasPinnedHeadsUp();