Merge "Use consistent animation when forcibly hiding non system overlay" into tm-dev (f55024c8) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -3334,6 +3334,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

+5 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,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;

		@@ -623,6 +624,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: