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

Commit 338efa60 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes I95328c6b,I109cead7,I82b5a778,I352a3213 

* changes:
  More random optimzations to make things go faster
  Don't compare configs during layout
  Get rid of some ancient logic around layouting invisible windows
  Window Manager spring cleaning
parents 368b384c 50150158

core/java/android/view/DisplayCutout.java

+8 −2
Original line number Diff line number Diff line
@@ -512,8 +512,8 @@ public final class DisplayCutout { 
     * @hide

     */

    public DisplayCutout inset(int insetLeft, int insetTop, int insetRight, int insetBottom) {

        if (isBoundsEmpty()

                || insetLeft == 0 && insetTop == 0 && insetRight == 0 && insetBottom == 0) {

        if (insetLeft == 0 && insetTop == 0 && insetRight == 0 && insetBottom == 0

                || isBoundsEmpty()) {

            return this;

        }
@@ -534,6 +534,12 @@ public final class DisplayCutout { 
            safeInsets.right = atLeastZero(safeInsets.right - insetRight);

        }



        // If we are not cutting off part of the cutout by insetting it on bottom/right, and we also

        // don't move it around, we can avoid the allocation and copy of the instance.

        if (insetLeft == 0 && insetTop == 0 && mSafeInsets.equals(safeInsets)) {

            return this;

        }



        Rect[] bounds = mBounds.getRects();

        for (int i = 0; i < bounds.length; ++i) {

            if (!bounds[i].equals(ZERO_RECT)) {

services/core/java/com/android/server/policy/PhoneWindowManager.java

+23 −17
Original line number Diff line number Diff line
@@ -2223,6 +2223,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    @Override

    public boolean canBeHiddenByKeyguardLw(WindowState win) {



        // Keyguard visibility of window from activities are determined over activity visibility.

        if (win.getAppToken() != null) {

            return false;

        }

        switch (win.getAttrs().type) {

            case TYPE_STATUS_BAR:

            case TYPE_NAVIGATION_BAR:
@@ -2236,19 +2241,30 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private boolean shouldBeHiddenByKeyguard(WindowState win, WindowState imeTarget) {

        final LayoutParams attrs = win.getAttrs();



        // Keyguard visibility of window from activities are determined over activity visibility.

        if (win.getAppToken() != null) {

            return false;

        boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER

                && !mWindowManagerInternal.isStackVisibleLw(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        if (hideDockDivider) {

            return true;

        }



        // If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered

        // hidden because it's in the process of hiding, but it's still being shown on screen.

        // In that case, we want to continue hiding the IME until the windows have completed

        // drawing. This way, we know that the IME can be safely shown since the other windows are

        // now shown.

        final boolean hideIme = win.isInputMethodWindow()

                && (mAodShowing || !mDefaultDisplayPolicy.isWindowManagerDrawComplete());

        if (hideIme) {

            return true;

        }



        final LayoutParams attrs = win.getAttrs();

        final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleLw()

                && (imeTarget.canShowWhenLocked() || !canBeHiddenByKeyguardLw(imeTarget));



        // Show IME over the keyguard if the target allows it

        boolean allowWhenLocked = (win.isInputMethodWindow() || imeTarget == this)

                && showImeOverKeyguard;

        boolean allowWhenLocked = win.isInputMethodWindow() && showImeOverKeyguard;



        final boolean isKeyguardShowing = mKeyguardDelegate.isShowing();
@@ -2259,17 +2275,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    || (attrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0;

        }



        boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER

                && !mWindowManagerInternal.isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        // If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered

        // hidden because it's in the process of hiding, but it's still being shown on screen.

        // In that case, we want to continue hiding the IME until the windows have completed

        // drawing. This way, we know that the IME can be safely shown since the other windows are

        // now shown.

        final boolean hideIme = win.isInputMethodWindow()

                && (mAodShowing || !mDefaultDisplayPolicy.isWindowManagerDrawComplete());

        return (isKeyguardShowing && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY)

                || hideDockDivider || hideIme;

        return isKeyguardShowing && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY;

    }



    /** {@inheritDoc} */

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

+3 −3
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ final class ActivityRecord extends ConfigurationContainer { 
                    ActivityTaskManagerService.getInputDispatchingTimeoutLocked(this)

                            * 1000000L, fullscreen,

                    (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0, appInfo.targetSdkVersion,

                    info.screenOrientation, mRotationAnimationHint, info.configChanges,

                    info.screenOrientation, mRotationAnimationHint,

                    mLaunchTaskBehind, isAlwaysFocusable());

            if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) {

                Slog.v(TAG, "addAppToken: "
@@ -1151,11 +1151,11 @@ final class ActivityRecord extends ConfigurationContainer { 
    AppWindowToken createAppWindow(WindowManagerService service, IApplicationToken token,

            boolean voiceInteraction, DisplayContent dc, long inputDispatchingTimeoutNanos,

            boolean fullscreen, boolean showForAllUsers, int targetSdk, int orientation,

            int rotationAnimationHint, int configChanges, boolean launchTaskBehind,

            int rotationAnimationHint, boolean launchTaskBehind,

            boolean alwaysFocusable) {

        return new AppWindowToken(service, token, mActivityComponent, voiceInteraction, dc,

                inputDispatchingTimeoutNanos, fullscreen, showForAllUsers, targetSdk, orientation,

                rotationAnimationHint, configChanges, launchTaskBehind, alwaysFocusable,

                rotationAnimationHint, launchTaskBehind, alwaysFocusable,

                this);

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 


    /** @see WindowContainer#fillsParent() */

    private boolean mFillsParent;

    boolean layoutConfigChanges;

    boolean mShowForAllUsers;

    int mTargetSdk;
@@ -337,7 +336,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
    AppWindowToken(WindowManagerService service, IApplicationToken token,

            ComponentName activityComponent, boolean voiceInteraction, DisplayContent dc,

            long inputDispatchingTimeoutNanos, boolean fullscreen, boolean showForAllUsers,

            int targetSdk, int orientation, int rotationAnimationHint, int configChanges,

            int targetSdk, int orientation, int rotationAnimationHint,

            boolean launchTaskBehind, boolean alwaysFocusable,

            ActivityRecord activityRecord) {

        this(service, token, activityComponent, voiceInteraction, dc, fullscreen);
@@ -348,7 +347,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        mShowForAllUsers = showForAllUsers;

        mTargetSdk = targetSdk;

        mOrientation = orientation;

        layoutConfigChanges = (configChanges & (CONFIG_SCREEN_SIZE | CONFIG_ORIENTATION)) != 0;

        mLaunchTaskBehind = launchTaskBehind;

        mAlwaysFocusable = alwaysFocusable;

        mRotationAnimationHint = rotationAnimationHint;
@@ -1976,7 +1974,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        final boolean surfaceReady = w.isDrawnLw()  // Regular case

                || w.mWinAnimator.mSurfaceDestroyDeferred  // The preserved surface is still ready.

                || w.isDragResizeChanged();  // Waiting for relayoutWindow to call preserveSurface.

        final boolean needsLetterbox = w.isLetterboxedAppWindow() && fillsParent() && surfaceReady;

        final boolean needsLetterbox = surfaceReady && w.isLetterboxedAppWindow() && fillsParent();

        if (needsLetterbox) {

            if (mLetterbox == null) {

                mLetterbox = new Letterbox(() -> makeChildSurface(null));

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

+3 −2
Original line number Diff line number Diff line
@@ -173,8 +173,9 @@ public class BarController { 
        }

        final boolean wasVis = mWin.isVisibleLw();

        final boolean wasAnim = mWin.isAnimatingLw();

        final boolean change = show ? mWin.showLw(!mNoAnimationOnNextShow && !skipAnimation())

                : mWin.hideLw(!mNoAnimationOnNextShow && !skipAnimation());

        final boolean skipAnim = skipAnimation();

        final boolean change = show ? mWin.showLw(!mNoAnimationOnNextShow && !skipAnim)

                : mWin.hideLw(!mNoAnimationOnNextShow && !skipAnim);

        mNoAnimationOnNextShow = false;

        final int state = computeStateLw(wasVis, wasAnim, mWin, change);

        final boolean stateChanged = updateStateLw(state);