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

Commit 0da8fd16 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Force non-floating main app windows to not fit anything 

Since we have a better approach of fitting content instead of
setting them on the layout params
(Window.setContentOnApplyWindowInsetsListener), we can now
simplify forcing of filling the screen:

Instead of clearing the fit types when the private flag is set, we
unset the types and straight out reject any params when the client
would like to fit.

Test: DisplayPolicyTests
Bug: 118118435
Change-Id: I845e6b1c81e29ab66a770891d03c62a32418e8cc
parent 7fb715c4

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4458,7 +4458,7 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40

    field public CharSequence accessibilityTitle;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="APPEARANCE_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="BEHAVIOR_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x10000000, equals=0x10000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x20000000, equals=0x20000000, name="ONLY_DRAW_BOTTOM_BAR_BACKGROUND")}) public int privateFlags;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="APPEARANCE_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="BEHAVIOR_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x10000000, equals=0x10000000, name="FIT_INSETS_CONTROLLED")}) public int privateFlags;

  }



}

core/java/android/inputmethodservice/InputMethodService.java

+8 −9
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_NONE;

import static android.view.WindowInsets.Type.navigationBars;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND;



import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
@@ -1194,16 +1194,15 @@ public class InputMethodService extends AbstractInputMethodService { 
                Context.LAYOUT_INFLATER_SERVICE);

        mWindow = new SoftInputWindow(this, "InputMethod", mTheme, null, null, mDispatcherState,

                WindowManager.LayoutParams.TYPE_INPUT_METHOD, Gravity.BOTTOM, false);

        mWindow.getWindow().getAttributes().setFitWindowInsetsTypes(WindowInsets.Type.systemBars());

        mWindow.getWindow().addPrivateFlags(PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND);

        mWindow.getWindow().getAttributes().setFitWindowInsetsTypes(WindowInsets.Type.statusBars());



        // IME layout should always be inset by navigation bar, no matter it's current visibility.

        mWindow.getWindow().getDecorView().setOnApplyWindowInsetsListener(

                (v, insets) -> v.onApplyWindowInsets(

                        new WindowInsets.Builder(insets).setSystemWindowInsets(

                                android.graphics.Insets.of(

                                        insets.getSystemWindowInsetLeft(),

                                        insets.getSystemWindowInsetTop(),

                                        insets.getSystemWindowInsetRight(),

                                        insets.getStableInsetBottom())).build()));

                        new WindowInsets.Builder(insets).setInsets(

                                navigationBars(), insets.getMaxInsets(navigationBars()))

                                .build()));



        // For ColorView in DecorView to work, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS needs to be set

        // by default (but IME developers can opt this out later if they want a new behavior).

        mWindow.getWindow().setFlags(

core/java/android/view/WindowManager.java

+1 −12
Original line number Diff line number Diff line
@@ -1877,13 +1877,6 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_FIT_INSETS_CONTROLLED = 0x10000000;



        /**

         * Flag to indicate that the window only draws the bottom bar background so that we don't

         * extend it to system bar areas at other sides.

         * @hide

         */

        public static final int PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND = 0x20000000;



        /**

         * An internal annotation for flags that can be specified to {@link #softInputMode}.

         *
@@ -1994,11 +1987,7 @@ public interface WindowManager extends ViewManager { 
                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_FIT_INSETS_CONTROLLED,

                        equals = PRIVATE_FLAG_FIT_INSETS_CONTROLLED,

                        name = "FIT_INSETS_CONTROLLED"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND,

                        equals = PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND,

                        name = "ONLY_DRAW_BOTTOM_BAR_BACKGROUND")

                        name = "FIT_INSETS_CONTROLLED")

        })

        @TestApi

        public int privateFlags;

core/java/com/android/internal/policy/DecorView.java

+18 −9
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import android.graphics.drawable.ColorDrawable; 
import android.graphics.drawable.Drawable;

import android.graphics.drawable.InsetDrawable;

import android.graphics.drawable.LayerDrawable;

import android.os.Build.VERSION_CODES;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Pair;
@@ -282,6 +283,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    private Insets mLastBackgroundInsets = Insets.NONE;

    private boolean mDrawLegacyNavigationBarBackground;



    /**

     * Whether the app targets an SDK that uses the new insets APIs.

     */

    private boolean mUseNewInsetsApi;



    DecorView(Context context, int featureId, PhoneWindow window,

            WindowManager.LayoutParams params) {

        super(context);
@@ -311,6 +317,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        initResizingPaints();



        mLegacyNavigationBarBackgroundPaint.setColor(Color.BLACK);

        mUseNewInsetsApi = context.getApplicationInfo().targetSdkVersion >= VERSION_CODES.R;

    }



    void setBackgroundFallback(@Nullable Drawable fallbackDrawable) {
@@ -1174,20 +1181,24 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        // Note: We don't need to check for IN_SCREEN or INSET_DECOR because unlike the status bar,

        // these flags wouldn't make the window draw behind the navigation bar, unless

        // LAYOUT_HIDE_NAVIGATION was set.

        //

        // Note: Once the app targets R+, we no longer do this logic because we can't rely on

        // SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION to indicate whether the app wants to handle it by

        // themselves.

        boolean hideNavigation = (sysUiVisibility & SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0

                || !(state == null || state.getSource(ITYPE_NAVIGATION_BAR).isVisible());

        boolean forceConsumingNavBar = (mForceWindowDrawsBarBackgrounds

                        && (attrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0

                        && (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0

                        && (attrs.getFitWindowInsetsTypes() & Type.navigationBars()) != 0

                        && !hideNavigation)

                || (mLastShouldAlwaysConsumeSystemBars && hideNavigation);



        boolean consumingNavBar =

                ((attrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0

                        && (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0

                        && (attrs.getFitWindowInsetsTypes() & Type.navigationBars()) != 0

                        && !hideNavigation)

                        && !hideNavigation

                        // TODO IME wrap_content windows need to have margin to work properly

                        && (!mUseNewInsetsApi || isImeWindow))

                || forceConsumingNavBar;



        // If we didn't request fullscreen layout, but we still got it because of the
@@ -1200,16 +1211,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        boolean consumingStatusBar = (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) == 0

                && (attrs.flags & FLAG_LAYOUT_IN_SCREEN) == 0

                && (attrs.flags & FLAG_LAYOUT_INSET_DECOR) == 0

                && (attrs.getFitWindowInsetsTypes() & Type.statusBars()) != 0

                && mForceWindowDrawsBarBackgrounds

                && mLastTopInset != 0

                || (mLastShouldAlwaysConsumeSystemBars && fullscreen);



        int sides = attrs.getFitWindowInsetsSides();

        int consumedTop = consumingStatusBar && (sides & Side.TOP) != 0 ? mLastTopInset : 0;

        int consumedRight = consumingNavBar && (sides & Side.RIGHT) != 0 ? mLastRightInset : 0;

        int consumedBottom = consumingNavBar && (sides & Side.BOTTOM) != 0 ? mLastBottomInset : 0;

        int consumedLeft = consumingNavBar && (sides & Side.LEFT) != 0 ? mLastLeftInset : 0;

        int consumedTop = consumingStatusBar ? mLastTopInset : 0;

        int consumedRight = consumingNavBar ? mLastRightInset : 0;

        int consumedBottom = consumingNavBar ? mLastBottomInset : 0;

        int consumedLeft = consumingNavBar ? mLastLeftInset : 0;



        if (mContentRoot != null

                && mContentRoot.getLayoutParams() instanceof MarginLayoutParams) {

core/java/com/android/internal/policy/PhoneWindow.java

+2 −0
Original line number Diff line number Diff line
@@ -2381,6 +2381,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            setFlags(0, flagsToUpdate);

        } else {

            setFlags(FLAG_LAYOUT_IN_SCREEN|FLAG_LAYOUT_INSET_DECOR, flagsToUpdate);

            getAttributes().setFitWindowInsetsSides(0);

            getAttributes().setFitWindowInsetsTypes(0);

        }



        if (a.getBoolean(R.styleable.Window_windowNoTitle, false)) {