commit 6da32489b1d99d6ff79347bfd5299236901ae8c8
author Marcello Galhardo <mgalhardo@google.com> Wed Nov 15 17:20:35 2023 +0000
committer Marcello Galhardo <mgalhardo@google.com> Wed Nov 15 19:39:41 2023 +0000
tree 66eea16274404fb6a2391c594b3ee2e71a35d229
parent 68e1eb8e77df45ce179dd407eef37ceae8687758

Add debug logs to `NoteTaskInitializer`

Test: atest NoteTaskInitializerTest
Fixes: b/311189837
Change-Id: If076ffdc5b9e8fa7fce5eec055078c5d641c0f13

packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt

diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt
index 338d3ed..9698548d 100644
--- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt
+++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt
@@ -27,6 +27,7 @@
 import com.android.keyguard.KeyguardUpdateMonitor
 import com.android.keyguard.KeyguardUpdateMonitorCallback
 import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.log.DebugLogger.debugLog
 import com.android.systemui.notetask.NoteTaskEntryPoint.KEYBOARD_SHORTCUT
 import com.android.systemui.notetask.NoteTaskEntryPoint.TAIL_BUTTON
 import com.android.systemui.settings.UserTracker
@@ -52,6 +53,8 @@
 
     /** Initializes note task related features and glue it with other parts of the SystemUI. */
     fun initialize() {
+        debugLog { "initialize: isEnabled=$isEnabled, hasBubbles=${optionalBubbles.isEmpty}" }
+
         // Guard against feature not being enabled or mandatory dependencies aren't available.
         if (!isEnabled || optionalBubbles.isEmpty) return
 
@@ -134,12 +137,15 @@
      * Tracks a [KeyEvent], and determines if it should trigger an action to show the note task.
      * Returns a [NoteTaskEntryPoint] if an action should be taken, and null otherwise.
      */
-    private fun KeyEvent.toNoteTaskEntryPointOrNull(): NoteTaskEntryPoint? =
-        when {
+    private fun KeyEvent.toNoteTaskEntryPointOrNull(): NoteTaskEntryPoint? {
+        val entryPoint = when {
             keyCode == KEYCODE_STYLUS_BUTTON_TAIL && isTailButtonNotesGesture() -> TAIL_BUTTON
             keyCode == KEYCODE_N && isMetaPressed && isCtrlPressed -> KEYBOARD_SHORTCUT
             else -> null
         }
+        debugLog { "toNoteTaskEntryPointOrNull: entryPoint=$entryPoint" }
+        return entryPoint
+    }
 
     private var lastStylusButtonTailUpEventTime: Long = -MULTI_PRESS_TIMEOUT
 
@@ -155,8 +161,10 @@
         val isMultiPress = (downTime - lastStylusButtonTailUpEventTime) < MULTI_PRESS_TIMEOUT
         val isLongPress = (eventTime - downTime) >= LONG_PRESS_TIMEOUT
         lastStylusButtonTailUpEventTime = eventTime
+
         // For now, trigger action immediately on UP of a single press, without waiting for
         // the multi-press timeout to expire.
+        debugLog { "isTailButtonNotesGesture: isMultiPress=$isMultiPress, isLongPress=$isLongPress" }
         return !isMultiPress && !isLongPress
     }