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

Commit 635cd7b6 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Clean up hideLw and showLw of WindowManagerPolicy#WindowState 

Move all usages from PhoneWindowManager to DisplayPolicy.
And the unused interfaces are also removed: setAodShowing,
isStackVisibleLw, applyKeyguardPolicyLw, getDisplayId,
isInputMethodWindow.

The condition of "hideDockDivider" is removed from
shouldBeHiddenByKeyguard because it isn't related to keyguard
and the management of divider should be handled by
SplitScreenController in WM shell.

Bug: 163976519
Test: WmTests CtsWindowManagerDeviceTestCases presubmit

Change-Id: I67a9fbb3b03b63044dc84630473f8f639444d0b3
parent 11cbe5ff

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

+0 −65
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; 
import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;

import static android.app.AppOpsManager.OP_SYSTEM_ALERT_WINDOW;

import static android.app.AppOpsManager.OP_TOAST_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.content.Context.CONTEXT_RESTRICTED;

import static android.content.Context.WINDOW_SERVICE;

import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
@@ -45,10 +44,8 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; 
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

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

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

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

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
@@ -178,7 +175,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.ViewConfiguration;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManagerGlobal;

import android.view.WindowManagerPolicyConstants;

import android.view.accessibility.AccessibilityEvent;
@@ -603,8 +599,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    private final MutableBoolean mTmpBoolean = new MutableBoolean(false);



    private boolean mAodShowing;



    private boolean mPerDisplayFocusEnabled = false;

    private volatile int mTopFocusedDisplayId = INVALID_DISPLAY;
