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

Commit eddc8f91 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "Move Configuration compat feature flag to app compat namespace" into main

parents 6d5d5a8c 7845b0ae

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();