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

Commit 66877c82 authored by Chris Li's avatar Chris Li
Browse files

Migrate WindowContext#onConfigurationChanged to ClientTransaction (3/n) 

Update the ImmersiveModeConfirmation: when needs to show in a different
DisplayArea, dismiss the existing WindowContext instead of updating the
options.

Bug: 277290737
Test: manually verify the confirmation is shown/dismissed as normal
Change-Id: I3647053c3da33d81f6b2a69cce1ab32346828cb3
Merged-In: I3647053c3da33d81f6b2a69cce1ab32346828cb3
parent e1663611

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

+37 −31
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.window.DisplayAreaOrganizer.KEY_ROOT_DISPLAY_AREA_ID; 


import android.animation.ArgbEvaluator;

import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityThread;
@@ -40,7 +41,6 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Looper;

import android.os.Message;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;
@@ -48,7 +48,6 @@ import android.util.DisplayMetrics; 
import android.util.Slog;

import android.view.Display;

import android.view.Gravity;

import android.view.IWindowManager;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;
@@ -56,7 +55,6 @@ import android.view.ViewTreeObserver; 
import android.view.WindowInsets;

import android.view.WindowInsets.Type;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import android.widget.Button;
@@ -95,6 +93,10 @@ public class ImmersiveModeConfirmation { 
     */

    @Nullable

    private Context mWindowContext;

    /**

     * The root display area feature id that the {@link #mWindowContext} is attaching to.

     */

    private int mWindowContextRootDisplayAreaId = FEATURE_UNDEFINED;

    // Local copy of vr mode enabled state, to avoid calling into VrManager with

    // the lock held.

    private boolean mVrModeEnabled;
@@ -206,12 +208,15 @@ public class ImmersiveModeConfirmation { 
    private void handleHide() {

        if (mClingWindow != null) {

            if (DEBUG) Slog.d(TAG, "Hiding immersive mode confirmation");

            // We don't care which root display area the window manager is specifying for removal.

            if (mWindowManager != null) {

                try {

                getWindowManager(FEATURE_UNDEFINED).removeView(mClingWindow);

                    mWindowManager.removeView(mClingWindow);

                } catch (WindowManager.InvalidDisplayException e) {

                Slog.w(TAG, "Fail to hide the immersive confirmation window because of " + e);

                return;

                    Slog.w(TAG, "Fail to hide the immersive confirmation window because of "

                            + e);

                }

                mWindowManager = null;

                mWindowContext = null;

            }

            mClingWindow = null;

        }
@@ -394,29 +399,21 @@ public class ImmersiveModeConfirmation { 
     * @return the WindowManager specifying with the {@code rootDisplayAreaId} to attach the

     *         confirmation window.

     */

    private WindowManager getWindowManager(int rootDisplayAreaId) {

        if (mWindowManager == null || mWindowContext == null) {

    @NonNull

    private WindowManager createWindowManager(int rootDisplayAreaId) {

        if (mWindowManager != null) {

            throw new IllegalStateException(

                    "Must not create a new WindowManager while there is an existing one");

        }

        // Create window context to specify the RootDisplayArea

        final Bundle options = getOptionsForWindowContext(rootDisplayAreaId);

        mWindowContextRootDisplayAreaId = rootDisplayAreaId;

        mWindowContext = mContext.createWindowContext(

                IMMERSIVE_MODE_CONFIRMATION_WINDOW_TYPE, options);

        mWindowManager = mWindowContext.getSystemService(WindowManager.class);

        return mWindowManager;

    }



        // Update the window context and window manager to specify the RootDisplayArea

        final Bundle options = getOptionsForWindowContext(rootDisplayAreaId);

        final IWindowManager wms = WindowManagerGlobal.getWindowManagerService();

        try {

            wms.attachWindowContextToDisplayArea(mWindowContext.getWindowContextToken(),

                    IMMERSIVE_MODE_CONFIRMATION_WINDOW_TYPE, mContext.getDisplayId(), options);

        }  catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();

        }



        return mWindowManager;

    }



    /**

     * Returns options that specify the {@link RootDisplayArea} to attach the confirmation window.

     *         {@code null} if the {@code rootDisplayAreaId} is {@link FEATURE_UNDEFINED}.
@@ -434,14 +431,23 @@ public class ImmersiveModeConfirmation { 
    }



    private void handleShow(int rootDisplayAreaId) {

        if (DEBUG) Slog.d(TAG, "Showing immersive mode confirmation");

        if (mClingWindow != null) {

            if (rootDisplayAreaId == mWindowContextRootDisplayAreaId) {

                if (DEBUG) Slog.d(TAG, "Immersive mode confirmation has already been shown");

                return;

            } else {

                // Hide the existing confirmation before show a new one in the new root.

                if (DEBUG) Slog.d(TAG, "Immersive mode confirmation was shown in a different root");

                handleHide();

            }

        }



        if (DEBUG) Slog.d(TAG, "Showing immersive mode confirmation");

        mClingWindow = new ClingWindowView(mContext, mConfirm);



        // show the confirmation

        WindowManager.LayoutParams lp = getClingWindowLayoutParams();

        final WindowManager.LayoutParams lp = getClingWindowLayoutParams();

        try {

            getWindowManager(rootDisplayAreaId).addView(mClingWindow, lp);

            createWindowManager(rootDisplayAreaId).addView(mClingWindow, lp);

        } catch (WindowManager.InvalidDisplayException e) {

            Slog.w(TAG, "Fail to show the immersive confirmation window because of " + e);

        }