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

Commit ac7c6e36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove flag allow_hide_scm_button." into main

parents 44d5d407 745d20f6

core/java/android/window/flags/large_screen_experiences_app_compat.aconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -57,13 +57,6 @@ flag { 
  is_fixed_read_only: true

  is_fixed_read_only: true

}

}





flag {

  name: "allow_hide_scm_button"

  namespace: "large_screen_experiences_app_compat"

  description: "Whether we should allow hiding the size compat restart button"

  bug: "318840081"

}



flag {

flag {

  name: "camera_compat_for_freeform"

  name: "camera_compat_for_freeform"

  namespace: "large_screen_experiences_app_compat"

  namespace: "large_screen_experiences_app_compat"

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.View; 
import android.window.DesktopModeFlags;

import android.window.DesktopModeFlags;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;

import com.android.wm.shell.R;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

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

import com.android.wm.shell.common.DisplayLayout;
@@ -201,8 +200,7 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { 
    @VisibleForTesting

    @VisibleForTesting

    boolean shouldShowSizeCompatRestartButton(@NonNull TaskInfo taskInfo) {

    boolean shouldShowSizeCompatRestartButton(@NonNull TaskInfo taskInfo) {

        // Always show button if display is phone sized.

        // Always show button if display is phone sized.

        if (!Flags.allowHideScmButton() || taskInfo.configuration.smallestScreenWidthDp

        if (taskInfo.configuration.smallestScreenWidthDp < LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP) {

                < LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP) {

            return true;

            return true;

        }

        }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -399,7 +399,6 @@ public class CompatUIWindowManagerTest extends ShellTestCase { 




    @Test

    @Test

    @RequiresFlagsDisabled(FLAG_APP_COMPAT_UI_FRAMEWORK)

    @RequiresFlagsDisabled(FLAG_APP_COMPAT_UI_FRAMEWORK)

    @EnableFlags(Flags.FLAG_ALLOW_HIDE_SCM_BUTTON)

    public void testShouldShowSizeCompatRestartButton() {

    public void testShouldShowSizeCompatRestartButton() {

        doReturn(85).when(mCompatUIConfiguration).getHideSizeCompatRestartButtonTolerance();

        doReturn(85).when(mCompatUIConfiguration).getHideSizeCompatRestartButtonTolerance();

        mWindowManager = new CompatUIWindowManager(mContext, mTaskInfo, mSyncTransactionQueue,

        mWindowManager = new CompatUIWindowManager(mContext, mTaskInfo, mSyncTransactionQueue,