SystemUI: use DOUBLE_TAP_TO_WAKE setting also for wake from aod (0084a33b) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -3198,7 +3198,8 @@ public class NotificationPanelViewController extends PanelViewController {
		return false;
		}

		if (mDoubleTapToSleepEnabled && mBarState == StatusBarState.KEYGUARD) {
		if (mDoubleTapToSleepEnabled && mBarState == StatusBarState.KEYGUARD
		&& !mPulsing && !mDozing) {
		mDoubleTapGesture.onTouchEvent(event);
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@ public class NotificationShadeWindowViewController {
		private boolean mDoubleTapToSleepEnabled;
		private int mQuickQsOffsetHeight;

		private boolean mDoubleTapEnabledNative;

		@Inject
		public NotificationShadeWindowViewController(
		InjectionInflationController injectionInflationController,
		@@ -174,6 +176,9 @@ 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);
		@@ -187,6 +192,7 @@ 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);
		@@ -212,7 +218,7 @@ public class NotificationShadeWindowViewController {
		mPowerManager.goToSleep(e.getEventTime());
		return true;
		}
		if (mDoubleTapEnabled \|\| mSingleTapEnabled) {
		if (mDoubleTapEnabled \|\| mSingleTapEnabled \|\| mDoubleTapEnabledNative) {
		mService.wakeUpIfDozing(
		SystemClock.uptimeMillis(), mView, "DOUBLE_TAP");
		return true;