Merge "Let single tap devices wake up with double tap"

2019-03-23 00:21:07 +00:00
parent 465c591191 3bab3d86ab
commit e837bf4dc6
1 changed files with 5 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -114,17 +114,19 @@ public class StatusBarWindowView extends FrameLayout {
            if (mSingleTapEnabled) {
                mService.wakeUpIfDozing(SystemClock.uptimeMillis(), StatusBarWindowView.this,
                        "SINGLE_TAP");
+                return true;
            }
-            return mSingleTapEnabled;
+            return false;
        }

        @Override
        public boolean onDoubleTap(MotionEvent e) {
-            if (mDoubleTapEnabled) {
+            if (mDoubleTapEnabled || mSingleTapEnabled) {
                mService.wakeUpIfDozing(SystemClock.uptimeMillis(), StatusBarWindowView.this,
                        "DOUBLE_TAP");
+                return true;
            }
-            return mDoubleTapEnabled;
+            return false;
        }
    };
    private final TunerService.Tunable mTunable = (key, newValue) -> {