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

Unverified Commit 28513b0c authored by Roman Birg's avatar Roman Birg Committed by Michael Bestas
Browse files

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>
parent f3a430df

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

+27 −1
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ import android.graphics.Paint; 
import android.graphics.Rect;

import android.net.Uri;

import android.os.Handler;

import android.os.PowerManager;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.MathUtils;

import android.view.GestureDetector;

import android.view.MotionEvent;

import android.view.VelocityTracker;

import android.view.View;
@@ -213,12 +215,27 @@ public class NotificationPanelView extends PanelView implements 


    private Handler mHandler = new Handler();

    private SettingsObserver mSettingsObserver;



    private boolean mOneFingerQuickSettingsIntercept;

    private boolean mDoubleTapToSleepEnabled;

    private int mStatusBarHeaderHeight;

    private GestureDetector mDoubleTapGesture;



    public NotificationPanelView(Context context, AttributeSet attrs) {

        super(context, attrs);

        setWillNotDraw(!DEBUG);

        mFalsingManager = FalsingManager.getInstance(context);



        mSettingsObserver = new SettingsObserver(mHandler);

        mDoubleTapGesture = new GestureDetector(mContext, new GestureDetector.SimpleOnGestureListener() {

            @Override

            public boolean onDoubleTap(MotionEvent e) {

                PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

                if(pm != null)

                    pm.goToSleep(e.getEventTime());

                return true;

            }

        });

    }



    public void setStatusBar(PhoneStatusBar bar) {
@@ -270,7 +287,6 @@ public class NotificationPanelView extends PanelView implements 
                mNotificationStackScroller.setQsContainer(mQsContainer);

            }

        });

        mSettingsObserver = new SettingsObserver(mHandler);

    }



    @Override
@@ -292,6 +308,7 @@ public class NotificationPanelView extends PanelView implements 
                R.dimen.notification_panel_min_side_margin);

        mMaxFadeoutHeight = getResources().getDimensionPixelSize(

                R.dimen.max_notification_fadeout_height);

        mStatusBarHeaderHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_header_height);

    }



    public void updateResources() {
@@ -755,6 +772,11 @@ public class NotificationPanelView extends PanelView implements 
        if (mBlockTouches || mQsContainer.isCustomizing()) {

            return false;

        }

        if (mDoubleTapToSleepEnabled

                && mStatusBarState == StatusBarState.KEYGUARD

                && event.getY() < mStatusBarHeaderHeight) {

            mDoubleTapGesture.onTouchEvent(event);

        }

        initDownStates(event);

        if (mListenForHeadsUp && !mHeadsUpTouchHelper.isTrackingHeadsUp()

                && mHeadsUpTouchHelper.onInterceptTouchEvent(event)) {
@@ -2401,6 +2423,8 @@ public class NotificationPanelView extends PanelView implements 
            ContentResolver resolver = mContext.getContentResolver();

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN), false, this);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.DOUBLE_TAP_SLEEP_GESTURE), false, this);

            update();

        }
@@ -2423,6 +2447,8 @@ public class NotificationPanelView extends PanelView implements 
            ContentResolver resolver = mContext.getContentResolver();

            mOneFingerQuickSettingsIntercept = Settings.System.getInt(

                    resolver, Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 1) == 1;

            mDoubleTapToSleepEnabled = Settings.System.getInt(

                    resolver, Settings.System.DOUBLE_TAP_SLEEP_GESTURE, 1) == 1;

        }

    }

}

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

+0 −22
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;

import android.view.GestureDetector;

import android.os.PowerManager;

import android.provider.Settings;



import com.android.systemui.DejankUtils;

import com.android.systemui.EventLogTags;
@@ -51,26 +48,11 @@ public class PhoneStatusBarView extends PanelBar { 
            }

        }

    };

    private GestureDetector mDoubleTapGesture;



    public PhoneStatusBarView(Context context, AttributeSet attrs) {

        super(context, attrs);



        mBarTransitions = new PhoneStatusBarTransitions(this);



        mDoubleTapGesture = new GestureDetector(mContext, new GestureDetector.SimpleOnGestureListener() {

            @Override

            public boolean onDoubleTap(MotionEvent e) {

                PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

                Log.d(TAG, "Gesture!!");

                if(pm != null)

                    pm.goToSleep(e.getEventTime());

                else

                    Log.d(TAG, "getSystemService returned null PowerManager");



                return true;

            }

        });

    }



    public BarTransitions getBarTransitions() {
@@ -149,10 +131,6 @@ public class PhoneStatusBarView extends PanelBar { 
            }

        }



        if (Settings.System.getInt(mContext.getContentResolver(),

                    Settings.System.DOUBLE_TAP_SLEEP_GESTURE, 0) == 1)

            mDoubleTapGesture.onTouchEvent(event);



        return barConsumedEvent || super.onTouchEvent(event);

    }

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

