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

Commit ef586bd6 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Do not set isImmersive in TaskbarDelegate" into main

parents 0d4952e0 be0ed898

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -103,8 +103,6 @@ public class QuickStepContract { 
    public static final int SYSUI_STATE_BACK_DISABLED = 1 << 22;

    public static final int SYSUI_STATE_BACK_DISABLED = 1 << 22;

    // The bubble stack is expanded AND the mange menu for bubbles is expanded on top of it.

    // The bubble stack is expanded AND the mange menu for bubbles is expanded on top of it.

    public static final int SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED = 1 << 23;

    public static final int SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED = 1 << 23;

    // The current app is in immersive mode

    public static final int SYSUI_STATE_IMMERSIVE_MODE = 1 << 24;

    // The voice interaction session window is showing

    // The voice interaction session window is showing

    public static final int SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 25;

    public static final int SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 25;

    // Freeform windows are showing in desktop mode

    // Freeform windows are showing in desktop mode
@@ -162,7 +160,6 @@ public class QuickStepContract { 
            SYSUI_STATE_DEVICE_DOZING,

            SYSUI_STATE_DEVICE_DOZING,

            SYSUI_STATE_BACK_DISABLED,

            SYSUI_STATE_BACK_DISABLED,

            SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED,

            SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED,

            SYSUI_STATE_IMMERSIVE_MODE,

            SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING,

            SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING,

            SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE,

            SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE,

            SYSUI_STATE_DEVICE_DREAMING,

            SYSUI_STATE_DEVICE_DREAMING,
@@ -247,9 +244,6 @@ public class QuickStepContract { 
        if ((flags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0) {

        if ((flags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0) {

            str.add("bubbles_mange_menu_expanded");

            str.add("bubbles_mange_menu_expanded");

        }

        }

        if ((flags & SYSUI_STATE_IMMERSIVE_MODE) != 0) {

            str.add("immersive_mode");

        }

        if ((flags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0) {

        if ((flags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0) {

            str.add("vis_win_showing");

            str.add("vis_win_showing");

        }

        }

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_B 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IMMERSIVE_MODE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
@@ -322,7 +321,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
                .setFlag(SYSUI_STATE_NAV_BAR_HIDDEN, !isWindowVisible())

                .setFlag(SYSUI_STATE_NAV_BAR_HIDDEN, !isWindowVisible())

                .setFlag(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY,

                .setFlag(SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY,

                        allowSystemGestureIgnoringBarVisibility())

                        allowSystemGestureIgnoringBarVisibility())

                .setFlag(SYSUI_STATE_IMMERSIVE_MODE, isImmersiveMode())

                .commitUpdate(mDisplayId);

                .commitUpdate(mDisplayId);

    }

    }