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

Commit d6a828b6 authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Make TaskOrg/CompatUI aware of restart menu change 

I952c0dee9802a9288af170ff62d8818aec662aec added restart menu
visibility to AppCompatTaskInfo, but we also need to make sure
that this flag is considered when checking the equality of
AppCompatTaskInfo both for CompatUI and TaskOrg. Otherwise,
the compat info change for this flag can be skipped.

Flag: com.android.window.flags.enable_restart_menu_for_connected_displays
Bug: 401696783
Test: WmTests:DisplayCompatTests
Change-Id: I1b40b1b84f609d71a9eab9928ba7b503dc922095
parent b8b28829

core/java/android/app/AppCompatTaskInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class AppCompatTaskInfo implements Parcelable { 
    private static final int FLAGS_ORGANIZER_INTERESTED = FLAG_IS_FROM_LETTERBOX_DOUBLE_TAP

            | FLAG_ELIGIBLE_FOR_USER_ASPECT_RATIO_BUTTON | FLAG_FULLSCREEN_OVERRIDE_SYSTEM

            | FLAG_FULLSCREEN_OVERRIDE_USER | FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE

            | FLAG_OPT_OUT_EDGE_TO_EDGE;

            | FLAG_OPT_OUT_EDGE_TO_EDGE | FLAG_ENABLE_RESTART_MENU_FOR_DISPLAY_MOVE;



    @TopActivityFlag

    private static final int FLAGS_COMPAT_UI_INTERESTED = FLAGS_ORGANIZER_INTERESTED
@@ -179,7 +179,8 @@ public class AppCompatTaskInfo implements Parcelable { 
     */

    public boolean hasCompatUI() {

        return isTopActivityInSizeCompat() || eligibleForLetterboxEducation()

                || isLetterboxDoubleTapEnabled() || eligibleForUserAspectRatioButton();

                || isLetterboxDoubleTapEnabled() || eligibleForUserAspectRatioButton()

                || isRestartMenuEnabledForDisplayMove();

    }



    /**