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

Unverified Commit 094458c5 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "SystemUI: use DOUBLE_TAP_TO_WAKE setting also for wake from aod" 

Will need to be reimplemented after qpr1

This reverts commit 27727010.

Change-Id: I098ccfc27bf13f4c2f5f4a728ef50df982d4017e
parent aded82c9

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

+1 −1
Original line number Diff line number Diff line
@@ -4246,7 +4246,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                    return false;

                }



                if (mDoubleTapToSleepEnabled && !mPulsing && !mDozing) {

                if (mDoubleTapToSleepEnabled && mBarState == StatusBarState.KEYGUARD) {

                    mDoubleTapGesture.onTouchEvent(event);

                }

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

+1 −7
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ public class NotificationShadeWindowViewController { 
    private boolean mDoubleTapToSleepEnabled;

    private int mQuickQsOffsetHeight;



    private boolean mDoubleTapEnabledNative;



    @Inject

    public NotificationShadeWindowViewController(

            LockscreenShadeTransitionController transitionController,
@@ -167,9 +165,6 @@ public class NotificationShadeWindowViewController { 
            AmbientDisplayConfiguration configuration =

                    new AmbientDisplayConfiguration(mView.getContext());

            switch (key) {

                case Settings.Secure.DOUBLE_TAP_TO_WAKE:

                    mDoubleTapEnabledNative = TunerService.parseIntegerSwitch(newValue, false);

                    break;

                case Settings.Secure.DOZE_DOUBLE_TAP_GESTURE:

                    mDoubleTapEnabled = configuration.doubleTapGestureEnabled(

                            UserHandle.USER_CURRENT);
@@ -183,7 +178,6 @@ public class NotificationShadeWindowViewController { 
            }

        };

        mTunerService.addTunable(tunable,

                Settings.Secure.DOUBLE_TAP_TO_WAKE,

                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,

                Settings.Secure.DOZE_TAP_SCREEN_GESTURE,

                DOUBLE_TAP_SLEEP_GESTURE);
@@ -209,7 +203,7 @@ public class NotificationShadeWindowViewController { 
                            mPowerManager.goToSleep(e.getEventTime());

                            return true;

                        }

                        if (mDoubleTapEnabled || mSingleTapEnabled || mDoubleTapEnabledNative) {

                        if (mDoubleTapEnabled || mSingleTapEnabled) {

                            mService.wakeUpIfDozing(

                                    SystemClock.uptimeMillis(), mView, "DOUBLE_TAP");

                            return true;