Merge "Merge bubble transition with unfold" into main (93f468ec) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+28 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ import android.view.WindowInsets;
	import android.view.WindowManager;		import android.view.WindowManager;
	import android.window.ScreenCapture;		import android.window.ScreenCapture;
	import android.window.ScreenCapture.SynchronousScreenCaptureListener;		import android.window.ScreenCapture.SynchronousScreenCaptureListener;
			import android.window.TransitionInfo;
	import android.window.WindowContainerToken;		import android.window.WindowContainerToken;
	import android.window.WindowContainerTransaction;		import android.window.WindowContainerTransaction;

	@@ -156,7 +157,7 @@ import java.util.function.IntConsumer;
	*/		*/
	public class BubbleController implements ConfigurationChangeListener,		public class BubbleController implements ConfigurationChangeListener,
	RemoteCallable<BubbleController>, Bubbles.SysuiProxy.Provider,		RemoteCallable<BubbleController>, Bubbles.SysuiProxy.Provider,
	BubbleBarDragListener {		BubbleBarDragListener, BubbleTaskUnfoldTransitionMerger {

	private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;		private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES;

	@@ -2175,6 +2176,32 @@ public class BubbleController implements ConfigurationChangeListener,
	});		});
	}		}

			@Override
			public boolean mergeTaskWithUnfold(@NonNull ActivityManager.RunningTaskInfo taskInfo,
			@NonNull TransitionInfo.Change change,
			@NonNull SurfaceControl.Transaction startT,
			@NonNull SurfaceControl.Transaction finishT) {
			if (!mBubbleTransitions.mTaskViewTransitions.isTaskViewTask(taskInfo)) {
			// if this task isn't managed by bubble transitions just bail.
			return false;
			}
			if (isShowingAsBubbleBar()) {
			// if bubble bar is enabled, the task view will switch to a new surface on unfold, so we
			// should not merge the transition.
			return false;
			}

			boolean merged = mBubbleTransitions.mTaskViewTransitions.updateBoundsForUnfold(
			change.getEndAbsBounds(), startT, finishT, change.getTaskInfo(), change.getLeash());
			if (merged) {
			BubbleViewProvider selectedBubble = mBubbleData.getSelectedBubble();
			if (selectedBubble != null && selectedBubble.getExpandedView() != null) {
			selectedBubble.getExpandedView().onContainerClipUpdate();
			}
			}
			return merged;
			}

	/** When bubbles are floating, this will be used to notify the floating views. */		/** When bubbles are floating, this will be used to notify the floating views. */
	private final BubbleViewCallback mBubbleStackViewCallback = new BubbleViewCallback() {		private final BubbleViewCallback mBubbleStackViewCallback = new BubbleViewCallback() {
	@Override		@Override

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -843,7 +843,8 @@ public class BubbleExpandedView extends LinearLayout {
	onContainerClipUpdate();		onContainerClipUpdate();
	}		}

	private void onContainerClipUpdate() {		/** Updates the clip bounds. */
			public void onContainerClipUpdate() {
	if (mTopClip == 0 && mBottomClip == 0 && mRightClip == 0 && mLeftClip == 0) {		if (mTopClip == 0 && mBottomClip == 0 && mRightClip == 0 && mLeftClip == 0) {
	if (mIsClipping) {		if (mIsClipping) {
	mIsClipping = false;		mIsClipping = false;

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskUnfoldTransitionMerger.kt

0 → 100644

+33 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2025 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.bubbles

			import android.app.ActivityManager
			import android.view.SurfaceControl
			import android.window.TransitionInfo

			/** Merges a bubble task transition with the unfold transition. */
			interface BubbleTaskUnfoldTransitionMerger {

			/** Attempts to merge the transition. Returns `true` if the change was merged. */
			fun mergeTaskWithUnfold(
			taskInfo: ActivityManager.RunningTaskInfo,
			change: TransitionInfo.Change,
			startT: SurfaceControl.Transaction,
			finishT: SurfaceControl.Transaction
			): Boolean
			}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,7 @@ import com.android.wm.shell.bubbles.BubbleEducationController;
	import com.android.wm.shell.bubbles.BubbleLogger;		import com.android.wm.shell.bubbles.BubbleLogger;
	import com.android.wm.shell.bubbles.BubblePositioner;		import com.android.wm.shell.bubbles.BubblePositioner;
	import com.android.wm.shell.bubbles.BubbleResizabilityChecker;		import com.android.wm.shell.bubbles.BubbleResizabilityChecker;
			import com.android.wm.shell.bubbles.BubbleTaskUnfoldTransitionMerger;
	import com.android.wm.shell.bubbles.bar.BubbleBarDragListener;		import com.android.wm.shell.bubbles.bar.BubbleBarDragListener;
	import com.android.wm.shell.bubbles.storage.BubblePersistentRepository;		import com.android.wm.shell.bubbles.storage.BubblePersistentRepository;
	import com.android.wm.shell.common.DisplayController;		import com.android.wm.shell.common.DisplayController;
	@@ -244,6 +245,13 @@ public abstract class WMShellModule {
	context, logger, positioner, educationController, mainExecutor, bgExecutor);		context, logger, positioner, educationController, mainExecutor, bgExecutor);
	}		}

			@WMSingleton
			@Provides
			static Optional<BubbleTaskUnfoldTransitionMerger> provideBubbleTaskUnfoldTransitionMerger(
			Optional<BubbleController> bubbleController) {
			return bubbleController.map(controller -> controller);
			}

	// Note: Handler needed for LauncherApps.register		// Note: Handler needed for LauncherApps.register
	@WMSingleton		@WMSingleton
	@Provides		@Provides
	@@ -705,7 +713,8 @@ public abstract class WMShellModule {
	Transitions transitions,		Transitions transitions,
	@ShellMainThread ShellExecutor executor,		@ShellMainThread ShellExecutor executor,
	@ShellMainThread Handler handler,		@ShellMainThread Handler handler,
	ShellInit shellInit) {		ShellInit shellInit,
			Optional<BubbleTaskUnfoldTransitionMerger> bubbleTaskUnfoldTransitionMerger) {
	return new UnfoldTransitionHandler(		return new UnfoldTransitionHandler(
	shellInit,		shellInit,
	progressProvider.get(),		progressProvider.get(),
	@@ -714,7 +723,8 @@ public abstract class WMShellModule {
	transactionPool,		transactionPool,
	executor,		executor,
	handler,		handler,
	transitions);		transitions,
			bubbleTaskUnfoldTransitionMerger);
	}		}

	@WMSingleton		@WMSingleton

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java

+42 −0

Original line number	Original line	Diff line number	Diff line
	@@ -728,6 +728,48 @@ public class TaskViewTransitions implements Transitions.TransitionHandler, TaskV
	taskView.notifyAppeared(newTask);		taskView.notifyAppeared(newTask);
	}		}

			/**
			* Updates bounds for the task view during an unfold transition.
			*
			* @return true if the task was found and a transition for this task is pending. false
			* otherwise.
			*/
			public boolean updateBoundsForUnfold(Rect bounds, SurfaceControl.Transaction startTransaction,
			SurfaceControl.Transaction finishTransaction,
			ActivityManager.RunningTaskInfo taskInfo, SurfaceControl leash) {
			final TaskViewTaskController taskView = findTaskView(taskInfo);
			if (taskView == null) {
			return false;
			}

			final PendingTransition pendingTransition = findPending(taskView, TRANSIT_CHANGE);
			if (pendingTransition == null) {
			return false;
			}

			mPending.remove(pendingTransition);

			// reparent the task under the task view surface and set the bounds on it
			startTransaction.reparent(leash, taskView.getSurfaceControl())
			.setPosition(leash, 0, 0)
			.setWindowCrop(leash, bounds.width(), bounds.height())
			.show(leash);
			// the finish transaction would reparent the task back to the transition root, so reparent
			// it again to the task view surface
			finishTransaction.reparent(leash, taskView.getSurfaceControl())
			.setPosition(leash, 0, 0)
			.setWindowCrop(leash, bounds.width(), bounds.height());
			if (useRepo()) {
			final TaskViewRepository.TaskViewState state = mTaskViewRepo.byTaskView(taskView);
			if (state != null) {
			state.mBounds.set(bounds);
			}
			} else {
			updateBoundsState(taskView, bounds);
			}
			return true;
			}

	private void updateBounds(TaskViewTaskController taskView, Rect boundsOnScreen,		private void updateBounds(TaskViewTaskController taskView, Rect boundsOnScreen,
	SurfaceControl.Transaction startTransaction,		SurfaceControl.Transaction startTransaction,
	SurfaceControl.Transaction finishTransaction,		SurfaceControl.Transaction finishTransaction,