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

Commit 15971e89 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Bruno Martins
Browse files

SystemUI: Add double tap to sleep gesture 



Author: Roman Birg <roman@cyngn.com>
Date:   Sun Nov 23 06:54:06 2014 -0800

    SystemUI: double tap to sleep improvements

    * Make it more reliable
    * Add it to keyguard
    * Add a content observer to not always query Settings.System on every
    touch event

    Change-Id: I292c4d9d9f810843590b7a9ec6e15b99ac44009d
    Signed-off-by: default avatarRoman Birg <roman@cyngn.com>

Author: Adnan Begovic <adnan@cyngn.com>
Date:   Wed Nov 11 12:05:59 2015 -0800

    fw: Move DOUBLE_TAP_SLEEP_GESTURE to CMSettings.

    Change-Id: I8274b7c241cef6835a1114a702e68c95b6d2e036

Author: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date:   Fri Oct 7 08:56:25 2016 +0800

    SystemUI: Use Tuner API for CM settings

    Get rid of all the excess code by implementing TunerService.Tunable
    and observing any changes made to the settings through it.

    Remove UserContentObserver as the Tuner API handles user switches.

    Also remove some unused imports that were introduced in earlier
    CM commits, but were never removed since.

    Change-Id: Iecafafabdaec82b3b3c72293bea865de48f0e90a

Author: Altaf-Mahdi <altaf.mahdi@gmail.com>
Date:   Wed Nov 11 16:07:49 2015 -0500

    Double tap to sleep anywhere on the lock screen [1/3]

    Change-Id: I7dd46f3fafeb2e629974c0f32083d4d9774fb1de
    [neo: Using Tuner API.]
    Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>

Author: dianlujitao <dianlujitao@lineageos.org>
Date:   Thu Feb 27 12:57:07 2020 +0800

    SystemUI: Don't sleep on double tap below status bar

    Change-Id: Ic64c29eae63e96f34dc37cda355401b7e2cd2d39

[Pig]: Forward port to R
[bgcngm]: Forward port to S

Change-Id: I0281d23cb3ad5f8f2b67d08ae431e8a962a60927
parent 8e1f3229

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

+24 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.app.ActivityManager; 
import android.app.Fragment;

import android.app.StatusBarManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.ResolveInfo;

import android.content.res.Configuration;

import android.content.res.Resources;
@@ -76,6 +77,7 @@ import android.transition.TransitionManager; 
import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.MathUtils;

