From 11398e2a36960a73cd5e3e4370d13d724e85f0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Go=CC=88llner?= Date: Mon, 13 May 2024 13:39:43 +0100 Subject: [PATCH] Shortcut Helper - Integrate with launcher 3 button nav translation Fixes: 335625543 Test: Unit tests in this CL Test: Manually Flag: ACONFIG com.android.systemui.keyboard_shortcut_helper_rewrite DEVELOPMENT Change-Id: I0367bf4b73994a49ca65b8047bd76d3dc2b3faca --- .../launcher3/taskbar/NavbarButtonsViewController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 89dfff3f91..81581b8660 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -45,6 +45,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SHORTCUT_HELPER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; import android.animation.ArgbEvaluator; @@ -134,6 +135,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private static final int FLAG_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 12; private static final int FLAG_SMALL_SCREEN = 1 << 13; private static final int FLAG_SLIDE_IN_VIEW_VISIBLE = 1 << 14; + private static final int FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING = 1 << 15; /** * Flags where a UI could be over Taskbar surfaces, so the color override should be disabled. @@ -286,8 +288,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT // - Notification shade is expanded // - IME is showing (add separate translation for IME) // - VoiceInteractionWindow (assistant) is showing + // - Keyboard shortcuts helper is showing int flagsToRemoveTranslation = FLAG_NOTIFICATION_SHADE_EXPANDED | FLAG_IME_VISIBLE - | FLAG_VOICE_INTERACTION_WINDOW_SHOWING; + | FLAG_VOICE_INTERACTION_WINDOW_SHOWING | FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING; mPropertyHolders.add(new StatePropertyHolder(mNavButtonInAppDisplayProgressForSysui, flags -> (flags & flagsToRemoveTranslation) != 0, AnimatedFloat.VALUE, 1, 0)); @@ -458,6 +461,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT boolean isScreenPinningActive = (sysUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0; boolean isVoiceInteractionWindowShowing = (sysUiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0; + boolean isKeyboardShortcutHelperShowing = + (sysUiStateFlags & SYSUI_STATE_SHORTCUT_HELPER_SHOWING) != 0; // TODO(b/202218289) we're getting IME as not visible on lockscreen from system updateStateForFlag(FLAG_IME_VISIBLE, isImeVisible); @@ -469,6 +474,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT updateStateForFlag(FLAG_NOTIFICATION_SHADE_EXPANDED, isNotificationShadeExpanded); updateStateForFlag(FLAG_SCREEN_PINNING_ACTIVE, isScreenPinningActive); updateStateForFlag(FLAG_VOICE_INTERACTION_WINDOW_SHOWING, isVoiceInteractionWindowShowing); + updateStateForFlag(FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING, isKeyboardShortcutHelperShowing); if (mA11yButton != null) { // Only used in 3 button @@ -1056,6 +1062,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT appendFlag(str, flags, FLAG_SCREEN_PINNING_ACTIVE, "FLAG_SCREEN_PINNING_ACTIVE"); appendFlag(str, flags, FLAG_VOICE_INTERACTION_WINDOW_SHOWING, "FLAG_VOICE_INTERACTION_WINDOW_SHOWING"); + appendFlag(str, flags, FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING, + "FLAG_KEYBOARD_SHORTCUT_HELPER_SHOWING"); return str.toString(); }