@@ -2267,44 +2261,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    private boolean shouldBeHiddenByKeyguard(WindowState win, WindowState imeTarget) {

        final LayoutParams attrs = win.getAttrs();



        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 boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleLw()

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



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

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



        final boolean isKeyguardShowing = mKeyguardDelegate.isShowing();



        if (isKeyguardShowing && isKeyguardOccluded()) {

            // Show SHOW_WHEN_LOCKED windows if Keyguard is occluded.

            allowWhenLocked |= win.canShowWhenLocked()

                    // Show error dialogs over apps that are shown on lockscreen

                    || (attrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0;

        }



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

    }



    /** {@inheritDoc} */

    @Override

    public StartingSurface addSplashScreen(IBinder appToken, String packageName, int theme,
@@ -3440,18 +3396,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mNavBarVirtualKeyHapticFeedbackEnabled = enabled;

    }



    /** {@inheritDoc} */

    @Override

    public void applyKeyguardPolicyLw(WindowState win, WindowState imeTarget) {

        if (canBeHiddenByKeyguardLw(win)) {

            if (shouldBeHiddenByKeyguard(win, imeTarget)) {

                win.hideLw(false /* doAnimation */);

            } else {

                win.showLw(false /* doAnimation */);

            }

        }

    }



    /** {@inheritDoc} */

    @Override

    public void setKeyguardCandidateLw(WindowState win) {
@@ -5636,15 +5580,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    @Override

    public boolean setAodShowing(boolean aodShowing) {

        if (mAodShowing != aodShowing) {

            mAodShowing = aodShowing;

            return true;

        }

        return false;

    }



    private class HdmiVideoExtconUEventObserver extends ExtconStateObserver<Boolean> {

        private static final String HDMI_EXIST = "HDMI=1";

        private static final String NAME = "hdmi";

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

+0 −36
Original line number Diff line number Diff line
@@ -219,32 +219,11 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
         */

        boolean isAnimatingLw();



        /**

         * Can be called by the policy to force a window to be hidden,

         * regardless of whether the client or window manager would like

         * it shown.  Must be called with the window manager lock held.

         * Returns true if {@link #showLw} was last called for the window.

         */

        public boolean hideLw(boolean doAnimation);



        /**

         * Can be called to undo the effect of {@link #hideLw}, allowing a

         * window to be shown as long as the window manager and client would

         * also like it to be shown.  Must be called with the window manager

         * lock held.

         * Returns true if {@link #hideLw} was last called for the window.

         */

        public boolean showLw(boolean doAnimation);



        /**

         * Check whether the window is currently dimming.

         */

        public boolean isDimming();



        public boolean isInputMethodWindow();



        public int getDisplayId();



        /**

         * Returns true if the window owner can add internal system windows.

         * That is, they have {@link Manifest.permission#INTERNAL_SYSTEM_WINDOW}.
@@ -787,14 +766,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
     */

    void setTopFocusedDisplay(int displayId);



    /**

     * Apply the keyguard policy to a specific window.

     *

     * @param win The window to apply the keyguard policy.

     * @param imeTarget The current IME target window.

     */

    void applyKeyguardPolicyLw(WindowState win, WindowState imeTarget);



    /**

     * Called when the state of allow-lockscreen-when-on of the display is changed. See

     * {@link WindowManager.LayoutParams#FLAG_ALLOW_LOCK_WHILE_SCREEN_ON}
@@ -1210,11 +1181,4 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
     * A new window on default display has been focused.

     */

    default void onDefaultDisplayFocusChangedLw(WindowState newFocus) {}



    /**

     * Updates the flag about whether AOD is showing.

     *

     * @return whether the value was changed.

     */

    boolean setAodShowing(boolean aodShowing);

}

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

+50 −1
Original line number Diff line number Diff line
@@ -2219,7 +2219,7 @@ public class DisplayPolicy { 
            WindowState attached, WindowState imeTarget) {

        final boolean affectsSystemUi = win.canAffectSystemUiFlags();

        if (DEBUG_LAYOUT) Slog.i(TAG, "Win " + win + ": affectsSystemUi=" + affectsSystemUi);

        mService.mPolicy.applyKeyguardPolicyLw(win, imeTarget);

        applyKeyguardPolicy(win, imeTarget);

        final int fl = attrs.flags;

        if (mTopFullscreenOpaqueWindowState == null && affectsSystemUi

                && attrs.type == TYPE_INPUT_METHOD) {
@@ -2386,6 +2386,55 @@ public class DisplayPolicy { 
        return changes;

    }



    /**

     * Applies the keyguard policy to a specific window.

     *

     * @param win The window to apply the keyguard policy.

     * @param imeTarget The current IME target window.

     */

    private void applyKeyguardPolicy(WindowState win, WindowState imeTarget) {

        if (mService.mPolicy.canBeHiddenByKeyguardLw(win)) {

            if (shouldBeHiddenByKeyguard(win, imeTarget)) {

                win.hide(false /* doAnimation */, true /* requestAnim */);

            } else {

                win.show(false /* doAnimation */, true /* requestAnim */);

            }

        }

    }



    private boolean shouldBeHiddenByKeyguard(WindowState win, WindowState imeTarget) {

        // 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.mIsImWindow

                && (mService.mAtmService.mKeyguardController.isAodShowing()

                        || (mDisplayContent.isDefaultDisplay && !mWindowManagerDrawComplete));

        if (hideIme) {

            return true;

        }



        if (!mDisplayContent.isDefaultDisplay || !isKeyguardShowing()) {

            return false;

        }



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

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

                && win.mIsImWindow && (imeTarget.canShowWhenLocked()

                        || !mService.mPolicy.canBeHiddenByKeyguardLw(imeTarget));

        if (showImeOverKeyguard) {

            return false;

        }



        // Show SHOW_WHEN_LOCKED windows if keyguard is occluded.

        final boolean allowShowWhenLocked = isKeyguardOccluded()

                // Show error dialogs over apps that are shown on keyguard.

                && (win.canShowWhenLocked()

                        || (win.mAttrs.privateFlags & LayoutParams.PRIVATE_FLAG_SYSTEM_ERROR) != 0);

        return !allowShowWhenLocked;

    }



    /**

     * @return Whether the top app should hide the statusbar based on the top fullscreen opaque

     *         window.

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

+8 −1
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ class KeyguardController { 
        mRootWindowContainer = mService.mRootWindowContainer;

    }



    boolean isAodShowing() {

        return mAodShowing;

    }



    /**

     * @return true if either Keyguard or AOD are showing, not going away, and not being occluded

     *         on the given display, false otherwise.
@@ -163,7 +167,10 @@ class KeyguardController { 
                "setKeyguardShown");

        mKeyguardShowing = keyguardShowing;

        mAodShowing = aodShowing;

        mWindowManager.setAodShowing(aodShowing);

        if (aodChanged) {

            // Ensure the new state takes effect.

            mWindowManager.mWindowPlacerLocked.performSurfacePlacement();

        }



        if (keyguardChanged) {

            // Irrelevant to AOD.

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

+0 −3
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ public abstract class WindowManagerInternal { 
    public abstract void setOnHardKeyboardStatusChangeListener(

        OnHardKeyboardStatusChangeListener listener);



    /** Returns true if a stack in the windowing mode is currently visible. */

    public abstract boolean isStackVisibleLw(int windowingMode);



    /**

     * Requests the window manager to resend the windows for accessibility on specified display.

     *