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

Commit 7845b0ae authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Move Configuration compat feature flag to app compat namespace 

Also, this change renamed the flag to make it reflect what is
happening better.

Bug: 291870756
Test: m
Test: m services.core.flags-java
Change-Id: Ic599db3d8953752418a9a0cb4afdb3aa65003bc7
parent f8e2f788

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

0 → 100644
+9 −0
Original line number Diff line number Diff line 
package: "com.android.window.flags"



flag {

  name: "allows_screen_size_decoupled_from_status_bar_and_cutout"

  namespace: "large_screen_experiences_app_compat"

  description: "When necessary, configuration decoupled from status bar and display cutout"

  bug: "291870756"

  is_fixed_read_only: true

}
 
 No newline at end of file

services/core/java/com/android/server/wm/WindowManagerFlags.java

+3 −0
Original line number Diff line number Diff line
@@ -49,5 +49,8 @@ class WindowManagerFlags { 


    final boolean mWallpaperOffsetAsync = Flags.wallpaperOffsetAsync();



    final boolean mAllowsScreenSizeDecoupledFromStatusBarAndCutout =

            Flags.allowsScreenSizeDecoupledFromStatusBarAndCutout();



    /* End Available Flags */

}

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ import com.android.server.policy.WindowManagerPolicy; 
import com.android.server.policy.WindowManagerPolicy.ScreenOffListener;

import com.android.server.power.ShutdownThread;

import com.android.server.utils.PriorityDump;

import com.android.window.flags.Flags;



import dalvik.annotation.optimization.NeverCompile;
@@ -1194,7 +1193,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                .getBoolean(R.bool.config_skipActivityRelaunchWhenDocking);

        final boolean isScreenSizeDecoupledFromStatusBarAndCutout = context.getResources()

                .getBoolean(R.bool.config_decoupleStatusBarAndDisplayCutoutFromScreenSize)

                && Flags.closeToSquareConfigIncludesStatusBar();

                && mFlags.mAllowsScreenSizeDecoupledFromStatusBarAndCutout;

        if (!isScreenSizeDecoupledFromStatusBarAndCutout) {

            mDecorTypes = WindowInsets.Type.displayCutout() | WindowInsets.Type.navigationBars();

            mConfigTypes = WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars();