From ac433949afe1ede252ad43006317c68a5542accb Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 6 Dec 2022 15:58:48 +0200 Subject: Revert "SystemUI: Use DT2W setting also to wake from AOD" Will need to be reimplemented after qpr1 This reverts commit f7195535696c195a3feab9c819478112c20e8999. Change-Id: I098ccfc27bf13f4c2f5f4a728ef50df982d4017e --- .../phone/NotificationShadeWindowViewController.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java index 63f383e0e860..be5b33eb0da0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java @@ -95,9 +95,6 @@ public class NotificationShadeWindowViewController { private boolean mIsTrackingBarGesture = false; - // custom additions start - private boolean mDoubleTapEnabledNative; - @Inject public NotificationShadeWindowViewController( LockscreenShadeTransitionController transitionController, @@ -162,17 +159,11 @@ public class NotificationShadeWindowViewController { break; case Settings.Secure.DOZE_TAP_SCREEN_GESTURE: mSingleTapEnabled = configuration.tapGestureEnabled(UserHandle.USER_CURRENT); - break; - case Settings.Secure.DOUBLE_TAP_TO_WAKE: - mDoubleTapEnabledNative = Settings.Secure.getIntForUser(mView.getContext().getContentResolver(), - Settings.Secure.DOUBLE_TAP_TO_WAKE, 0, UserHandle.USER_CURRENT) == 1; - break; } }; mTunerService.addTunable(tunable, Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, - Settings.Secure.DOZE_TAP_SCREEN_GESTURE, - Settings.Secure.DOUBLE_TAP_TO_WAKE); + Settings.Secure.DOZE_TAP_SCREEN_GESTURE); GestureDetector.SimpleOnGestureListener gestureListener = new GestureDetector.SimpleOnGestureListener() { @@ -188,7 +179,7 @@ public class NotificationShadeWindowViewController { @Override public boolean onDoubleTap(MotionEvent e) { - if (mDoubleTapEnabled || mSingleTapEnabled || mDoubleTapEnabledNative) { + if (mDoubleTapEnabled || mSingleTapEnabled) { mService.wakeUpIfDozing( SystemClock.uptimeMillis(), mView, "DOUBLE_TAP"); return true; -- cgit v1.2.3