Merge "Convert ResizeVeil.java file to kotlin" into main (579984ec) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java

deleted100644 → 0

+0 −451

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.windowdecor;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.annotation.ColorRes;
		import android.annotation.NonNull;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.graphics.PixelFormat;
		import android.graphics.PointF;
		import android.graphics.Rect;
		import android.os.Trace;
		import android.view.Display;
		import android.view.LayoutInflater;
		import android.view.SurfaceControl;
		import android.view.SurfaceControlViewHost;
		import android.view.SurfaceSession;
		import android.view.View;
		import android.view.WindowManager;
		import android.view.WindowlessWindowManager;
		import android.widget.ImageView;
		import android.window.TaskConstants;

		import com.android.wm.shell.R;
		import com.android.wm.shell.common.DisplayController;

		import java.util.function.Supplier;

		/**
		* Creates and updates a veil that covers task contents on resize.
		*/
		public class ResizeVeil {
		private static final String TAG = "ResizeVeil";
		private static final int RESIZE_ALPHA_DURATION = 100;

		private static final int VEIL_CONTAINER_LAYER = TaskConstants.TASK_CHILD_LAYER_RESIZE_VEIL;
		/** The background is a child of the veil container layer and goes at the bottom. */
		private static final int VEIL_BACKGROUND_LAYER = 0;
		/** The icon is a child of the veil container layer and goes in front of the background. */
		private static final int VEIL_ICON_LAYER = 1;

		private final Context mContext;
		private final DisplayController mDisplayController;
		private final Supplier<SurfaceControl.Transaction> mSurfaceControlTransactionSupplier;
		private final SurfaceControlBuilderFactory mSurfaceControlBuilderFactory;
		private final WindowDecoration.SurfaceControlViewHostFactory mSurfaceControlViewHostFactory;
		private final SurfaceSession mSurfaceSession = new SurfaceSession();
		private final Bitmap mAppIcon;
		private ImageView mIconView;
		private int mIconSize;
		private SurfaceControl mParentSurface;

		/** A container surface to host the veil background and icon child surfaces. */
		private SurfaceControl mVeilSurface;
		/** A color surface for the veil background. */
		private SurfaceControl mBackgroundSurface;
		/** A surface that hosts a windowless window with the app icon. */
		private SurfaceControl mIconSurface;

		private final RunningTaskInfo mTaskInfo;
		private SurfaceControlViewHost mViewHost;
		private Display mDisplay;
		private ValueAnimator mVeilAnimator;

		private boolean mIsShowing = false;

		private final DisplayController.OnDisplaysChangedListener mOnDisplaysChangedListener =
		new DisplayController.OnDisplaysChangedListener() {
		@Override
		public void onDisplayAdded(int displayId) {
		if (mTaskInfo.displayId != displayId) {
		return;
		}
		mDisplayController.removeDisplayWindowListener(this);
		setupResizeVeil();
		}
		};

		public ResizeVeil(Context context,
		@NonNull DisplayController displayController,
		Bitmap appIcon, RunningTaskInfo taskInfo,
		SurfaceControl taskSurface,
		Supplier<SurfaceControl.Transaction> surfaceControlTransactionSupplier) {
		this(context,
		displayController,
		appIcon,
		taskInfo,
		taskSurface,
		surfaceControlTransactionSupplier,
		new SurfaceControlBuilderFactory() {},
		new WindowDecoration.SurfaceControlViewHostFactory() {});
		}

		public ResizeVeil(Context context,
		@NonNull DisplayController displayController,
		Bitmap appIcon, RunningTaskInfo taskInfo,
		SurfaceControl taskSurface,
		Supplier<SurfaceControl.Transaction> surfaceControlTransactionSupplier,
		SurfaceControlBuilderFactory surfaceControlBuilderFactory,
		WindowDecoration.SurfaceControlViewHostFactory surfaceControlViewHostFactory) {
		mContext = context;
		mDisplayController = displayController;
		mAppIcon = appIcon;
		mSurfaceControlTransactionSupplier = surfaceControlTransactionSupplier;
		mTaskInfo = taskInfo;
		mParentSurface = taskSurface;
		mSurfaceControlBuilderFactory = surfaceControlBuilderFactory;
		mSurfaceControlViewHostFactory = surfaceControlViewHostFactory;
		setupResizeVeil();
		}
		/**
		* Create the veil in its default invisible state.
		*/
		private void setupResizeVeil() {
		if (!obtainDisplayOrRegisterListener()) {
		// Display may not be available yet, skip this until then.
		return;
		}
		Trace.beginSection("ResizeVeil#setupResizeVeil");
		mVeilSurface = mSurfaceControlBuilderFactory
		.create("Resize veil of Task=" + mTaskInfo.taskId)
		.setContainerLayer()
		.setHidden(true)
		.setParent(mParentSurface)
		.setCallsite("ResizeVeil#setupResizeVeil")
		.build();
		mBackgroundSurface = mSurfaceControlBuilderFactory
		.create("Resize veil background of Task=" + mTaskInfo.taskId, mSurfaceSession)
		.setColorLayer()
		.setHidden(true)
		.setParent(mVeilSurface)
		.setCallsite("ResizeVeil#setupResizeVeil")
		.build();
		mIconSurface = mSurfaceControlBuilderFactory
		.create("Resize veil icon of Task=" + mTaskInfo.taskId)
		.setContainerLayer()
		.setHidden(true)
		.setParent(mVeilSurface)
		.setCallsite("ResizeVeil#setupResizeVeil")
		.build();

		mIconSize = mContext.getResources()
		.getDimensionPixelSize(R.dimen.desktop_mode_resize_veil_icon_size);
		final View root = LayoutInflater.from(mContext)
		.inflate(R.layout.desktop_mode_resize_veil, null /* root */);
		mIconView = root.findViewById(R.id.veil_application_icon);
		mIconView.setImageBitmap(mAppIcon);

		final WindowManager.LayoutParams lp =
		new WindowManager.LayoutParams(
		mIconSize,
		mIconSize,
		WindowManager.LayoutParams.TYPE_APPLICATION,
		WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
		PixelFormat.TRANSPARENT);
		lp.setTitle("Resize veil icon window of Task=" + mTaskInfo.taskId);
		lp.setTrustedOverlay();

		final WindowlessWindowManager wwm = new WindowlessWindowManager(mTaskInfo.configuration,
		mIconSurface, null /* hostInputToken */);

		mViewHost = mSurfaceControlViewHostFactory.create(mContext, mDisplay, wwm, "ResizeVeil");
		mViewHost.setView(root, lp);
		Trace.endSection();
		}

		private boolean obtainDisplayOrRegisterListener() {
		mDisplay = mDisplayController.getDisplay(mTaskInfo.displayId);
		if (mDisplay == null) {
		mDisplayController.addDisplayWindowListener(mOnDisplaysChangedListener);
		return false;
		}
		return true;
		}

		/**
		* Shows the veil surface/view.
		*
		* @param t the transaction to apply in sync with the veil draw
		* @param parentSurface the surface that the veil should be a child of
		* @param taskBounds the bounds of the task that owns the veil
		* @param fadeIn if true, the veil will fade-in with an animation, if false, it will be shown
		* immediately
		*/
		public void showVeil(SurfaceControl.Transaction t, SurfaceControl parentSurface,
		Rect taskBounds, boolean fadeIn) {
		if (!isReady() \|\| isVisible()) {
		t.apply();
		return;
		}
		mIsShowing = true;

		// Parent surface can change, ensure it is up to date.
		if (!parentSurface.equals(mParentSurface)) {
		t.reparent(mVeilSurface, parentSurface);
		mParentSurface = parentSurface;
		}

		t.show(mVeilSurface);
		t.setLayer(mVeilSurface, VEIL_CONTAINER_LAYER);
		t.setLayer(mIconSurface, VEIL_ICON_LAYER);
		t.setLayer(mBackgroundSurface, VEIL_BACKGROUND_LAYER);
		t.setColor(mBackgroundSurface,
		Color.valueOf(mContext.getColor(getBackgroundColorId())).getComponents());

		relayout(taskBounds, t);
		if (fadeIn) {
		cancelAnimation();
		final SurfaceControl.Transaction veilAnimT = mSurfaceControlTransactionSupplier.get();
		mVeilAnimator = new ValueAnimator();
		mVeilAnimator.setFloatValues(0f, 1f);
		mVeilAnimator.setDuration(RESIZE_ALPHA_DURATION);
		mVeilAnimator.addUpdateListener(animation -> {
		veilAnimT.setAlpha(mBackgroundSurface, mVeilAnimator.getAnimatedFraction());
		veilAnimT.apply();
		});
		mVeilAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		veilAnimT.show(mBackgroundSurface)
		.setAlpha(mBackgroundSurface, 0)
		.apply();
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		veilAnimT.setAlpha(mBackgroundSurface, 1).apply();
		}
		});

		final SurfaceControl.Transaction iconAnimT = mSurfaceControlTransactionSupplier.get();
		final ValueAnimator iconAnimator = new ValueAnimator();
		iconAnimator.setFloatValues(0f, 1f);
		iconAnimator.setDuration(RESIZE_ALPHA_DURATION);
		iconAnimator.addUpdateListener(animation -> {
		iconAnimT.setAlpha(mIconSurface, animation.getAnimatedFraction());
		iconAnimT.apply();
		});
		iconAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		iconAnimT.show(mIconSurface)
		.setAlpha(mIconSurface, 0)
		.apply();
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		iconAnimT.setAlpha(mIconSurface, 1).apply();
		}
		});
		// Let the animators show it with the correct alpha value once the animation starts.
		t.hide(mIconSurface);
		t.hide(mBackgroundSurface);
		t.apply();

		mVeilAnimator.start();
		iconAnimator.start();
		} else {
		// Show the veil immediately.
		t.show(mIconSurface);
		t.show(mBackgroundSurface);
		t.setAlpha(mIconSurface, 1);
		t.setAlpha(mBackgroundSurface, 1);
		t.apply();
		}
		}

		/**
		* Animate veil's alpha to 1, fading it in.
		*/
		public void showVeil(SurfaceControl parentSurface, Rect taskBounds) {
		if (!isReady() \|\| isVisible()) {
		return;
		}
		SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();
		showVeil(t, parentSurface, taskBounds, true /* fadeIn */);
		}

		/**
		* Update veil bounds to match bounds changes.
		* @param newBounds bounds to update veil to.
		*/
		private void relayout(Rect newBounds, SurfaceControl.Transaction t) {
		t.setWindowCrop(mVeilSurface, newBounds.width(), newBounds.height());
		final PointF iconPosition = calculateAppIconPosition(newBounds);
		t.setPosition(mIconSurface, iconPosition.x, iconPosition.y);
		t.setPosition(mParentSurface, newBounds.left, newBounds.top);
		t.setWindowCrop(mParentSurface, newBounds.width(), newBounds.height());
		}

		/**
		* Calls relayout to update task and veil bounds.
		* @param newBounds bounds to update veil to.
		*/
		public void updateResizeVeil(Rect newBounds) {
		if (!isVisible()) {
		return;
		}
		SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();
		updateResizeVeil(t, newBounds);
		}

		/**
		* Calls relayout to update task and veil bounds.
		* Finishes veil fade in if animation is currently running; this is to prevent empty space
		* being visible behind the transparent veil during a fast resize.
		*
		* @param t a transaction to be applied in sync with the veil draw.
		* @param newBounds bounds to update veil to.
		*/
		public void updateResizeVeil(SurfaceControl.Transaction t, Rect newBounds) {
		if (!isVisible()) {
		t.apply();
		return;
		}
		if (mVeilAnimator != null && mVeilAnimator.isStarted()) {
		mVeilAnimator.removeAllUpdateListeners();
		mVeilAnimator.end();
		}
		relayout(newBounds, t);
		t.apply();
		}

		/**
		* Animate veil's alpha to 0, fading it out.
		*/
		public void hideVeil() {
		if (!isVisible()) {
		return;
		}
		cancelAnimation();
		mVeilAnimator = new ValueAnimator();
		mVeilAnimator.setFloatValues(1, 0);
		mVeilAnimator.setDuration(RESIZE_ALPHA_DURATION);
		mVeilAnimator.addUpdateListener(animation -> {
		SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();
		t.setAlpha(mBackgroundSurface, 1 - mVeilAnimator.getAnimatedFraction());
		t.setAlpha(mIconSurface, 1 - mVeilAnimator.getAnimatedFraction());
		t.apply();
		});
		mVeilAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();
		t.hide(mBackgroundSurface);
		t.hide(mIconSurface);
		t.apply();
		}
		});
		mVeilAnimator.start();
		mIsShowing = false;
		}

		@ColorRes
		private int getBackgroundColorId() {
		Configuration configuration = mContext.getResources().getConfiguration();
		if ((configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
		== Configuration.UI_MODE_NIGHT_YES) {
		return R.color.desktop_mode_resize_veil_dark;
		} else {
		return R.color.desktop_mode_resize_veil_light;
		}
		}

		private PointF calculateAppIconPosition(Rect parentBounds) {
		return new PointF((float) parentBounds.width() / 2 - (float) mIconSize / 2,
		(float) parentBounds.height() / 2 - (float) mIconSize / 2);
		}

		private void cancelAnimation() {
		if (mVeilAnimator != null) {
		mVeilAnimator.removeAllUpdateListeners();
		mVeilAnimator.cancel();
		}
		}

		/**
		* Whether the resize veil is currently visible.
		*
		* Note: when animating a {@link ResizeVeil#hideVeil()}, the veil is considered visible as soon
		* as the animation starts.
		*/
		private boolean isVisible() {
		return mIsShowing;
		}

		/** Whether the resize veil is ready to be shown. */
		private boolean isReady() {
		return mViewHost != null;
		}

		/**
		* Dispose of veil when it is no longer needed, likely on close of its container decor.
		*/
		void dispose() {
		cancelAnimation();
		mIsShowing = false;
		mVeilAnimator = null;

		if (mViewHost != null) {
		mViewHost.release();
		mViewHost = null;
		}
		final SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();
		if (mBackgroundSurface != null) {
		t.remove(mBackgroundSurface);
		mBackgroundSurface = null;
		}
		if (mIconSurface != null) {
		t.remove(mIconSurface);
		mIconSurface = null;
		}
		if (mVeilSurface != null) {
		t.remove(mVeilSurface);
		mVeilSurface = null;
		}
		t.apply();
		mDisplayController.removeDisplayWindowListener(mOnDisplaysChangedListener);
		}

		interface SurfaceControlBuilderFactory {
		default SurfaceControl.Builder create(@NonNull String name) {
		return new SurfaceControl.Builder().setName(name);
		}
		default SurfaceControl.Builder create(@NonNull String name,
		@NonNull SurfaceSession surfaceSession) {
		return new SurfaceControl.Builder(surfaceSession).setName(name);
		}
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt

0 → 100644

+417 −0

File added.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import android.window.TaskConstants;
		import android.window.WindowContainerToken;
		import android.window.WindowContainerTransaction;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.common.DisplayController;
		import com.android.wm.shell.shared.DesktopModeStatus;
		@@ -687,7 +688,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
		}
		}

		interface SurfaceControlViewHostFactory {
		@VisibleForTesting
		public interface SurfaceControlViewHostFactory {
		default SurfaceControlViewHost create(Context c, Display d, WindowlessWindowManager wmm) {
		return new SurfaceControlViewHost(c, d, wmm, "WindowDecoration");
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/ResizeVeilTest.kt

+28 −22

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentCaptor
		import org.mockito.ArgumentMatchers.anyFloat
		import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.Mock
		import org.mockito.Spy
		import org.mockito.kotlin.any
		@@ -102,6 +104,14 @@ class ResizeVeilTest : ShellTestCase() {
		.create("Resize veil icon of Task=" + taskInfo.taskId))
		.thenReturn(spyIconSurfaceBuilder)
		doReturn(mockIconSurface).whenever(spyIconSurfaceBuilder).build()

		doReturn(mockTransaction).whenever(mockTransaction).setLayer(any(), anyInt())
		doReturn(mockTransaction).whenever(mockTransaction).setAlpha(any(), anyFloat())
		doReturn(mockTransaction).whenever(mockTransaction).show(any())
		doReturn(mockTransaction).whenever(mockTransaction).hide(any())
		doReturn(mockTransaction).whenever(mockTransaction)
		.setPosition(any(), anyFloat(), anyFloat())
		doReturn(mockTransaction).whenever(mockTransaction).setWindowCrop(any(), anyInt(), anyInt())
		}

		@Test
		@@ -139,52 +149,48 @@ class ResizeVeilTest : ShellTestCase() {
		@Test
		fun showVeil() {
		val veil = createResizeVeil()
		val tx = mock<SurfaceControl.Transaction>()

		veil.showVeil(tx, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)

		verify(tx).show(mockResizeVeilSurface)
		verify(tx).show(mockBackgroundSurface)
		verify(tx).show(mockIconSurface)
		verify(tx).apply()
		verify(mockTransaction).show(mockResizeVeilSurface)
		verify(mockTransaction).show(mockBackgroundSurface)
		verify(mockTransaction).show(mockIconSurface)
		verify(mockTransaction).apply()
		}

		@Test
		fun showVeil_displayUnavailable_doesNotShow() {
		val veil = createResizeVeil(withDisplayAvailable = false)
		val tx = mock<SurfaceControl.Transaction>()

		veil.showVeil(tx, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)

		verify(tx, never()).show(mockResizeVeilSurface)
		verify(tx, never()).show(mockBackgroundSurface)
		verify(tx, never()).show(mockIconSurface)
		verify(tx).apply()
		verify(mockTransaction, never()).show(mockResizeVeilSurface)
		verify(mockTransaction, never()).show(mockBackgroundSurface)
		verify(mockTransaction, never()).show(mockIconSurface)
		verify(mockTransaction).apply()
		}

		@Test
		fun showVeil_alreadyVisible_doesNotShowAgain() {
		val veil = createResizeVeil()
		val tx = mock<SurfaceControl.Transaction>()

		veil.showVeil(tx, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(tx, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)

		verify(tx, times(1)).show(mockResizeVeilSurface)
		verify(tx, times(1)).show(mockBackgroundSurface)
		verify(tx, times(1)).show(mockIconSurface)
		verify(tx, times(2)).apply()
		verify(mockTransaction, times(1)).show(mockResizeVeilSurface)
		verify(mockTransaction, times(1)).show(mockBackgroundSurface)
		verify(mockTransaction, times(1)).show(mockIconSurface)
		verify(mockTransaction, times(2)).apply()
		}

		@Test
		fun showVeil_reparentsVeilToNewParent() {
		val veil = createResizeVeil(parent = mock())
		val tx = mock<SurfaceControl.Transaction>()

		val newParent = mock<SurfaceControl>()
		veil.showVeil(tx, newParent, Rect(0, 0, 100, 100), false /* fadeIn */)
		veil.showVeil(mockTransaction, newParent, Rect(0, 0, 100, 100), false /* fadeIn */)

		verify(tx).reparent(mockResizeVeilSurface, newParent)
		verify(mockTransaction).reparent(mockResizeVeilSurface, newParent)
		}

		@Test