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

Unverified Commit 21c364e9 authored by maxwen's avatar maxwen Committed by Michael Bestas
Browse files

SystemUI: use DOUBLE_TAP_TO_WAKE setting also for wake from aod 



Co-authored-by: default avatarMichael W <baddaemon87@gmail.com>
Change-Id: Ib51fdeaaa9a1b18b79f4f311c65565352d909a72
parent 88468b56

packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt

+7 −2
Original line number Diff line number Diff line
@@ -61,10 +61,13 @@ class PulsingGestureListener @Inject constructor( 
) : GestureDetector.SimpleOnGestureListener(), Dumpable {

    private var doubleTapEnabled = false

    private var singleTapEnabled = false

    private var doubleTapEnabledNative = false



    init {

        val tunable = Tunable { key: String?, _: String? ->

        val tunable = Tunable { key: String?, value: String? ->

            when (key) {

                Settings.Secure.DOUBLE_TAP_TO_WAKE ->

                    doubleTapEnabledNative = TunerService.parseIntegerSwitch(value, false)

                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE ->

                    doubleTapEnabled = ambientDisplayConfiguration.doubleTapGestureEnabled(

                            userTracker.userId)
@@ -74,6 +77,7 @@ class PulsingGestureListener @Inject constructor( 
            }

        }

        tunerService.addTunable(tunable,

                Settings.Secure.DOUBLE_TAP_TO_WAKE,

                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,

                Settings.Secure.DOZE_TAP_SCREEN_GESTURE)
@@ -107,7 +111,7 @@ class PulsingGestureListener @Inject constructor( 
        // checks MUST be on the ACTION_UP event.

        if (e.actionMasked == MotionEvent.ACTION_UP &&

                statusBarStateController.isDozing &&

                (doubleTapEnabled || singleTapEnabled) &&

                (doubleTapEnabled || singleTapEnabled || doubleTapEnabledNative) &&

                !falsingManager.isProximityNear &&

                !falsingManager.isFalseDoubleTap

        ) {
@@ -120,6 +124,7 @@ class PulsingGestureListener @Inject constructor( 
    override fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.println("singleTapEnabled=$singleTapEnabled")

        pw.println("doubleTapEnabled=$doubleTapEnabled")

        pw.println("doubleTapEnabledNative=$doubleTapEnabledNative")

        pw.println("isDocked=${dockManager.isDocked}")

        pw.println("isProxCovered=${falsingManager.isProximityNear}")

    }