+80 −0
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ import android.annotation.ColorInt; 
import android.annotation.DrawableRes;

import android.annotation.LayoutRes;

import android.app.StatusBarManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.database.ContentObserver;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.PorterDuff;
@@ -32,10 +34,18 @@ import android.graphics.drawable.Drawable; 
import android.media.session.MediaSessionLegacyHelper;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.IPowerManager;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.Log;

import android.view.ActionMode;

import android.view.InputQueue;

import android.view.GestureDetector;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -43,6 +53,7 @@ import android.view.MenuItem; 
import android.view.MotionEvent;

import android.view.SurfaceHolder;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.Window;
@@ -83,12 +94,22 @@ public class StatusBarWindowView extends FrameLayout { 
    private FloatingToolbar mFloatingToolbar;

    private ViewTreeObserver.OnPreDrawListener mFloatingToolbarPreDrawListener;



    private int mStatusBarHeaderHeight;



    private boolean mDoubleTapToSleepEnabled;

    private GestureDetector mDoubleTapGesture;

    private Handler mHandler = new Handler();

    private SettingsObserver mSettingsObserver;



    public StatusBarWindowView(Context context, AttributeSet attrs) {

        super(context, attrs);

        setMotionEventSplittingEnabled(false);

        mTransparentSrcPaint.setColor(0);

        mTransparentSrcPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));

        mFalsingManager = FalsingManager.getInstance(context);

        mStatusBarHeaderHeight = context

                .getResources().getDimensionPixelSize(R.dimen.status_bar_header_height);

        mSettingsObserver = new SettingsObserver(mHandler);

    }



    @Override
@@ -173,6 +194,21 @@ public class StatusBarWindowView extends FrameLayout { 
    protected void onAttachedToWindow () {

        super.onAttachedToWindow();



        mSettingsObserver.observe();

        mDoubleTapGesture = new GestureDetector(mContext, new GestureDetector.SimpleOnGestureListener() {

            @Override

            public boolean onDoubleTap(MotionEvent e) {

                PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

                Log.d(TAG, "Gesture!!");

                if(pm != null)

                    pm.goToSleep(e.getEventTime());

                else

                    Log.d(TAG, "getSystemService returned null PowerManager");



                return true;

            }

        });



        // We need to ensure that our window doesn't suffer from overdraw which would normally

        // occur if our window is translucent. Since we are drawing the whole window anyway with

        // the scrim, we don't need the window to be cleared in the beginning.
@@ -188,6 +224,12 @@ public class StatusBarWindowView extends FrameLayout { 
        }

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mSettingsObserver.unobserve();

    }



    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {

        if (mService.interceptMediaKey(event)) {
@@ -244,6 +286,11 @@ public class StatusBarWindowView extends FrameLayout { 
    @Override

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        boolean intercept = false;

        if (mDoubleTapToSleepEnabled

                && ev.getY() < mStatusBarHeaderHeight) {

            if (DEBUG) Log.w(TAG, "logging double tap gesture");

            mDoubleTapGesture.onTouchEvent(ev);

        }

        if (mNotificationPanel.isFullyExpanded()

                && mStackScrollLayout.getVisibility() == View.VISIBLE

                && mService.getBarState() == StatusBarState.KEYGUARD
@@ -674,5 +721,38 @@ public class StatusBarWindowView extends FrameLayout { 
        }

    };



    class SettingsObserver extends ContentObserver {

        SettingsObserver(Handler handler) {

            super(handler);

        }



        void observe() {

            ContentResolver resolver = mContext.getContentResolver();

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.DOUBLE_TAP_SLEEP_GESTURE), false, this);

            update();

        }



        void unobserve() {

            ContentResolver resolver = mContext.getContentResolver();

            resolver.unregisterContentObserver(this);

        }



        @Override

        public void onChange(boolean selfChange) {

            update();

        }



        @Override

        public void onChange(boolean selfChange, Uri uri) {

            update();

        }



        public void update() {

            ContentResolver resolver = mContext.getContentResolver();

            mDoubleTapToSleepEnabled = Settings.System.getInt(

                    resolver, Settings.System.DOUBLE_TAP_SLEEP_GESTURE, 1) == 1;

        }

    }

}