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

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

Merge "Add compat_ui_visibility_status to dev options." into main

parents fd25ae14 a3c98b91

core/java/android/window/DesktopModeFlags.java

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

    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchTransitionsBugfix, true),

    ENABLE_DESKTOP_COMPAT_UI_VISIBILITY_STATUS(

            Flags::enableCompatUiVisibilityStatus, 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

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import java.util.Optional; 
import java.util.Set;

import java.util.function.Consumer;

import java.util.function.Function;

import java.util.function.IntPredicate;

import java.util.function.Predicate;



/**

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.SystemProperties; 
import android.provider.Settings;

import android.view.IWindowManager;

import android.view.accessibility.AccessibilityManager;

import android.window.DesktopModeFlags;

import android.window.SystemPerformanceHinter;



import com.android.internal.logging.UiEventLogger;
@@ -315,7 +316,7 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    static CompatUIStatusManager provideCompatUIStatusManager(@NonNull Context context) {

        if (Flags.enableCompatUiVisibilityStatus()) {

        if (DesktopModeFlags.ENABLE_DESKTOP_COMPAT_UI_VISIBILITY_STATUS.isTrue()) {

            return new CompatUIStatusManager(

                    newState -> Settings.Secure.putInt(context.getContentResolver(),

                            COMPAT_UI_EDUCATION_SHOWING, newState),