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

Commit 6b5a67dd authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Add skip_compat_ui_education_in_desktop_mode to dev options." into main

parents f14b4b11 9a38ea43

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public enum DesktopModeFlags { 
            Flags::enableDesktopAppLaunchTransitionsBugfix, true),

    ENABLE_DESKTOP_COMPAT_UI_VISIBILITY_STATUS(

            Flags::enableCompatUiVisibilityStatus, true),

    ENABLE_DESKTOP_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE_BUGFIX(

            Flags::skipCompatUiEducationInDesktopMode, true),

    INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC(

            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    ENABLE_DESKTOP_WINDOWING_HSUM(Flags::enableDesktopWindowingHsum, true),

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java

+3 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ import android.view.Display; 
import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.accessibility.AccessibilityManager;

import android.window.DesktopModeFlags;



import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayController.OnDisplaysChangedListener;
@@ -873,6 +873,7 @@ public class CompatUIController implements OnDisplaysChangedListener, 
        }

        boolean isDesktopModeShowing = mDesktopUserRepositories.get().getCurrent()

                .getVisibleTaskCount(taskInfo.displayId) > 0;

        return Flags.skipCompatUiEducationInDesktopMode() && isDesktopModeShowing;

        return DesktopModeFlags.ENABLE_DESKTOP_SKIP_COMPAT_UI_EDUCATION_IN_DESKTOP_MODE_BUGFIX

                .isTrue() && isDesktopModeShowing;

    }

}