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

Commit 39aad1f1 authored by Marzia Favaro's avatar Marzia Favaro
Browse files

Disable aspect ratio settings floating button when already in app menu 

If overridesShowAppHandle, the aspect ratio button is already present in
the app menu when needed, and therefore the old floating button is not
necessary.

Bug: 377689543
Test: Manual, enabling the show app handle override disables the
floating button
Flag: com.android.window.flags.show_app_handle_large_screens

Change-Id: Ied8d32f2613b5acde36f6e17fb5f18982243f6d3
parent 8fc60dd7

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

+6 −4
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.wm.shell.compatui.api.CompatUIHandler; 
import com.android.wm.shell.compatui.api.CompatUIInfo;

import com.android.wm.shell.compatui.impl.CompatUIEvents.SizeCompatRestartButtonClicked;

import com.android.wm.shell.desktopmode.DesktopUserRepositories;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;
@@ -70,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;



/**
@@ -667,9 +667,10 @@ public class CompatUIController implements OnDisplaysChangedListener, 


    private void createOrUpdateUserAspectRatioSettingsLayout(@NonNull TaskInfo taskInfo,

            @Nullable ShellTaskOrganizer.TaskListener taskListener) {

        boolean overridesShowAppHandle = DesktopModeStatus.overridesShowAppHandle(mContext);

        if (mUserAspectRatioSettingsLayout != null) {

            if (mUserAspectRatioSettingsLayout.needsToBeRecreated(taskInfo, taskListener)

                    || mIsInDesktopMode) {

                    || mIsInDesktopMode || overridesShowAppHandle) {

                mUserAspectRatioSettingsLayout.release();

                mUserAspectRatioSettingsLayout = null;

            } else {
@@ -682,8 +683,9 @@ public class CompatUIController implements OnDisplaysChangedListener, 
                return;

            }

        }

        if (mIsInDesktopMode) {

            // Return if in desktop mode.

        if (mIsInDesktopMode || overridesShowAppHandle) {

            // Return if in desktop mode or app handle menu is already showing change aspect ratio

            // option.

            return;

        }

        // Create a new UI layout.