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

Commit 75eaf771 authored by Brad Stenning's avatar Brad Stenning Committed by Android (Google) Code Review
Browse files

Merge "Provide a hook for forcing all system bars to be displayed at all times"

parents 643ba186 e0573698

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ public abstract class WallpaperService extends Service { 
            public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,

                    Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,

                    MergedConfiguration mergedConfiguration, Rect backDropRect, boolean forceLayout,

                    boolean alwaysConsumeNavBar, int displayId,

                    boolean alwaysConsumeSystemBars, int displayId,

                    DisplayCutout.ParcelableWrapper displayCutout) {

                Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED,

                        reportDraw ? 1 : 0, outsets);

core/java/android/view/IWindow.aidl

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ oneway interface IWindow { 
    void resized(in Rect frame, in Rect overscanInsets, in Rect contentInsets,

            in Rect visibleInsets, in Rect stableInsets, in Rect outsets, boolean reportDraw,

            in MergedConfiguration newMergedConfiguration, in Rect backDropFrame,

            boolean forceLayout, boolean alwaysConsumeNavBar, int displayId,

            boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId,

            in DisplayCutout.ParcelableWrapper displayCutout);



    /**

core/java/android/view/IWindowManager.aidl

+10 −0
Original line number Diff line number Diff line
@@ -303,6 +303,16 @@ interface IWindowManager 
     */

    oneway void statusBarVisibilityChanged(int displayId, int visibility);



    /**

    * When set to {@code true} the system bars will always be shown. This is true even if an app

    * requests to be fullscreen by setting the system ui visibility flags. The

    * functionality was added for the automotive case as a way to guarantee required content stays

    * on screen at all times.

    *

    * @hide

    */

    oneway void setForceShowSystemBars(boolean show);



    /**

     * Called by System UI to notify of changes to the visibility of Recents.

     */

core/java/android/view/InsetsController.java

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class InsetsController implements WindowInsetsController { 
            }



            WindowInsets insets = state.calculateInsets(mFrame, mLastInsets.isRound(),

                    mLastInsets.shouldAlwaysConsumeNavBar(), mLastInsets.getDisplayCutout(),

                    mLastInsets.shouldAlwaysConsumeSystemBars(), mLastInsets.getDisplayCutout(),

                    mLastLegacyContentInsets, mLastLegacyStableInsets, mLastLegacySoftInputMode,

                    null /* typeSideMap */);

            mViewRoot.mView.dispatchWindowInsetsAnimationProgress(insets);
@@ -177,12 +177,12 @@ public class InsetsController implements WindowInsetsController { 
     */

    @VisibleForTesting

    public WindowInsets calculateInsets(boolean isScreenRound,

            boolean alwaysConsumeNavBar, DisplayCutout cutout, Rect legacyContentInsets,

            boolean alwaysConsumeSystemBars, DisplayCutout cutout, Rect legacyContentInsets,

            Rect legacyStableInsets, int legacySoftInputMode) {

        mLastLegacyContentInsets.set(legacyContentInsets);

        mLastLegacyStableInsets.set(legacyStableInsets);

        mLastLegacySoftInputMode = legacySoftInputMode;

        mLastInsets = mState.calculateInsets(mFrame, isScreenRound, alwaysConsumeNavBar, cutout,

        mLastInsets = mState.calculateInsets(mFrame, isScreenRound, alwaysConsumeSystemBars, cutout,

                legacyContentInsets, legacyStableInsets, legacySoftInputMode,

                null /* typeSideMap */);

        return mLastInsets;

core/java/android/view/InsetsState.java

+2 −7
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
package android.view;



import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_IME;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_NONE;

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

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

import static android.view.WindowInsets.Type.indexOf;
@@ -31,7 +28,6 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.SparseArray;

import android.util.SparseIntArray;

import android.view.WindowInsets.Type;

import android.view.WindowInsets.Type.InsetType;
@@ -40,7 +36,6 @@ import android.view.WindowManager.LayoutParams; 
import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Objects;



/**
@@ -130,7 +125,7 @@ public class InsetsState implements Parcelable { 
     * @return The calculated insets.

     */

    public WindowInsets calculateInsets(Rect frame, boolean isScreenRound,

            boolean alwaysConsumeNavBar, DisplayCutout cutout,

            boolean alwaysConsumeSystemBars, DisplayCutout cutout,

            @Nullable Rect legacyContentInsets, @Nullable Rect legacyStableInsets,

            int legacySoftInputMode, @Nullable @InsetSide SparseIntArray typeSideMap) {

        Insets[] typeInsetsMap = new Insets[Type.SIZE];
@@ -180,7 +175,7 @@ public class InsetsState implements Parcelable { 
            }

        }

        return new WindowInsets(typeInsetsMap, typeMaxInsetsMap, typeVisibilityMap, isScreenRound,

                alwaysConsumeNavBar, cutout);

                alwaysConsumeSystemBars, cutout);

    }



    private void processSource(InsetsSource source, Rect relativeFrame, boolean ignoreVisibility,