double tap handler is now only on AOD screen

Author: XJIOP

app/src/main/java/org/xjiop/oneplusaoddoubletapmod/KeyService.java

@@ -12,6 +12,14 @@ public class KeyService extends AccessibilityService {
     private final String TAG = "DBG | KeyService";
 
     private long CLICK_DELAY;
+    private PowerManager powerManager;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+    }
 
     @Override
     public void onAccessibilityEvent(AccessibilityEvent event) {
@@ -26,21 +34,24 @@ public void onInterrupt() {
     @Override
     protected boolean onKeyEvent(KeyEvent event) {
         //Log.d(TAG, "onKeyEvent: " + event);
+        //Log.d(TAG, "isScreenOn: " + powerManager.isInteractive());
 
         boolean result = false;
+        boolean isScreenOn = powerManager != null && powerManager.isInteractive();
 
-        if(event.getKeyCode() == KeyEvent.KEYCODE_F4)
+        if(!isScreenOn && event.getKeyCode() == KeyEvent.KEYCODE_F4)
             result = doubleClick();
 
         return result || super.onKeyEvent(event);
     }
 
     private boolean doubleClick() {
 
-        boolean result;
+        boolean result = false;
 
         long thisTime = System.currentTimeMillis();
         if ((thisTime - CLICK_DELAY) < 250) {
+            //Log.d(TAG, "doubleClick");
 
             CLICK_DELAY = -1;
             result = true;
@@ -54,11 +65,8 @@ private boolean doubleClick() {
         }
         else {
             CLICK_DELAY = thisTime;
-            result = false;
         }
 
-        //Log.d(TAG, "doubleClick: " + result);
-
         return result;
     }
 }

app/src/main/res/xml/key_monitor_service_config.xml

@@ -2,8 +2,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:description="@string/key_service_description"
     android:canRequestFilterKeyEvents="true"
-    android:canRetrieveWindowContent="false"
-    android:canRequestTouchExplorationMode="false"
     android:notificationTimeout="100"
-    android:accessibilityFeedbackType="feedbackGeneric"
+    android:accessibilityFeedbackType="feedbackHaptic"
     android:accessibilityFlags="flagRequestFilterKeyEvents" />