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

Commit 2e85ab87 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use consistent animation when forcibly hiding non system overlay" into... 

Merge "Use consistent animation when forcibly hiding non system overlay" into security-aosp-25Q2-staging
parents 89cddb55 74eb0ec6

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

+4 −0
Original line number Diff line number Diff line
@@ -2997,6 +2997,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        return true;

    }



    boolean isForceHiddenNonSystemOverlayWindow() {

        return mForceHideNonSystemOverlayWindow;

    }



    void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {

        final int baseType = getBaseType();

        if (mSession.mCanAddInternalSystemWindow

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

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.view.Surface.OutOfResourcesException; 
import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.animation.AlphaAnimation;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;
@@ -545,6 +546,10 @@ class WindowStateAnimator { 
                    a = AnimationUtils.loadAnimation(mContext, anim);

                    Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                }

            } else if (!isEntrance && mWin.isForceHiddenNonSystemOverlayWindow()) {

                a = new AlphaAnimation(1f, 0f);

                a.setDuration(mContext.getResources().getInteger(

                        com.android.internal.R.integer.config_shortAnimTime));

            } else {

                switch (transit) {

                    case WindowManagerPolicy.TRANSIT_ENTER: