Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6d2d4f authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Merge "Shortcut Helper - Integrate with launcher 3 button nav translation" into main

parents 1ee568bf 11398e2a

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+9 −1
Original line number Diff line number Diff line
@@ -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();

    }