import android.view.GestureDetector;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.VelocityTracker;
@@ -297,6 +299,8 @@ public class NotificationPanelViewController extends PanelViewController { 


    private static final String STATUS_BAR_QUICK_QS_PULLDOWN =

            "lineagesystem:" + LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN;

    private static final String DOUBLE_TAP_SLEEP_GESTURE =

            "lineagesystem:" + LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE;



    private static final Rect M_DUMMY_DIRTY_RECT = new Rect(0, 0, 1, 1);

    private static final Rect EMPTY_RECT = new Rect();
@@ -539,6 +543,8 @@ public class NotificationPanelViewController extends PanelViewController { 


    private NotificationShadeDepthController mDepthController;

    private int mDisplayId;

    private boolean mDoubleTapToSleepEnabled;

    private GestureDetector mDoubleTapGesture;



    /**

     * Cache the resource id of the theme to avoid unnecessary work in onThemeChanged.
@@ -784,7 +790,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,

            ShadeTransitionController shadeTransitionController,

            SystemClock systemClock,

            TunerService tunerService) {

            TunerService tunerService, Context context) {

        super(view,

                falsingManager,

                dozeLog,
@@ -884,6 +890,16 @@ public class NotificationPanelViewController extends PanelViewController { 
        });

        mBottomAreaShadeAlphaAnimator.setDuration(160);

        mBottomAreaShadeAlphaAnimator.setInterpolator(Interpolators.ALPHA_OUT);

        mDoubleTapGesture = new GestureDetector(context,

                new GestureDetector.SimpleOnGestureListener() {

            @Override

            public boolean onDoubleTap(MotionEvent e) {

                if (mPowerManager != null) {

                    mPowerManager.goToSleep(e.getEventTime());

                }

                return true;

            }

        });

        mEntryManager = notificationEntryManager;

        mConversationNotificationManager = conversationNotificationManager;

        mAuthController = authController;
@@ -4230,6 +4246,10 @@ public class NotificationPanelViewController extends PanelViewController { 
                    return false;

                }



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

                    mDoubleTapGesture.onTouchEvent(event);

                }



                // Make sure the next touch won't the blocked after the current ends.

                if (event.getAction() == MotionEvent.ACTION_UP

                        || event.getAction() == MotionEvent.ACTION_CANCEL) {
@@ -4934,6 +4954,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            mStatusBarStateListener.onStateChanged(mStatusBarStateController.getState());

            mConfigurationController.addCallback(mConfigurationListener);

            mTunerService.addTunable(this, STATUS_BAR_QUICK_QS_PULLDOWN);

            mTunerService.addTunable(this, DOUBLE_TAP_SLEEP_GESTURE);

            // Theme might have changed between inflating this view and attaching it to the

            // window, so

            // force a call to onThemeChanged
@@ -4958,6 +4979,8 @@ public class NotificationPanelViewController extends PanelViewController { 
        public void onTuningChanged(String key, String newValue) {

            if (STATUS_BAR_QUICK_QS_PULLDOWN.equals(key)) {

                mOneFingerQuickSettingsIntercept = TunerService.parseInteger(newValue, 1);

            } else if (DOUBLE_TAP_SLEEP_GESTURE.equals(key)) {

                mDoubleTapToSleepEnabled = TunerService.parseIntegerSwitch(newValue, true);

            }

        }

    }

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

+26 −2
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
package com.android.systemui.statusbar.phone;



import android.app.StatusBarManager;

import android.content.Context;

import android.hardware.display.AmbientDisplayConfiguration;

import android.media.AudioManager;

import android.media.session.MediaSessionLegacyHelper;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;
@@ -51,6 +53,8 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManage 
import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.tuner.TunerService;



import lineageos.providers.LineageSettings;



import java.io.PrintWriter;

import java.util.Optional;
@@ -92,9 +96,15 @@ public class NotificationShadeWindowViewController { 
    private final NotificationPanelViewController mNotificationPanelViewController;

    private final PanelExpansionStateManager mPanelExpansionStateManager;

    private final Optional<LowLightClockController> mLowLightClockController;

    private final PowerManager mPowerManager;



    private boolean mIsTrackingBarGesture = false;



    private static final String DOUBLE_TAP_SLEEP_GESTURE =

            "lineagesystem:" + LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE;

    private boolean mDoubleTapToSleepEnabled;

    private int mQuickQsOffsetHeight;



    @Inject

    public NotificationShadeWindowViewController(

            LockscreenShadeTransitionController transitionController,
@@ -114,7 +124,8 @@ public class NotificationShadeWindowViewController { 
            CentralSurfaces centralSurfaces,

            NotificationShadeWindowController controller,

            KeyguardUnlockAnimationController keyguardUnlockAnimationController,

            AmbientState ambientState) {

            AmbientState ambientState,

            Context context) {

        mLockscreenShadeTransitionController = transitionController;

        mFalsingCollector = falsingCollector;

        mTunerService = tunerService;
@@ -133,6 +144,7 @@ public class NotificationShadeWindowViewController { 
        mNotificationShadeWindowController = controller;

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

        mAmbientState = ambientState;

        mPowerManager = context.getSystemService(PowerManager.class);



        // This view is not part of the newly inflated expanded status bar.

        mBrightnessMirror = mView.findViewById(R.id.brightness_mirror_container);
@@ -159,11 +171,18 @@ public class NotificationShadeWindowViewController { 
                    break;

                case Settings.Secure.DOZE_TAP_SCREEN_GESTURE:

                    mSingleTapEnabled = configuration.tapGestureEnabled(UserHandle.USER_CURRENT);

                    break;

                case DOUBLE_TAP_SLEEP_GESTURE:

                    mDoubleTapToSleepEnabled = TunerService.parseIntegerSwitch(newValue, true);

                    break;

            }

        };

        mTunerService.addTunable(tunable,

                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,

                Settings.Secure.DOZE_TAP_SCREEN_GESTURE);

                Settings.Secure.DOZE_TAP_SCREEN_GESTURE,

                DOUBLE_TAP_SLEEP_GESTURE);

        mQuickQsOffsetHeight = mView.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.quick_qs_offset_height);



        GestureDetector.SimpleOnGestureListener gestureListener =

                new GestureDetector.SimpleOnGestureListener() {
@@ -179,6 +198,11 @@ public class NotificationShadeWindowViewController { 


                    @Override

                    public boolean onDoubleTap(MotionEvent e) {

                        if (!mStatusBarStateController.isDozing() && mDoubleTapToSleepEnabled

                                && e.getY() < mQuickQsOffsetHeight) {

                            mPowerManager.goToSleep(e.getEventTime());

                            return true;

                        }

                        if (mDoubleTapEnabled || mSingleTapEnabled) {

                            mService.wakeUpIfDozing(

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