diff options
Diffstat (limited to 'libs')
273 files changed, 10276 insertions, 4488 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java index ed99501b867d..29cf05407a61 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java @@ -55,7 +55,7 @@ public class WindowExtensionsImpl implements WindowExtensions { // TODO(b/241126279) Introduce constants to better version functionality @Override public int getVendorApiLevel() { - return 4; + return 5; } @NonNull diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java index ca3d8d18db83..80afb16d5832 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java @@ -19,6 +19,7 @@ package androidx.window.extensions.embedding; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.window.TaskFragmentOperation.OP_TYPE_REORDER_TO_FRONT; import static android.window.TaskFragmentOperation.OP_TYPE_SET_ANIMATION_PARAMS; +import static android.window.TaskFragmentOperation.OP_TYPE_SET_DIM_ON_TASK; import static android.window.TaskFragmentOperation.OP_TYPE_SET_ISOLATED_NAVIGATION; import static androidx.window.extensions.embedding.SplitContainer.getFinishPrimaryWithSecondaryBehavior; @@ -356,6 +357,13 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { wct.addTaskFragmentOperation(fragmentToken, operation); } + void setTaskFragmentDimOnTask(@NonNull WindowContainerTransaction wct, + @NonNull IBinder fragmentToken, boolean dimOnTask) { + final TaskFragmentOperation operation = new TaskFragmentOperation.Builder( + OP_TYPE_SET_DIM_ON_TASK).setDimOnTask(dimOnTask).build(); + wct.addTaskFragmentOperation(fragmentToken, operation); + } + void updateTaskFragmentInfo(@NonNull TaskFragmentInfo taskFragmentInfo) { mFragmentInfos.put(taskFragmentInfo.getFragmentToken(), taskFragmentInfo); } @@ -374,9 +382,13 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { if (splitAttributes == null) { return TaskFragmentAnimationParams.DEFAULT; } - return new TaskFragmentAnimationParams.Builder() - // TODO(b/263047900): Update extensions API. - // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) - .build(); + final AnimationBackground animationBackground = splitAttributes.getAnimationBackground(); + if (animationBackground instanceof AnimationBackground.ColorBackground colorBackground) { + return new TaskFragmentAnimationParams.Builder() + .setAnimationBackgroundColor(colorBackground.getColor()) + .build(); + } else { + return TaskFragmentAnimationParams.DEFAULT; + } } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/OverlayCreateParams.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/OverlayCreateParams.java deleted file mode 100644 index ff49cdcab349..000000000000 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/OverlayCreateParams.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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 androidx.window.extensions.embedding; - -import static java.util.Objects.requireNonNull; - -import android.graphics.Rect; -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - -/** - * The parameter to create an overlay container that retrieved from - * {@link android.app.ActivityOptions} bundle. - */ -class OverlayCreateParams { - - // TODO(b/295803704): Move them to WM Extensions so that we can reuse in WM Jetpack. - @VisibleForTesting - static final String KEY_OVERLAY_CREATE_PARAMS = - "androidx.window.extensions.OverlayCreateParams"; - - @VisibleForTesting - static final String KEY_OVERLAY_CREATE_PARAMS_TASK_ID = - "androidx.window.extensions.OverlayCreateParams.taskId"; - - @VisibleForTesting - static final String KEY_OVERLAY_CREATE_PARAMS_TAG = - "androidx.window.extensions.OverlayCreateParams.tag"; - - @VisibleForTesting - static final String KEY_OVERLAY_CREATE_PARAMS_BOUNDS = - "androidx.window.extensions.OverlayCreateParams.bounds"; - - private final int mTaskId; - - @NonNull - private final String mTag; - - @NonNull - private final Rect mBounds; - - OverlayCreateParams(int taskId, @NonNull String tag, @NonNull Rect bounds) { - mTaskId = taskId; - mTag = requireNonNull(tag); - mBounds = requireNonNull(bounds); - } - - int getTaskId() { - return mTaskId; - } - - @NonNull - String getTag() { - return mTag; - } - - @NonNull - Rect getBounds() { - return mBounds; - } - - @Override - public int hashCode() { - int result = mTaskId; - result = 31 * result + mTag.hashCode(); - result = 31 * result + mBounds.hashCode(); - return result; - } - - @Override - public boolean equals(Object obj) { - if (obj == this) return true; - if (!(obj instanceof OverlayCreateParams thatParams)) return false; - return mTaskId == thatParams.mTaskId - && mTag.equals(thatParams.mTag) - && mBounds.equals(thatParams.mBounds); - } - - @Override - public String toString() { - return OverlayCreateParams.class.getSimpleName() + ": {" - + "taskId=" + mTaskId - + ", tag=" + mTag - + ", bounds=" + mBounds - + "}"; - } - - /** Retrieves the {@link OverlayCreateParams} from {@link android.app.ActivityOptions} bundle */ - @Nullable - static OverlayCreateParams fromBundle(@NonNull Bundle bundle) { - final Bundle paramsBundle = bundle.getBundle(KEY_OVERLAY_CREATE_PARAMS); - if (paramsBundle == null) { - return null; - } - final int taskId = paramsBundle.getInt(KEY_OVERLAY_CREATE_PARAMS_TASK_ID); - final String tag = requireNonNull(paramsBundle.getString(KEY_OVERLAY_CREATE_PARAMS_TAG)); - final Rect bounds = requireNonNull(paramsBundle.getParcelable( - KEY_OVERLAY_CREATE_PARAMS_BOUNDS, Rect.class)); - - return new OverlayCreateParams(taskId, tag, bounds); - } -} diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 4973a4d85af7..b2e5b75cf0b5 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -17,6 +17,7 @@ package androidx.window.extensions.embedding; import static android.app.ActivityManager.START_SUCCESS; +import static android.app.ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.view.Display.DEFAULT_DISPLAY; @@ -34,18 +35,20 @@ import static android.window.TaskFragmentTransaction.TYPE_TASK_FRAGMENT_INFO_CHA import static android.window.TaskFragmentTransaction.TYPE_TASK_FRAGMENT_PARENT_INFO_CHANGED; import static android.window.TaskFragmentTransaction.TYPE_TASK_FRAGMENT_VANISHED; +import static androidx.window.extensions.embedding.ActivityEmbeddingOptionsProperties.KEY_OVERLAY_TAG; import static androidx.window.extensions.embedding.SplitContainer.getFinishPrimaryWithSecondaryBehavior; import static androidx.window.extensions.embedding.SplitContainer.getFinishSecondaryWithPrimaryBehavior; import static androidx.window.extensions.embedding.SplitContainer.isStickyPlaceholderRule; import static androidx.window.extensions.embedding.SplitContainer.shouldFinishAssociatedContainerWhenAdjacent; import static androidx.window.extensions.embedding.SplitContainer.shouldFinishAssociatedContainerWhenStacked; import static androidx.window.extensions.embedding.SplitPresenter.RESULT_EXPAND_FAILED_NO_TF_INFO; -import static androidx.window.extensions.embedding.SplitPresenter.boundsSmallerThanMinDimensions; import static androidx.window.extensions.embedding.SplitPresenter.getActivitiesMinDimensionsPair; import static androidx.window.extensions.embedding.SplitPresenter.getActivityIntentMinDimensionsPair; import static androidx.window.extensions.embedding.SplitPresenter.getMinDimensions; +import static androidx.window.extensions.embedding.SplitPresenter.sanitizeBounds; import static androidx.window.extensions.embedding.SplitPresenter.shouldShowSplit; +import android.annotation.CallbackExecutor; import android.app.Activity; import android.app.ActivityClient; import android.app.ActivityOptions; @@ -62,6 +65,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.SystemProperties; +import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.util.Pair; @@ -84,6 +88,7 @@ import androidx.window.common.EmptyLifecycleCallbacksAdapter; import androidx.window.extensions.WindowExtensionsImpl; import androidx.window.extensions.core.util.function.Consumer; import androidx.window.extensions.core.util.function.Function; +import androidx.window.extensions.core.util.function.Predicate; import androidx.window.extensions.embedding.TransactionManager.TransactionRecord; import androidx.window.extensions.layout.WindowLayoutComponentImpl; @@ -106,6 +111,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen static final boolean ENABLE_SHELL_TRANSITIONS = SystemProperties.getBoolean("persist.wm.debug.shell_transit", true); + // TODO(b/295993745): remove after prebuilt library is updated. + private static final String KEY_ACTIVITY_STACK_TOKEN = + "androidx.window.extensions.embedding.ActivityStackToken"; + @VisibleForTesting @GuardedBy("mLock") final SplitPresenter mPresenter; @@ -136,6 +145,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen private Function<SplitAttributesCalculatorParams, SplitAttributes> mSplitAttributesCalculator; /** + * A calculator function to compute {@link ActivityStack} attributes in a task, which is called + * when there's {@link #onTaskFragmentParentInfoChanged} or folding state changed. + */ + @GuardedBy("mLock") + @Nullable + private Function<ActivityStackAttributesCalculatorParams, ActivityStackAttributes> + mActivityStackAttributesCalculator; + + /** * Map from Task id to {@link TaskContainer} which contains all TaskFragment and split pair info * below it. * When the app is host of multiple Tasks, there can be multiple splits controlled by the same @@ -148,8 +166,20 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** Callback to Jetpack to notify about changes to split states. */ @GuardedBy("mLock") @Nullable - private Consumer<List<SplitInfo>> mEmbeddingCallback; + private Consumer<List<SplitInfo>> mSplitInfoCallback; private final List<SplitInfo> mLastReportedSplitStates = new ArrayList<>(); + + /** + * Stores callbacks to Jetpack to notify about changes to {@link ActivityStack activityStacks} + * and corresponding {@link Executor executors} to dispatch the callback. + */ + @GuardedBy("mLock") + @NonNull + private final ArrayMap<Consumer<List<ActivityStack>>, Executor> mActivityStackCallbacks = + new ArrayMap<>(); + + private final List<ActivityStack> mLastReportedActivityStacks = new ArrayList<>(); + private final Handler mHandler; final Object mLock = new Object(); private final ActivityStartMonitor mActivityStartMonitor; @@ -273,7 +303,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } @Override - public void unpinTopActivityStack(int taskId){ + public void unpinTopActivityStack(int taskId) { synchronized (mLock) { Log.i(TAG, "Request to unpin top activity stack."); final TaskContainer task = getTaskContainer(taskId); @@ -319,13 +349,35 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } + @Override + public void setActivityStackAttributesCalculator( + @NonNull Function<ActivityStackAttributesCalculatorParams, ActivityStackAttributes> + calculator) { + if (!Flags.activityEmbeddingOverlayPresentationFlag()) { + return; + } + synchronized (mLock) { + mActivityStackAttributesCalculator = calculator; + } + } + + @Override + public void clearActivityStackAttributesCalculator() { + if (!Flags.activityEmbeddingOverlayPresentationFlag()) { + return; + } + synchronized (mLock) { + mActivityStackAttributesCalculator = null; + } + } + @GuardedBy("mLock") @Nullable Function<SplitAttributesCalculatorParams, SplitAttributes> getSplitAttributesCalculator() { return mSplitAttributesCalculator; } - @Override + // TODO(b/295993745): remove after we migrate to the bundle approach. @NonNull public ActivityOptions setLaunchingActivityStack(@NonNull ActivityOptions options, @NonNull IBinder token) { @@ -342,6 +394,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Registers the split organizer callback to notify about changes to active splits. + * * @deprecated Use {@link #setSplitInfoCallback(Consumer)} starting with * {@link WindowExtensionsImpl#getVendorApiLevel()} 2. */ @@ -355,12 +408,14 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Registers the split organizer callback to notify about changes to active splits. + * * @since {@link WindowExtensionsImpl#getVendorApiLevel()} 2 */ + @Override public void setSplitInfoCallback(Consumer<List<SplitInfo>> callback) { synchronized (mLock) { - mEmbeddingCallback = callback; - updateCallbackIfNecessary(); + mSplitInfoCallback = callback; + updateSplitInfoCallbackIfNecessary(); } } @@ -370,7 +425,35 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @Override public void clearSplitInfoCallback() { synchronized (mLock) { - mEmbeddingCallback = null; + mSplitInfoCallback = null; + } + } + + /** + * Registers the callback for the {@link ActivityStack} state change. + * + * @param executor The executor to dispatch the callback. + * @param callback The callback for this {@link ActivityStack} state change. + */ + @Override + public void registerActivityStackCallback(@NonNull @CallbackExecutor Executor executor, + @NonNull Consumer<List<ActivityStack>> callback) { + Objects.requireNonNull(executor); + Objects.requireNonNull(callback); + + synchronized (mLock) { + mActivityStackCallbacks.put(callback, executor); + updateActivityStackCallbackIfNecessary(); + } + } + + /** @see #registerActivityStackCallback(Executor, Consumer) */ + @Override + public void unregisterActivityStackCallback(@NonNull Consumer<List<ActivityStack>> callback) { + Objects.requireNonNull(callback); + + synchronized (mLock) { + mActivityStackCallbacks.remove(callback); } } @@ -382,13 +465,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen synchronized (mLock) { // Translate ActivityStack to TaskFragmentContainer. final List<TaskFragmentContainer> pendingFinishingContainers = - activityStackTokens.stream() - .map(token -> { + activityStackTokens.stream().map(token -> { synchronized (mLock) { return getContainer(token); } - }).filter(Objects::nonNull) - .toList(); + }).filter(Objects::nonNull).toList(); if (pendingFinishingContainers.isEmpty()) { return; @@ -471,6 +552,69 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } + @Override + public void updateActivityStackAttributes(@NonNull IBinder activityStackToken, + @NonNull ActivityStackAttributes attributes) { + if (!Flags.activityEmbeddingOverlayPresentationFlag()) { + return; + } + Objects.requireNonNull(activityStackToken); + Objects.requireNonNull(attributes); + + synchronized (mLock) { + final TaskFragmentContainer container = getContainer(activityStackToken); + if (container == null) { + Log.w(TAG, "Cannot find TaskFragmentContainer for token:" + activityStackToken); + return; + } + if (!container.isOverlay()) { + Log.w(TAG, "Updating non-overlay container has not supported yet!"); + return; + } + + final TransactionRecord transactionRecord = mTransactionManager.startNewTransaction(); + final WindowContainerTransaction wct = transactionRecord.getTransaction(); + mPresenter.applyActivityStackAttributes(wct, container, attributes, + container.getMinDimensions()); + transactionRecord.apply(false /* shouldApplyIndependently */); + } + } + + @Override + @Nullable + public ParentContainerInfo getParentContainerInfo(@NonNull IBinder activityStackToken) { + if (!Flags.activityEmbeddingOverlayPresentationFlag()) { + return null; + } + Objects.requireNonNull(activityStackToken); + synchronized (mLock) { + final TaskFragmentContainer container = getContainer(activityStackToken); + if (container == null) { + return null; + } + final TaskContainer.TaskProperties properties = container.getTaskContainer() + .getTaskProperties(); + return mPresenter.createParentContainerInfoFromTaskProperties(properties); + } + } + + @Override + @Nullable + public IBinder getActivityStackToken(@NonNull String tag) { + if (!Flags.activityEmbeddingOverlayPresentationFlag()) { + return null; + } + Objects.requireNonNull(tag); + synchronized (mLock) { + final TaskFragmentContainer taskFragmentContainer = + getContainer(container -> tag.equals(container.getOverlayTag())); + if (taskFragmentContainer == null) { + return null; + } + return taskFragmentContainer.getTaskFragmentToken(); + } + } + /** * Called when the transaction is ready so that the organizer can update the TaskFragments based * on the changes in transaction. @@ -539,8 +683,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Called when a TaskFragment is created and organized by this organizer. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param taskFragmentInfo Info of the TaskFragment that is created. + * @param wct The {@link WindowContainerTransaction} to make any changes with if + * needed. + * @param taskFragmentInfo Info of the TaskFragment that is created. */ // Suppress GuardedBy warning because lint ask to mark this method as // @GuardedBy(container.mController.mLock), which is mLock itself @@ -548,7 +693,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @VisibleForTesting @GuardedBy("mLock") void onTaskFragmentAppeared(@NonNull WindowContainerTransaction wct, - @NonNull TaskFragmentInfo taskFragmentInfo) { + @NonNull TaskFragmentInfo taskFragmentInfo) { final TaskFragmentContainer container = getContainer(taskFragmentInfo.getFragmentToken()); if (container == null) { return; @@ -568,8 +713,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Called when the status of an organized TaskFragment is changed. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param taskFragmentInfo Info of the TaskFragment that is changed. + * @param wct The {@link WindowContainerTransaction} to make any changes with if + * needed. + * @param taskFragmentInfo Info of the TaskFragment that is changed. */ // Suppress GuardedBy warning because lint ask to mark this method as // @GuardedBy(container.mController.mLock), which is mLock itself @@ -639,8 +785,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Called when an organized TaskFragment is removed. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param taskFragmentInfo Info of the TaskFragment that is removed. + * @param wct The {@link WindowContainerTransaction} to make any changes with if + * needed. + * @param taskFragmentInfo Info of the TaskFragment that is removed. */ @VisibleForTesting @GuardedBy("mLock") @@ -660,14 +807,14 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * Called when the parent leaf Task of organized TaskFragments is changed. * When the leaf Task is changed, the organizer may want to update the TaskFragments in one * transaction. - * + * <p> * For case like screen size change, it will trigger {@link #onTaskFragmentParentInfoChanged} * with new Task bounds, but may not trigger {@link #onTaskFragmentInfoChanged} because there * can be an override bounds. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param taskId Id of the parent Task that is changed. - * @param parentInfo {@link TaskFragmentParentInfo} of the parent Task. + * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. + * @param taskId Id of the parent Task that is changed. + * @param parentInfo {@link TaskFragmentParentInfo} of the parent Task. */ @VisibleForTesting @GuardedBy("mLock") @@ -678,14 +825,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen Log.e(TAG, "onTaskFragmentParentInfoChanged on empty Task id=" + taskId); return; } + // Checks if container should be updated before apply new parentInfo. + final boolean shouldUpdateContainer = taskContainer.shouldUpdateContainer(parentInfo); taskContainer.updateTaskFragmentParentInfo(parentInfo); - if (!taskContainer.isVisible()) { - // Don't update containers if the task is not visible. We only update containers when - // parentInfo#isVisibleRequested is true. - return; - } - if (isInPictureInPicture(parentInfo.getConfiguration())) { - // No need to update presentation in PIP until the Task exit PIP. + + // If the last direct activity of the host task is dismissed and the overlay container is + // the only taskFragment, the overlay container should also be dismissed. + dismissOverlayContainerIfNeeded(wct, taskContainer); + + if (!shouldUpdateContainer) { return; } updateContainersInTask(wct, taskContainer); @@ -720,20 +868,20 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * original Task. In this case, we need to notify the organizer so that it can check if the * Activity matches any split rule. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param taskId The Task that the activity is reparented to. - * @param activityIntent The intent that the activity is original launched with. - * @param activityToken If the activity belongs to the same process as the organizer, this - * will be the actual activity token; if the activity belongs to a - * different process, the server will generate a temporary token that - * the organizer can use to reparent the activity through - * {@link WindowContainerTransaction} if needed. + * @param wct The {@link WindowContainerTransaction} to make any changes with if + * needed. + * @param taskId The Task that the activity is reparented to. + * @param activityIntent The intent that the activity is original launched with. + * @param activityToken If the activity belongs to the same process as the organizer, this + * will be the actual activity token; if the activity belongs to a + * different process, the server will generate a temporary token that + * the organizer can use to reparent the activity through + * {@link WindowContainerTransaction} if needed. */ @VisibleForTesting @GuardedBy("mLock") void onActivityReparentedToTask(@NonNull WindowContainerTransaction wct, - int taskId, @NonNull Intent activityIntent, - @NonNull IBinder activityToken) { + int taskId, @NonNull Intent activityIntent, @NonNull IBinder activityToken) { // If the activity belongs to the current app process, we treat it as a new activity // launch. final Activity activity = getActivity(activityToken); @@ -781,14 +929,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * Called when the {@link WindowContainerTransaction} created with * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} failed on the server side. * - * @param wct The {@link WindowContainerTransaction} to make any changes with if needed. - * @param errorCallbackToken token set in - * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} - * @param taskFragmentInfo The {@link TaskFragmentInfo}. This could be {@code null} if no - * TaskFragment created. - * @param opType The {@link WindowContainerTransaction.HierarchyOp} of the failed - * transaction operation. - * @param exception exception from the server side. + * @param wct The {@link WindowContainerTransaction} to make any changes with if + * needed. + * @param errorCallbackToken token set in + * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} + * @param taskFragmentInfo The {@link TaskFragmentInfo}. This could be {@code null} if no + * TaskFragment created. + * @param opType The {@link WindowContainerTransaction.HierarchyOp} of the failed + * transaction operation. + * @param exception exception from the server side. */ // Suppress GuardedBy warning because lint ask to mark this method as // @GuardedBy(container.mController.mLock), which is mLock itself @@ -828,7 +977,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } - /** Called on receiving {@link #onTaskFragmentVanished} for cleanup. */ + /** + * Called on receiving {@link #onTaskFragmentVanished} for cleanup. + */ @GuardedBy("mLock") private void cleanupTaskFragment(@NonNull IBinder taskFragmentToken) { for (int i = mTaskContainers.size() - 1; i >= 0; i--) { @@ -855,11 +1006,12 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Checks if the new added activity should be routed to a particular container. It can create a * new container for the activity and a new split container if necessary. - * @param activity the activity that is newly added to the Task. - * @param isOnReparent whether the activity is reparented to the Task instead of new launched. - * We only support to split as primary for reparented activity for now. + * + * @param activity the activity that is newly added to the Task. + * @param isOnReparent whether the activity is reparented to the Task instead of new launched. + * We only support to split as primary for reparented activity for now. * @return {@code true} if the activity has been handled, such as placed in a TaskFragment, or - * in a state that the caller shouldn't handle. + * in a state that the caller shouldn't handle. */ @VisibleForTesting @GuardedBy("mLock") @@ -892,7 +1044,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen final TaskContainer taskContainer = container != null ? container.getTaskContainer() : null; if (!isOnReparent && taskContainer != null && taskContainer.getTopNonFinishingTaskFragmentContainer(false /* includePin */) - != container) { + != container) { // Do not resolve if the launched activity is not the top-most container (excludes // the pinned and overlay container) in the Task. return true; @@ -917,6 +1069,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Resolves the activity to a {@link TaskFragmentContainer} according to the Split-rules. */ + @GuardedBy("mLock") boolean resolveActivityToContainerByRule(@NonNull WindowContainerTransaction wct, @NonNull Activity activity, @Nullable TaskFragmentContainer container, boolean isOnReparent) { @@ -1001,7 +1154,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @GuardedBy("mLock") @VisibleForTesting void placeActivityInTopContainer(@NonNull WindowContainerTransaction wct, - @NonNull Activity activity) { + @NonNull Activity activity) { if (getContainerWithActivity(activity) != null) { // The activity has already been put in a TaskFragment. This is likely to be done by // the server when the activity is started. @@ -1051,7 +1204,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen */ @GuardedBy("mLock") private void expandActivity(@NonNull WindowContainerTransaction wct, - @NonNull Activity activity) { + @NonNull Activity activity) { final TaskFragmentContainer container = getContainerWithActivity(activity); if (shouldContainerBeExpanded(container)) { // Make sure that the existing container is expanded. @@ -1063,7 +1216,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } - /** Whether the given new launched activity is in a split with a rule matched. */ + /** + * Whether the given new launched activity is in a split with a rule matched. + */ // Suppress GuardedBy warning because lint asks to mark this method as // @GuardedBy(mPresenter.mController.mLock), which is mLock itself @SuppressWarnings("GuardedBy") @@ -1121,7 +1276,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return getSplitRule(primaryActivity, launchedActivity) != null; } - /** Finds the activity below the given activity. */ + /** + * Finds the activity below the given activity. + */ @VisibleForTesting @Nullable @GuardedBy("mLock") @@ -1172,8 +1329,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen getActivitiesMinDimensionsPair(primaryActivity, secondaryActivity)); if (splitContainer != null && primaryContainer == splitContainer.getPrimaryContainer() && canReuseContainer(splitRule, splitContainer.getSplitRule(), - taskProperties.getTaskMetrics(), - calculatedSplitAttributes, splitContainer.getCurrentSplitAttributes())) { + taskProperties.getTaskMetrics(), + calculatedSplitAttributes, splitContainer.getCurrentSplitAttributes())) { // Can launch in the existing secondary container if the rules share the same // presentation. final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer(); @@ -1307,7 +1464,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * prioritize to split the new activity with it if it is not * {@code null}. * @return the {@link TaskFragmentContainer} to start the new activity in. {@code null} if there - * is no embedding rule matched. + * is no embedding rule matched. */ @VisibleForTesting @Nullable @@ -1411,8 +1568,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen private TaskFragmentContainer createEmptyExpandedContainer( @NonNull WindowContainerTransaction wct, @NonNull Intent intent, int taskId, @Nullable Activity launchingActivity) { - return createEmptyContainer(wct, intent, taskId, new Rect(), launchingActivity, - null /* overlayTag */); + return createEmptyContainer(wct, intent, taskId, + new ActivityStackAttributes.Builder().build(), launchingActivity, + null /* overlayTag */, null /* launchOptions */); } /** @@ -1425,8 +1583,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @Nullable TaskFragmentContainer createEmptyContainer( @NonNull WindowContainerTransaction wct, @NonNull Intent intent, int taskId, - @NonNull Rect bounds, @Nullable Activity launchingActivity, - @Nullable String overlayTag) { + @NonNull ActivityStackAttributes activityStackAttributes, + @Nullable Activity launchingActivity, @Nullable String overlayTag, + @Nullable Bundle launchOptions) { // We need an activity in the organizer process in the same Task to use as the owner // activity, as well as to get the Task window info. final Activity activityInTask; @@ -1443,48 +1602,27 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return null; } final TaskFragmentContainer container = newContainer(null /* pendingAppearedActivity */, - intent, activityInTask, taskId, null /* pairedPrimaryContainer*/, overlayTag); + intent, activityInTask, taskId, null /* pairedPrimaryContainer*/, overlayTag, + launchOptions); final IBinder taskFragmentToken = container.getTaskFragmentToken(); // Note that taskContainer will not exist before calling #newContainer if the container // is the first embedded TF in the task. final TaskContainer taskContainer = container.getTaskContainer(); - final Rect taskBounds = taskContainer.getTaskProperties().getTaskMetrics().getBounds(); - final Rect sanitizedBounds = sanitizeBounds(bounds, intent, taskBounds); + // TODO(b/265271880): remove redundant logic after all TF operations take fragmentToken. + final Rect taskBounds = taskContainer.getBounds(); + final Rect sanitizedBounds = sanitizeBounds(activityStackAttributes.getRelativeBounds(), + getMinDimensions(intent), taskBounds); final int windowingMode = taskContainer - .getWindowingModeForSplitTaskFragment(sanitizedBounds); + .getWindowingModeForTaskFragment(sanitizedBounds); mPresenter.createTaskFragment(wct, taskFragmentToken, activityInTask.getActivityToken(), sanitizedBounds, windowingMode); - mPresenter.updateAnimationParams(wct, taskFragmentToken, - TaskFragmentAnimationParams.DEFAULT); - mPresenter.setTaskFragmentIsolatedNavigation(wct, taskFragmentToken, - overlayTag != null && !sanitizedBounds.isEmpty()); + mPresenter.applyActivityStackAttributes(wct, container, activityStackAttributes, + getMinDimensions(intent)); return container; } /** - * Returns the expanded bounds if the {@code bounds} violate minimum dimension or are not fully - * covered by the task bounds. Otherwise, returns {@code bounds}. - */ - @NonNull - private static Rect sanitizeBounds(@NonNull Rect bounds, @NonNull Intent intent, - @NonNull Rect taskBounds) { - if (bounds.isEmpty()) { - // Don't need to check if the bounds follows the task bounds. - return bounds; - } - if (boundsSmallerThanMinDimensions(bounds, getMinDimensions(intent))) { - // Expand the bounds if the bounds are smaller than minimum dimensions. - return new Rect(); - } - if (!taskBounds.contains(bounds)) { - // Expand the bounds if the bounds exceed the task bounds. - return new Rect(); - } - return bounds; - } - - /** * Returns a container for the new activity intent to launch into as splitting with the primary * activity. */ @@ -1507,11 +1645,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen getActivityIntentMinDimensionsPair(primaryActivity, intent)); if (splitContainer != null && existingContainer == splitContainer.getPrimaryContainer() && (canReuseContainer(splitRule, splitContainer.getSplitRule(), taskWindowMetrics, - calculatedSplitAttributes, splitContainer.getCurrentSplitAttributes()) + calculatedSplitAttributes, splitContainer.getCurrentSplitAttributes()) // TODO(b/231845476) we should always respect clearTop. || !respectClearTop) && mPresenter.expandSplitContainerIfNeeded(wct, splitContainer, primaryActivity, - null /* secondaryActivity */, intent) != RESULT_EXPAND_FAILED_NO_TF_INFO) { + null /* secondaryActivity */, intent) != RESULT_EXPAND_FAILED_NO_TF_INFO) { // Can launch in the existing secondary container if the rules share the same // presentation. return splitContainer.getSecondaryContainer(); @@ -1536,29 +1674,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken) { // Check pending appeared activity first because there can be a delay for the server // update. - for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) - .getTaskFragmentContainers(); - for (int j = containers.size() - 1; j >= 0; j--) { - final TaskFragmentContainer container = containers.get(j); - if (container.hasPendingAppearedActivity(activityToken)) { - return container; - } - } + TaskFragmentContainer taskFragmentContainer = + getContainer(container -> container.hasPendingAppearedActivity(activityToken)); + if (taskFragmentContainer != null) { + return taskFragmentContainer; } + // Check appeared activity if there is no such pending appeared activity. - for (int i = mTaskContainers.size() - 1; i >= 0; i--) { - final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) - .getTaskFragmentContainers(); - for (int j = containers.size() - 1; j >= 0; j--) { - final TaskFragmentContainer container = containers.get(j); - if (container.hasAppearedActivity(activityToken)) { - return container; - } - } - } - return null; + return getContainer(container -> container.hasAppearedActivity(activityToken)); } @GuardedBy("mLock") @@ -1570,43 +1694,49 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen TaskFragmentContainer newContainer(@NonNull Activity pendingAppearedActivity, @NonNull Activity activityInTask, int taskId) { return newContainer(pendingAppearedActivity, null /* pendingAppearedIntent */, - activityInTask, taskId, null /* pairedPrimaryContainer */, null /* tag */); + activityInTask, taskId, null /* pairedPrimaryContainer */, null /* tag */, + null /* launchOptions */); } @GuardedBy("mLock") TaskFragmentContainer newContainer(@NonNull Intent pendingAppearedIntent, @NonNull Activity activityInTask, int taskId) { return newContainer(null /* pendingAppearedActivity */, pendingAppearedIntent, - activityInTask, taskId, null /* pairedPrimaryContainer */, null /* tag */); + activityInTask, taskId, null /* pairedPrimaryContainer */, null /* tag */, + null /* launchOptions */); } @GuardedBy("mLock") TaskFragmentContainer newContainer(@NonNull Intent pendingAppearedIntent, - @NonNull Activity activityInTask, int taskId, - @NonNull TaskFragmentContainer pairedPrimaryContainer) { + @NonNull Activity activityInTask, int taskId, + @NonNull TaskFragmentContainer pairedPrimaryContainer) { return newContainer(null /* pendingAppearedActivity */, pendingAppearedIntent, - activityInTask, taskId, pairedPrimaryContainer, null /* tag */); + activityInTask, taskId, pairedPrimaryContainer, null /* tag */, + null /* launchOptions */); } /** * Creates and registers a new organized container with an optional activity that will be * re-parented to it in a WCT. * - * @param pendingAppearedActivity the activity that will be reparented to the TaskFragment. - * @param pendingAppearedIntent the Intent that will be started in the TaskFragment. - * @param activityInTask activity in the same Task so that we can get the Task bounds - * if needed. - * @param taskId parent Task of the new TaskFragment. - * @param pairedPrimaryContainer the paired primary {@link TaskFragmentContainer}. When it is - * set, the new container will be added right above it. - * @param overlayTag The tag for the new created overlay container. It must be - * needed if {@code isOverlay} is {@code true}. Otherwise, - * it should be {@code null}. + * @param pendingAppearedActivity the activity that will be reparented to the TaskFragment. + * @param pendingAppearedIntent the Intent that will be started in the TaskFragment. + * @param activityInTask activity in the same Task so that we can get the Task bounds + * if needed. + * @param taskId parent Task of the new TaskFragment. + * @param pairedPrimaryContainer the paired primary {@link TaskFragmentContainer}. When it is + * set, the new container will be added right above it. + * @param overlayTag The tag for the new created overlay container. It must be + * needed if {@code isOverlay} is {@code true}. Otherwise, + * it should be {@code null}. + * @param launchOptions The launch options bundle to create a container. Must be + * specified for overlay container. */ @GuardedBy("mLock") TaskFragmentContainer newContainer(@Nullable Activity pendingAppearedActivity, @Nullable Intent pendingAppearedIntent, @NonNull Activity activityInTask, int taskId, - @Nullable TaskFragmentContainer pairedPrimaryContainer, @Nullable String overlayTag) { + @Nullable TaskFragmentContainer pairedPrimaryContainer, @Nullable String overlayTag, + @Nullable Bundle launchOptions) { if (activityInTask == null) { throw new IllegalArgumentException("activityInTask must not be null,"); } @@ -1615,7 +1745,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } final TaskContainer taskContainer = mTaskContainers.get(taskId); final TaskFragmentContainer container = new TaskFragmentContainer(pendingAppearedActivity, - pendingAppearedIntent, taskContainer, this, pairedPrimaryContainer, overlayTag); + pendingAppearedIntent, taskContainer, this, pairedPrimaryContainer, overlayTag, + launchOptions); return container; } @@ -1640,7 +1771,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen primaryContainer.getTaskContainer().addSplitContainer(splitContainer); } - /** Cleanups all the dependencies when the TaskFragment is entering PIP. */ + /** + * Cleanups all the dependencies when the TaskFragment is entering PIP. + */ @GuardedBy("mLock") private void cleanupForEnterPip(@NonNull WindowContainerTransaction wct, @NonNull TaskFragmentContainer container) { @@ -1799,16 +1932,49 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @SuppressWarnings("GuardedBy") @GuardedBy("mLock") void updateOverlayContainer(@NonNull WindowContainerTransaction wct, - @NonNull TaskFragmentContainer container) { + @NonNull TaskFragmentContainer container) { final TaskContainer taskContainer = container.getTaskContainer(); + + if (dismissOverlayContainerIfNeeded(wct, taskContainer)) { + return; + } + + if (mActivityStackAttributesCalculator == null) { + Log.e(TAG, "ActivityStackAttributesCalculator is not set. Thus the overlay container" + + " can not be updated."); + return; + } + + if (mActivityStackAttributesCalculator != null) { + final ActivityStackAttributesCalculatorParams params = + new ActivityStackAttributesCalculatorParams( + mPresenter.createParentContainerInfoFromTaskProperties( + taskContainer.getTaskProperties()), + container.getOverlayTag(), + container.getLaunchOptions()); + final ActivityStackAttributes attributes = mActivityStackAttributesCalculator + .apply(params); + mPresenter.applyActivityStackAttributes(wct, container, attributes, + container.getMinDimensions()); + } + } + + /** Dismisses the overlay container in the {@code taskContainer} if needed. */ + @GuardedBy("mLock") + private boolean dismissOverlayContainerIfNeeded(@NonNull WindowContainerTransaction wct, + @NonNull TaskContainer taskContainer) { + final TaskFragmentContainer overlayContainer = taskContainer.getOverlayContainer(); + if (overlayContainer == null) { + return false; + } // Dismiss the overlay container if it's the only container in the task and there's no // direct activity in the parent task. if (taskContainer.getTaskFragmentContainers().size() == 1 && !taskContainer.hasDirectActivity()) { - container.finish(false /* shouldFinishDependent */, mPresenter, wct, this); + mPresenter.cleanupContainer(wct, overlayContainer, false /* shouldFinishDependant */); + return true; } - - // TODO(b/295805054): Add the logic to update overlay container + return false; } /** @@ -1817,11 +1983,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * are {@code null}, the {@link SplitAttributes} will be calculated with * {@link SplitPresenter#computeSplitAttributes}. * - * @param splitContainer The {@link SplitContainer} to update + * @param splitContainer The {@link SplitContainer} to update * @param splitAttributes Update with this {@code splitAttributes} if it is not {@code null}. * Otherwise, use the value calculated by * {@link SplitPresenter#computeSplitAttributes} - * * @return {@code true} if the update succeed. Otherwise, returns {@code false}. */ @VisibleForTesting @@ -1856,7 +2021,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return true; } - /** Whether the given split is the topmost split in the Task. */ + /** + * Whether the given split is the topmost split in the Task. + */ private boolean isTopMostSplit(@NonNull SplitContainer splitContainer) { final List<SplitContainer> splitContainers = splitContainer.getPrimaryContainer() .getTaskContainer().getSplitContainers(); @@ -1963,7 +2130,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return true; } - /** Whether or not to allow activity in this container to launch placeholder. */ + /** + * Whether or not to allow activity in this container to launch placeholder. + */ @GuardedBy("mLock") private boolean allowLaunchPlaceholder(@NonNull TaskFragmentContainer container) { final TaskFragmentContainer topContainer = container.getTaskContainer() @@ -1997,8 +2166,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen /** * Gets the activity options for starting the placeholder activity. In case the placeholder is * launched when the Task is in the background, we don't want to bring the Task to the front. - * @param primaryActivity the primary activity to launch the placeholder from. - * @param isOnCreated whether this happens during the primary activity onCreated. + * + * @param primaryActivity the primary activity to launch the placeholder from. + * @param isOnCreated whether this happens during the primary activity onCreated. */ @VisibleForTesting @GuardedBy("mLock") @@ -2070,7 +2240,16 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @VisibleForTesting @GuardedBy("mLock") void updateCallbackIfNecessary() { - if (mEmbeddingCallback == null || !readyToReportToClient()) { + updateSplitInfoCallbackIfNecessary(); + updateActivityStackCallbackIfNecessary(); + } + + /** + * Notifies callbacks about changes to split states if necessary. + */ + @GuardedBy("mLock") + private void updateSplitInfoCallbackIfNecessary() { + if (!readyToReportToClient() || mSplitInfoCallback == null) { return; } final List<SplitInfo> currentSplitStates = getActiveSplitStatesIfStable(); @@ -2079,7 +2258,32 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } mLastReportedSplitStates.clear(); mLastReportedSplitStates.addAll(currentSplitStates); - mEmbeddingCallback.accept(currentSplitStates); + mSplitInfoCallback.accept(currentSplitStates); + } + + /** + * Notifies callbacks about changes to {@link ActivityStack} states if necessary. + */ + @GuardedBy("mLock") + private void updateActivityStackCallbackIfNecessary() { + if (!readyToReportToClient() || mActivityStackCallbacks.isEmpty()) { + return; + } + final List<ActivityStack> currentActivityStacks = getActivityStacksIfStable(); + if (currentActivityStacks == null + || mLastReportedActivityStacks.equals(currentActivityStacks)) { + return; + } + mLastReportedActivityStacks.clear(); + mLastReportedActivityStacks.addAll(currentActivityStacks); + // Copy the map in case a callback is removed during the for-loop. + final ArrayMap<Consumer<List<ActivityStack>>, Executor> callbacks = + new ArrayMap<>(mActivityStackCallbacks); + for (int i = callbacks.size() - 1; i >= 0; --i) { + final Executor executor = callbacks.valueAt(i); + final Consumer<List<ActivityStack>> callback = callbacks.keyAt(i); + executor.execute(() -> callback.accept(currentActivityStacks)); + } } /** @@ -2104,6 +2308,27 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } /** + * Returns a list of currently active {@link ActivityStack activityStacks}. + * + * @return a list of {@link ActivityStack activityStacks} if all the containers are in + * a stable state, or {@code null} otherwise. + */ + @GuardedBy("mLock") + @Nullable + private List<ActivityStack> getActivityStacksIfStable() { + final List<ActivityStack> activityStacks = new ArrayList<>(); + for (int i = mTaskContainers.size() - 1; i >= 0; i--) { + final List<ActivityStack> taskActivityStacks = + mTaskContainers.valueAt(i).getActivityStacksIfStable(); + if (taskActivityStacks == null) { + return null; + } + activityStacks.addAll(taskActivityStacks); + } + return activityStacks; + } + + /** * Whether we can now report the split states to the client. */ @GuardedBy("mLock") @@ -2173,11 +2398,18 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @Nullable @GuardedBy("mLock") TaskFragmentContainer getContainer(@NonNull IBinder fragmentToken) { + return getContainer(container -> fragmentToken.equals(container.getTaskFragmentToken())); + } + + @Nullable + @GuardedBy("mLock") + TaskFragmentContainer getContainer(@NonNull Predicate<TaskFragmentContainer> predicate) { for (int i = mTaskContainers.size() - 1; i >= 0; i--) { final List<TaskFragmentContainer> containers = mTaskContainers.valueAt(i) .getTaskFragmentContainers(); - for (TaskFragmentContainer container : containers) { - if (container.getTaskFragmentToken().equals(fragmentToken)) { + for (int j = containers.size() - 1; j >= 0; j--) { + final TaskFragmentContainer container = containers.get(j); + if (predicate.test(container)) { return container; } } @@ -2270,6 +2502,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * container. There is a case when primary containers for placeholders should be retained * despite the rule configuration to finish primary with secondary - if they are marked as * 'sticky' and the placeholder was finished when fully overlapping the primary container. + * * @return {@code true} if the associated container should be retained (and not be finished). */ // Suppress GuardedBy warning because lint ask to mark this method as @@ -2345,55 +2578,49 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen @GuardedBy("mLock") @Nullable TaskFragmentContainer createOrUpdateOverlayTaskFragmentIfNeeded( - @NonNull WindowContainerTransaction wct, - @NonNull OverlayCreateParams overlayCreateParams, int launchTaskId, + @NonNull WindowContainerTransaction wct, @NonNull Bundle options, @NonNull Intent intent, @NonNull Activity launchActivity) { - final int taskId = overlayCreateParams.getTaskId(); - if (taskId != launchTaskId) { - // The task ID doesn't match the launch activity's. Cannot determine the host task - // to launch the overlay. - throw new IllegalArgumentException("The task ID of " - + "OverlayCreateParams#launchingActivity must match the task ID of " - + "the activity to #startActivity with the activity options that takes " - + "OverlayCreateParams."); - } final List<TaskFragmentContainer> overlayContainers = getAllOverlayTaskFragmentContainers(); - final String overlayTag = overlayCreateParams.getTag(); + final String overlayTag = Objects.requireNonNull(options.getString(KEY_OVERLAY_TAG)); // If the requested bounds of OverlayCreateParams are smaller than minimum dimensions // specified by Intent, expand the overlay container to fill the parent task instead. - final Rect bounds = overlayCreateParams.getBounds(); - final Size minDimensions = getMinDimensions(intent); - final boolean shouldExpandContainer = boundsSmallerThanMinDimensions(bounds, - minDimensions); + final ActivityStackAttributesCalculatorParams params = + new ActivityStackAttributesCalculatorParams( + mPresenter.createParentContainerInfoFromTaskProperties( + mPresenter.getTaskProperties(launchActivity)), overlayTag, options); + // Fallback to expand the bounds if there's no activityStackAttributes calculator. + final ActivityStackAttributes attrs; + if (mActivityStackAttributesCalculator != null) { + attrs = mActivityStackAttributesCalculator.apply(params); + } else { + attrs = new ActivityStackAttributes.Builder().build(); + Log.e(TAG, "ActivityStackAttributesCalculator isn't set. Fallback to set overlay " + + "container as expected."); + } + + final int taskId = getTaskId(launchActivity); if (!overlayContainers.isEmpty()) { for (final TaskFragmentContainer overlayContainer : overlayContainers) { if (!overlayTag.equals(overlayContainer.getOverlayTag()) && taskId == overlayContainer.getTaskId()) { // If there's an overlay container with different tag shown in the same // task, dismiss the existing overlay container. - overlayContainer.finish(false /* shouldFinishDependant */, mPresenter, - wct, SplitController.this); + mPresenter.cleanupContainer(wct, overlayContainer, + false /* shouldFinishDependant */); } if (overlayTag.equals(overlayContainer.getOverlayTag()) && taskId != overlayContainer.getTaskId()) { // If there's an overlay container with same tag in a different task, // dismiss the overlay container since the tag must be unique per process. - overlayContainer.finish(false /* shouldFinishDependant */, mPresenter, - wct, SplitController.this); + mPresenter.cleanupContainer(wct, overlayContainer, + false /* shouldFinishDependant */); } if (overlayTag.equals(overlayContainer.getOverlayTag()) && taskId == overlayContainer.getTaskId()) { - // If there's an overlay container with the same tag and task ID, we treat - // the OverlayCreateParams as the update to the container. - final Rect taskBounds = overlayContainer.getTaskContainer().getTaskProperties() - .getTaskMetrics().getBounds(); - final IBinder overlayToken = overlayContainer.getTaskFragmentToken(); - final Rect sanitizedBounds = sanitizeBounds(bounds, intent, taskBounds); - mPresenter.resizeTaskFragment(wct, overlayToken, sanitizedBounds); - mPresenter.setTaskFragmentIsolatedNavigation(wct, overlayToken, - !sanitizedBounds.isEmpty()); + mPresenter.applyActivityStackAttributes(wct, overlayContainer, attrs, + getMinDimensions(intent)); // We can just return the updated overlay container and don't need to // check other condition since we only have one OverlayCreateParams, and // if the tag and task are matched, it's impossible to match another task @@ -2402,8 +2629,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } } - return createEmptyContainer(wct, intent, taskId, - (shouldExpandContainer ? new Rect() : bounds), launchActivity, overlayTag); + // Launch the overlay container to the task with taskId. + return createEmptyContainer(wct, intent, taskId, attrs, launchActivity, overlayTag, + options); } private final class LifecycleCallbacks extends EmptyLifecycleCallbacksAdapter { @@ -2504,7 +2732,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } - /** Executor that posts on the main application thread. */ + /** + * Executor that posts on the main application thread. + */ private static class MainThreadExecutor implements Executor { private final Handler mHandler = new Handler(Looper.getMainLooper()); @@ -2530,8 +2760,17 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // TODO(b/232042367): Consolidate the activity create handling so that we can handle // cross-process the same as normal. + IBinder activityStackToken = options.getBinder(KEY_ACTIVITY_STACK_TOKEN); + if (activityStackToken != null) { + // Put activityStack token to #KEY_LAUNCH_TASK_FRAGMENT_TOKEN to launch the activity + // into the taskFragment associated with the token. + options.putBinder(KEY_LAUNCH_TASK_FRAGMENT_TOKEN, activityStackToken); + } + // Early return if the launching taskfragment is already been set. - if (options.getBinder(ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN) != null) { + // TODO(b/295993745): Use KEY_LAUNCH_TASK_FRAGMENT_TOKEN after WM Jetpack migrates to + // bundle. This is still needed to support #setLaunchingActivityStack. + if (options.getBinder(KEY_LAUNCH_TASK_FRAGMENT_TOKEN) != null) { synchronized (mLock) { mCurrentIntent = intent; } @@ -2568,12 +2807,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen final TaskFragmentContainer launchedInTaskFragment; if (launchingActivity != null) { final int taskId = getTaskId(launchingActivity); - final OverlayCreateParams overlayCreateParams = - OverlayCreateParams.fromBundle(options); + final String overlayTag = options.getString(KEY_OVERLAY_TAG); if (Flags.activityEmbeddingOverlayPresentationFlag() - && overlayCreateParams != null) { + && overlayTag != null) { launchedInTaskFragment = createOrUpdateOverlayTaskFragmentIfNeeded(wct, - overlayCreateParams, taskId, intent, launchingActivity); + options, intent, launchingActivity); } else { launchedInTaskFragment = resolveStartActivityIntent(wct, taskId, intent, launchingActivity); @@ -2589,7 +2827,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // Amend the request to let the WM know that the activity should be placed in // the dedicated container. // TODO(b/229680885): skip override launching TaskFragment token by split-rule - options.putBinder(ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN, + options.putBinder(KEY_LAUNCH_TASK_FRAGMENT_TOKEN, launchedInTaskFragment.getTaskFragmentToken()); mCurrentIntent = intent; } else { @@ -2607,8 +2845,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (mCurrentIntent != null && result != START_SUCCESS) { // Clear the pending appeared intent if the activity was not started // successfully. - final IBinder token = bOptions.getBinder( - ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN); + final IBinder token = bOptions.getBinder(KEY_LAUNCH_TASK_FRAGMENT_TOKEN); if (token != null) { final TaskFragmentContainer container = getContainer(token); if (container != null) { @@ -2653,7 +2890,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen && calculatedSplitAttributes.equals(containerSplitAttributes); } - /** Whether the two rules have the same presentation. */ + /** + * Whether the two rules have the same presentation. + */ @VisibleForTesting static boolean areRulesSamePresentation(@NonNull SplitPairRule rule1, @NonNull SplitPairRule rule2, @NonNull WindowMetrics parentWindowMetrics) { diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java index b5c32bbe78fa..2f2da8c53db0 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java @@ -18,6 +18,8 @@ package androidx.window.extensions.embedding; import static android.content.pm.PackageManager.MATCH_ALL; +import static androidx.window.extensions.embedding.WindowAttributes.DIM_AREA_ON_TASK; + import android.app.Activity; import android.app.ActivityThread; import android.app.WindowConfiguration; @@ -54,6 +56,7 @@ import androidx.window.extensions.layout.WindowLayoutComponentImpl; import androidx.window.extensions.layout.WindowLayoutInfo; import com.android.internal.annotations.VisibleForTesting; +import com.android.window.flags.Flags; import java.util.ArrayList; import java.util.List; @@ -187,7 +190,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { final Rect secondaryRelBounds = getRelBoundsForPosition(POSITION_END, taskProperties, splitAttributes); final int windowingMode = mController.getTaskContainer(taskId) - .getWindowingModeForSplitTaskFragment(secondaryRelBounds); + .getWindowingModeForTaskFragment(secondaryRelBounds); createTaskFragment(wct, secondaryContainer.getTaskFragmentToken(), primaryActivity.getActivityToken(), secondaryRelBounds, windowingMode); updateAnimationParams(wct, secondaryContainer.getTaskFragmentToken(), splitAttributes); @@ -259,7 +262,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { if (container == null || container == containerToAvoid) { container = mController.newContainer(activity, taskId); final int windowingMode = mController.getTaskContainer(taskId) - .getWindowingModeForSplitTaskFragment(relBounds); + .getWindowingModeForTaskFragment(relBounds); final IBinder reparentActivityToken = activity.getActivityToken(); createTaskFragment(wct, container.getTaskFragmentToken(), reparentActivityToken, relBounds, windowingMode, reparentActivityToken); @@ -268,7 +271,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { } else { resizeTaskFragmentIfRegistered(wct, container, relBounds); final int windowingMode = mController.getTaskContainer(taskId) - .getWindowingModeForSplitTaskFragment(relBounds); + .getWindowingModeForTaskFragment(relBounds); updateTaskFragmentWindowingModeIfRegistered(wct, container, windowingMode); } updateAnimationParams(wct, container.getTaskFragmentToken(), splitAttributes); @@ -310,7 +313,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { // Pass in the primary container to make sure it is added right above the primary. primaryContainer); final TaskContainer taskContainer = mController.getTaskContainer(taskId); - final int windowingMode = taskContainer.getWindowingModeForSplitTaskFragment( + final int windowingMode = taskContainer.getWindowingModeForTaskFragment( primaryRelBounds); mController.registerSplit(wct, primaryContainer, launchingActivity, secondaryContainer, rule, splitAttributes); @@ -347,6 +350,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { && secondaryContainer.areLastRequestedBoundsEqual(null /* bounds */) && !secondaryRelBounds.isEmpty(); + // TODO(b/243518738): remove usages of XXXIfRegistered. // If the task fragments are not registered yet, the positions will be updated after they // are created again. resizeTaskFragmentIfRegistered(wct, primaryContainer, primaryRelBounds); @@ -357,7 +361,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { // When placeholder is shown in split, we should keep the focus on the primary. wct.requestFocusOnTaskFragment(primaryContainer.getTaskFragmentToken()); } - final int windowingMode = taskContainer.getWindowingModeForSplitTaskFragment( + final int windowingMode = taskContainer.getWindowingModeForTaskFragment( primaryRelBounds); updateTaskFragmentWindowingModeIfRegistered(wct, primaryContainer, windowingMode); updateTaskFragmentWindowingModeIfRegistered(wct, secondaryContainer, windowingMode); @@ -381,6 +385,13 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { setCompanionTaskFragment(wct, primaryContainer.getTaskFragmentToken(), secondaryContainer.getTaskFragmentToken(), splitRule, isStacked); + // Sets the dim area when the two TaskFragments are adjacent. + final boolean dimOnTask = !isStacked + && splitAttributes.getWindowAttributes().getDimArea() == DIM_AREA_ON_TASK + && Flags.fullscreenDimFlag(); + setTaskFragmentDimOnTask(wct, primaryContainer.getTaskFragmentToken(), dimOnTask); + setTaskFragmentDimOnTask(wct, secondaryContainer.getTaskFragmentToken(), dimOnTask); + // Setting isolated navigation and clear non-sticky pinned container if needed. final SplitPinRule splitPinRule = splitRule instanceof SplitPinRule ? (SplitPinRule) splitRule : null; @@ -398,13 +409,13 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { * Sets whether to enable isolated navigation for this {@link TaskFragmentContainer} */ void setTaskFragmentIsolatedNavigation(@NonNull WindowContainerTransaction wct, - @NonNull TaskFragmentContainer taskFragmentContainer, + @NonNull TaskFragmentContainer container, boolean isolatedNavigationEnabled) { - if (taskFragmentContainer.isIsolatedNavigationEnabled() == isolatedNavigationEnabled) { + if (container.isIsolatedNavigationEnabled() == isolatedNavigationEnabled) { return; } - taskFragmentContainer.setIsolatedNavigationEnabled(isolatedNavigationEnabled); - setTaskFragmentIsolatedNavigation(wct, taskFragmentContainer.getTaskFragmentToken(), + container.setIsolatedNavigationEnabled(isolatedNavigationEnabled); + setTaskFragmentIsolatedNavigation(wct, container.getTaskFragmentToken(), isolatedNavigationEnabled); } @@ -413,7 +424,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { * creation has not been reported from the server yet. */ // TODO(b/190433398): Handle resize if the fragment hasn't appeared yet. - private void resizeTaskFragmentIfRegistered(@NonNull WindowContainerTransaction wct, + @VisibleForTesting + void resizeTaskFragmentIfRegistered(@NonNull WindowContainerTransaction wct, @NonNull TaskFragmentContainer container, @Nullable Rect relBounds) { if (container.getInfo() == null) { @@ -422,7 +434,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { resizeTaskFragment(wct, container.getTaskFragmentToken(), relBounds); } - private void updateTaskFragmentWindowingModeIfRegistered( + @VisibleForTesting + void updateTaskFragmentWindowingModeIfRegistered( @NonNull WindowContainerTransaction wct, @NonNull TaskFragmentContainer container, @WindowingMode int windowingMode) { @@ -566,6 +579,72 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { super.setCompanionTaskFragment(wct, primary, secondary); } + void applyActivityStackAttributes( + @NonNull WindowContainerTransaction wct, + @NonNull TaskFragmentContainer container, + @NonNull ActivityStackAttributes attributes, + @Nullable Size minDimensions) { + final Rect taskBounds = container.getTaskContainer().getBounds(); + final Rect relativeBounds = sanitizeBounds(attributes.getRelativeBounds(), minDimensions, + taskBounds); + final boolean isFillParent = relativeBounds.isEmpty(); + final boolean isIsolatedNavigated = !isFillParent && container.isOverlay(); + final boolean dimOnTask = !isFillParent + && attributes.getWindowAttributes().getDimArea() == DIM_AREA_ON_TASK + && Flags.fullscreenDimFlag(); + final IBinder fragmentToken = container.getTaskFragmentToken(); + + // TODO(b/243518738): Update to resizeTaskFragment after we migrate WCT#setRelativeBounds + // and WCT#setWindowingMode to take fragmentToken. + resizeTaskFragmentIfRegistered(wct, container, relativeBounds); + int windowingMode = container.getTaskContainer().getWindowingModeForTaskFragment( + relativeBounds); + updateTaskFragmentWindowingModeIfRegistered(wct, container, windowingMode); + // Always use default animation for standalone ActivityStack. + updateAnimationParams(wct, fragmentToken, TaskFragmentAnimationParams.DEFAULT); + setTaskFragmentIsolatedNavigation(wct, container, isIsolatedNavigated); + setTaskFragmentDimOnTask(wct, fragmentToken, dimOnTask); + } + + /** + * Returns the expanded bounds if the {@code bounds} violate minimum dimension or are not fully + * covered by the task bounds. Otherwise, returns {@code bounds}. + */ + @NonNull + static Rect sanitizeBounds(@NonNull Rect bounds, @Nullable Size minDimension, + @NonNull Rect taskBounds) { + if (bounds.isEmpty()) { + // Don't need to check if the bounds follows the task bounds. + return bounds; + } + if (boundsSmallerThanMinDimensions(bounds, minDimension)) { + // Expand the bounds if the bounds are smaller than minimum dimensions. + return new Rect(); + } + if (!taskBounds.contains(bounds)) { + // Expand the bounds if the bounds exceed the task bounds. + return new Rect(); + } + return bounds; + } + + @Override + void setTaskFragmentDimOnTask(@NonNull WindowContainerTransaction wct, + @NonNull IBinder fragmentToken, boolean dimOnTask) { + final TaskFragmentContainer container = mController.getContainer(fragmentToken); + if (container == null) { + throw new IllegalStateException("setTaskFragmentDimOnTask on TaskFragment that is" + + " not registered with controller."); + } + + if (container.isLastDimOnTask() == dimOnTask) { + return; + } + + container.setLastDimOnTask(dimOnTask); + super.setTaskFragmentDimOnTask(wct, fragmentToken, dimOnTask); + } + /** * Expands the split container if the current split bounds are smaller than the Activity or * Intent that is added to the container. @@ -854,8 +933,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { return new SplitAttributes.Builder() .setSplitType(splitTypeToUpdate) .setLayoutDirection(splitAttributes.getLayoutDirection()) - // TODO(b/263047900): Update extensions API. - // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) + .setAnimationBackground(splitAttributes.getAnimationBackground()) .build(); } @@ -1084,4 +1162,15 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { WindowMetrics getTaskWindowMetrics(@NonNull Activity activity) { return getTaskProperties(activity).getTaskMetrics(); } + + @NonNull + ParentContainerInfo createParentContainerInfoFromTaskProperties( + @NonNull TaskProperties taskProperties) { + final Configuration configuration = taskProperties.getConfiguration(); + final WindowLayoutInfo windowLayoutInfo = mWindowLayoutComponent + .getCurrentWindowLayoutInfo(taskProperties.getDisplayId(), + configuration.windowConfiguration); + return new ParentContainerInfo(taskProperties.getTaskMetrics(), configuration, + windowLayoutInfo); + } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java index 028e75fe010f..73109e266905 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java @@ -126,6 +126,11 @@ class TaskContainer { } @NonNull + Rect getBounds() { + return mConfiguration.windowConfiguration.getBounds(); + } + + @NonNull TaskProperties getTaskProperties() { return new TaskProperties(mDisplayId, mConfiguration); } @@ -138,6 +143,21 @@ class TaskContainer { } /** + * Returns {@code true} if the container should be updated with {@code info}. + */ + boolean shouldUpdateContainer(@NonNull TaskFragmentParentInfo info) { + final Configuration configuration = info.getConfiguration(); + + return info.isVisible() + // No need to update presentation in PIP until the Task exit PIP. + && !isInPictureInPicture(configuration) + // If the task properties equals regardless of starting position, don't need to + // update the container. + && (mConfiguration.diffPublicOnly(configuration) != 0 + || mDisplayId != info.getDisplayId()); + } + + /** * Returns the windowing mode for the TaskFragments below this Task, which should be split with * other TaskFragments. * @@ -145,7 +165,7 @@ class TaskContainer { * the pair of TaskFragments are stacked due to the limited space. */ @WindowingMode - int getWindowingModeForSplitTaskFragment(@Nullable Rect taskFragmentBounds) { + int getWindowingModeForTaskFragment(@Nullable Rect taskFragmentBounds) { // Only set to multi-windowing mode if the pair are showing side-by-side. Otherwise, it // will be set to UNDEFINED which will then inherit the Task windowing mode. if (taskFragmentBounds == null || taskFragmentBounds.isEmpty() || isInPictureInPicture()) { @@ -161,7 +181,11 @@ class TaskContainer { } boolean isInPictureInPicture() { - return getWindowingMode() == WINDOWING_MODE_PINNED; + return isInPictureInPicture(mConfiguration); + } + + private static boolean isInPictureInPicture(@NonNull Configuration configuration) { + return configuration.windowConfiguration.getWindowingMode() == WINDOWING_MODE_PINNED; } boolean isInMultiWindow() { @@ -443,6 +467,26 @@ class TaskContainer { return splitStates; } + // TODO(b/317358445): Makes ActivityStack and SplitInfo callback more stable. + /** + * Returns a list of currently active {@link ActivityStack activityStacks}. + * + * @return a list of {@link ActivityStack activityStacks} if all the containers are in + * a stable state, or {@code null} otherwise. + */ + @Nullable + List<ActivityStack> getActivityStacksIfStable() { + final List<ActivityStack> activityStacks = new ArrayList<>(); + for (TaskFragmentContainer container : mContainers) { + final ActivityStack activityStack = container.toActivityStackIfStable(); + if (activityStack == null) { + return null; + } + activityStacks.add(activityStack); + } + return activityStacks; + } + /** A wrapper class which contains the information of {@link TaskContainer} */ static final class TaskProperties { private final int mDisplayId; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java index 3e7f99b96421..6fe8e50f105f 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java @@ -24,6 +24,7 @@ import android.app.WindowConfiguration.WindowingMode; import android.content.Intent; import android.graphics.Rect; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; import android.util.Size; import android.window.TaskFragmentAnimationParams; @@ -105,6 +106,13 @@ class TaskFragmentContainer { @Nullable private final String mOverlayTag; + /** + * The launch options that was used to create this container. Must not {@link Bundle#isEmpty()} + * for {@link #isOverlay()} container. + */ + @NonNull + private final Bundle mLaunchOptions = new Bundle(); + /** Indicates whether the container was cleaned up after the last activity was removed. */ private boolean mIsFinished; @@ -164,8 +172,13 @@ class TaskFragmentContainer { private boolean mIsIsolatedNavigationEnabled; /** + * Whether to apply dimming on the parent Task that was requested last. + */ + private boolean mLastDimOnTask; + + /** * @see #TaskFragmentContainer(Activity, Intent, TaskContainer, SplitController, - * TaskFragmentContainer, String) + * TaskFragmentContainer, String, Bundle) */ TaskFragmentContainer(@Nullable Activity pendingAppearedActivity, @Nullable Intent pendingAppearedIntent, @@ -173,7 +186,8 @@ class TaskFragmentContainer { @NonNull SplitController controller, @Nullable TaskFragmentContainer pairedPrimaryContainer) { this(pendingAppearedActivity, pendingAppearedIntent, taskContainer, - controller, pairedPrimaryContainer, null /* overlayTag */); + controller, pairedPrimaryContainer, null /* overlayTag */, + null /* launchOptions */); } /** @@ -181,11 +195,14 @@ class TaskFragmentContainer { * container transaction. * @param pairedPrimaryContainer when it is set, the new container will be add right above it * @param overlayTag Sets to indicate this taskFragment is an overlay container + * @param launchOptions The launch options to create this container. Must not be + * {@code null} for an overlay container */ TaskFragmentContainer(@Nullable Activity pendingAppearedActivity, @Nullable Intent pendingAppearedIntent, @NonNull TaskContainer taskContainer, @NonNull SplitController controller, - @Nullable TaskFragmentContainer pairedPrimaryContainer, @Nullable String overlayTag) { + @Nullable TaskFragmentContainer pairedPrimaryContainer, @Nullable String overlayTag, + @Nullable Bundle launchOptions) { if ((pendingAppearedActivity == null && pendingAppearedIntent == null) || (pendingAppearedActivity != null && pendingAppearedIntent != null)) { throw new IllegalArgumentException( @@ -195,6 +212,12 @@ class TaskFragmentContainer { mToken = new Binder("TaskFragmentContainer"); mTaskContainer = taskContainer; mOverlayTag = overlayTag; + if (overlayTag != null) { + Objects.requireNonNull(launchOptions); + } + if (launchOptions != null) { + mLaunchOptions.putAll(launchOptions); + } if (pairedPrimaryContainer != null) { // The TaskFragment will be positioned right above the paired container. @@ -344,7 +367,7 @@ class TaskFragmentContainer { if (activities == null) { return null; } - return new ActivityStack(activities, isEmpty(), mToken); + return new ActivityStack(activities, isEmpty(), mToken, mOverlayTag); } /** Adds the activity that will be reparented to this container. */ @@ -593,6 +616,9 @@ class TaskFragmentContainer { * Removes all activities that belong to this process and finishes other containers/activities * configured to finish together. */ + // Suppress GuardedBy warning because lint ask to mark this method as + // @GuardedBy(container.mController.mLock), which is mLock itself + @SuppressWarnings("GuardedBy") @GuardedBy("mController.mLock") void finish(boolean shouldFinishDependent, @NonNull SplitPresenter presenter, @NonNull WindowContainerTransaction wct, @NonNull SplitController controller) { @@ -818,6 +844,16 @@ class TaskFragmentContainer { mIsIsolatedNavigationEnabled = isolatedNavigationEnabled; } + /** Sets whether to apply dim on the parent Task. */ + void setLastDimOnTask(boolean lastDimOnTask) { + mLastDimOnTask = lastDimOnTask; + } + + /** Returns whether to apply dim on the parent Task. */ + boolean isLastDimOnTask() { + return mLastDimOnTask; + } + /** * Adds the pending appeared activity that has requested to be launched in this task fragment. * @see android.app.ActivityClient#isRequestedToLaunchInTaskFragment @@ -901,14 +937,25 @@ class TaskFragmentContainer { } /** - * Returns the tag specified in {@link OverlayCreateParams#getTag()}. {@code null} if this - * taskFragment container is not an overlay container. + * Returns the tag specified in launch options. {@code null} if this taskFragment container is + * not an overlay container. */ @Nullable String getOverlayTag() { return mOverlayTag; } + /** + * Returns the options that was used to launch this {@link TaskFragmentContainer}. + * {@link Bundle#isEmpty()} means there's no launch option for this container. + * <p> + * Note that WM Jetpack owns the logic. The WM Extension library must not modify this object. + */ + @NonNull + Bundle getLaunchOptions() { + return mLaunchOptions; + } + @Override public String toString() { return toString(true /* includeContainersToFinishOnExit */); diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TransactionManager.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TransactionManager.java index 396956e56bb5..6624c703f027 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TransactionManager.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TransactionManager.java @@ -77,9 +77,11 @@ class TransactionManager { @NonNull TransactionRecord startNewTransaction(@Nullable IBinder taskFragmentTransactionToken) { if (mCurrentTransaction != null) { + final TransactionRecord lastTransaction = mCurrentTransaction; mCurrentTransaction = null; throw new IllegalStateException( - "The previous transaction has not been applied or aborted,"); + "The previous transaction:" + lastTransaction + " has not been applied or " + + "aborted."); } mCurrentTransaction = new TransactionRecord(taskFragmentTransactionToken); return mCurrentTransaction; @@ -199,5 +201,15 @@ class TransactionManager { ? mOriginType : TASK_FRAGMENT_TRANSIT_CHANGE; } + + @Override + @NonNull + public String toString() { + return TransactionRecord.class.getSimpleName() + "{" + + "token=" + mTaskFragmentTransactionToken + + ", type=" + getTransactionTransitionType() + + ", transaction=" + mTransaction + + "}"; + } } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java index 9b84a48cdbda..6e704f35fb22 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java @@ -356,7 +356,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { } if (featureRect.left == 0 && featureRect.width() != windowConfiguration.getBounds().width()) { - Log.wtf(TAG, "Horizontal FoldingFeature must have full width." + Log.w(TAG, "Horizontal FoldingFeature must have full width." + " BaseFeatureRect: " + baseFeature.getRect() + ", FeatureRect: " + featureRect + ", WindowConfiguration: " + windowConfiguration); @@ -364,7 +364,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { } if (featureRect.top == 0 && featureRect.height() != windowConfiguration.getBounds().height()) { - Log.wtf(TAG, "Vertical FoldingFeature must have full height." + Log.w(TAG, "Vertical FoldingFeature must have full height." + " BaseFeatureRect: " + baseFeature.getRect() + ", FeatureRect: " + featureRect + ", WindowConfiguration: " + windowConfiguration); diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java index 60beb0b7f0a4..f471af052bf2 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java @@ -25,6 +25,7 @@ import android.platform.test.annotations.Presubmit; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import androidx.window.extensions.embedding.AnimationBackground; import androidx.window.extensions.embedding.SplitAttributes; import org.junit.Before; @@ -70,7 +71,7 @@ public class WindowExtensionsTest { .isEqualTo(SplitAttributes.LayoutDirection.LOCALE); assertThat(splitAttributes.getSplitType()) .isEqualTo(new SplitAttributes.SplitType.RatioSplitType(0.5f)); - // TODO(b/263047900): Update extensions API. - // assertThat(splitAttributes.getAnimationBackgroundColor()).isEqualTo(0); + assertThat(splitAttributes.getAnimationBackground()) + .isEqualTo(AnimationBackground.ANIMATION_BACKGROUND_DEFAULT); } } diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/OverlayPresentationTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/OverlayPresentationTest.java index 4c2433fab2f8..34d43ad56bb4 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/OverlayPresentationTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/OverlayPresentationTest.java @@ -16,16 +16,17 @@ package androidx.window.extensions.embedding; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.view.Display.DEFAULT_DISPLAY; +import static androidx.window.extensions.embedding.ActivityEmbeddingOptionsProperties.KEY_OVERLAY_TAG; import static androidx.window.extensions.embedding.EmbeddingTestUtils.TASK_BOUNDS; import static androidx.window.extensions.embedding.EmbeddingTestUtils.TASK_ID; +import static androidx.window.extensions.embedding.EmbeddingTestUtils.TEST_TAG; import static androidx.window.extensions.embedding.EmbeddingTestUtils.createMockTaskFragmentInfo; import static androidx.window.extensions.embedding.EmbeddingTestUtils.createSplitPairRuleBuilder; -import static androidx.window.extensions.embedding.OverlayCreateParams.KEY_OVERLAY_CREATE_PARAMS; -import static androidx.window.extensions.embedding.OverlayCreateParams.KEY_OVERLAY_CREATE_PARAMS_BOUNDS; -import static androidx.window.extensions.embedding.OverlayCreateParams.KEY_OVERLAY_CREATE_PARAMS_TAG; -import static androidx.window.extensions.embedding.OverlayCreateParams.KEY_OVERLAY_CREATE_PARAMS_TASK_ID; +import static androidx.window.extensions.embedding.WindowAttributes.DIM_AREA_ON_TASK; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; @@ -38,13 +39,13 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import android.app.Activity; +import android.app.ActivityOptions; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -57,6 +58,8 @@ import android.os.Handler; import android.os.IBinder; import android.platform.test.annotations.Presubmit; import android.platform.test.flag.junit.SetFlagsRule; +import android.util.Size; +import android.window.TaskFragmentAnimationParams; import android.window.TaskFragmentInfo; import android.window.TaskFragmentParentInfo; import android.window.WindowContainerTransaction; @@ -98,9 +101,6 @@ public class OverlayPresentationTest { @Rule public final SetFlagsRule mSetFlagRule = new SetFlagsRule(); - private static final OverlayCreateParams TEST_OVERLAY_CREATE_PARAMS = - new OverlayCreateParams(TASK_ID, "test,", new Rect(0, 0, 200, 200)); - private SplitController.ActivityStartMonitor mMonitor; private Intent mIntent; @@ -165,37 +165,15 @@ public class OverlayPresentationTest { } @Test - public void testOverlayCreateParamsFromBundle() { - assertThat(OverlayCreateParams.fromBundle(new Bundle())).isNull(); - - assertThat(OverlayCreateParams.fromBundle(createOverlayCreateParamsTestBundle())) - .isEqualTo(TEST_OVERLAY_CREATE_PARAMS); - } - - @Test public void testStartActivity_overlayFeatureDisabled_notInvokeCreateOverlayContainer() { mSetFlagRule.disableFlags(Flags.FLAG_ACTIVITY_EMBEDDING_OVERLAY_PRESENTATION_FLAG); - mMonitor.onStartActivity(mActivity, mIntent, createOverlayCreateParamsTestBundle()); + final Bundle optionsBundle = ActivityOptions.makeBasic().toBundle(); + optionsBundle.putString(KEY_OVERLAY_TAG, "test"); + mMonitor.onStartActivity(mActivity, mIntent, optionsBundle); verify(mSplitController, never()).createOrUpdateOverlayTaskFragmentIfNeeded(any(), any(), - anyInt(), any(), any()); - } - - @NonNull - private static Bundle createOverlayCreateParamsTestBundle() { - final Bundle bundle = new Bundle(); - - final Bundle paramsBundle = new Bundle(); - paramsBundle.putInt(KEY_OVERLAY_CREATE_PARAMS_TASK_ID, - TEST_OVERLAY_CREATE_PARAMS.getTaskId()); - paramsBundle.putString(KEY_OVERLAY_CREATE_PARAMS_TAG, TEST_OVERLAY_CREATE_PARAMS.getTag()); - paramsBundle.putObject(KEY_OVERLAY_CREATE_PARAMS_BOUNDS, - TEST_OVERLAY_CREATE_PARAMS.getBounds()); - - bundle.putBundle(KEY_OVERLAY_CREATE_PARAMS, paramsBundle); - - return bundle; + any(), any()); } @Test @@ -221,19 +199,11 @@ public class OverlayPresentationTest { } @Test - public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_taskIdNotMatch_throwException() { - assertThrows("The method must return null due to task mismatch between" - + " launchingActivity and OverlayCreateParams", IllegalArgumentException.class, - () -> createOrUpdateOverlayTaskFragmentIfNeeded( - TEST_OVERLAY_CREATE_PARAMS, TASK_ID + 1)); - } - - @Test public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_anotherTagInTask_dismissOverlay() { createExistingOverlayContainers(); - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - new OverlayCreateParams(TASK_ID, "test3", new Rect(0, 0, 100, 100)), TASK_ID); + final TaskFragmentContainer overlayContainer = + createOrUpdateOverlayTaskFragmentIfNeeded("test3"); assertWithMessage("overlayContainer1 must be dismissed since the new overlay container" + " is launched to the same task") @@ -245,9 +215,9 @@ public class OverlayPresentationTest { public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_sameTagAnotherTask_dismissOverlay() { createExistingOverlayContainers(); - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - new OverlayCreateParams(TASK_ID + 2, "test1", new Rect(0, 0, 100, 100)), - TASK_ID + 2); + doReturn(TASK_ID + 2).when(mActivity).getTaskId(); + final TaskFragmentContainer overlayContainer = + createOrUpdateOverlayTaskFragmentIfNeeded("test1"); assertWithMessage("overlayContainer1 must be dismissed since the new overlay container" + " is launched with the same tag as an existing overlay container in a different " @@ -261,9 +231,10 @@ public class OverlayPresentationTest { createExistingOverlayContainers(); final Rect bounds = new Rect(0, 0, 100, 100); + mSplitController.setActivityStackAttributesCalculator(params -> + new ActivityStackAttributes.Builder().setRelativeBounds(bounds).build()); final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - new OverlayCreateParams(TASK_ID, "test1", bounds), - TASK_ID); + "test1"); assertWithMessage("overlayContainer1 must be updated since the new overlay container" + " is launched with the same tag and task") @@ -279,9 +250,8 @@ public class OverlayPresentationTest { public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_dismissMultipleOverlays() { createExistingOverlayContainers(); - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - new OverlayCreateParams(TASK_ID, "test2", new Rect(0, 0, 100, 100)), - TASK_ID); + final TaskFragmentContainer overlayContainer = + createOrUpdateOverlayTaskFragmentIfNeeded("test2"); // OverlayContainer1 is dismissed since new container is launched in the same task with // different tag. OverlayContainer2 is dismissed since new container is launched with the @@ -300,70 +270,37 @@ public class OverlayPresentationTest { } @Test - public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_smallerThanMinDimens_expandOverlay() { + public void testSanitizeBounds_smallerThanMinDimens_expandOverlay() { mIntent.setComponent(new ComponentName(ApplicationProvider.getApplicationContext(), MinimumDimensionActivity.class)); + final Rect bounds = new Rect(0, 0, 100, 100); - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - TEST_OVERLAY_CREATE_PARAMS, TASK_ID); - final IBinder overlayToken = overlayContainer.getTaskFragmentToken(); - - assertThat(mSplitController.getAllOverlayTaskFragmentContainers()) - .containsExactly(overlayContainer); - assertThat(overlayContainer.areLastRequestedBoundsEqual(new Rect())).isTrue(); - verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, overlayToken, - false); - - // Call createOrUpdateOverlayTaskFragmentIfNeeded again to check the update case. - clearInvocations(mSplitPresenter); - createOrUpdateOverlayTaskFragmentIfNeeded(TEST_OVERLAY_CREATE_PARAMS, TASK_ID); - - verify(mSplitPresenter).resizeTaskFragment(mTransaction, overlayToken, new Rect()); - verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, overlayToken, - false); - assertThat(mSplitController.getAllOverlayTaskFragmentContainers()) - .containsExactly(overlayContainer); + SplitPresenter.sanitizeBounds(bounds, SplitPresenter.getMinDimensions(mIntent), + TASK_BOUNDS); } @Test - public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_notInTaskBounds_expandOverlay() { + public void testSanitizeBounds_notInTaskBounds_expandOverlay() { final Rect bounds = new Rect(TASK_BOUNDS); bounds.offset(10, 10); - final OverlayCreateParams paramsOutsideTaskBounds = new OverlayCreateParams(TASK_ID, - "test", bounds); - - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - paramsOutsideTaskBounds, TASK_ID); - final IBinder overlayToken = overlayContainer.getTaskFragmentToken(); - - assertThat(mSplitController.getAllOverlayTaskFragmentContainers()) - .containsExactly(overlayContainer); - assertThat(overlayContainer.areLastRequestedBoundsEqual(new Rect())).isTrue(); - verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, overlayToken, - false); - - // Call createOrUpdateOverlayTaskFragmentIfNeeded again to check the update case. - clearInvocations(mSplitPresenter); - createOrUpdateOverlayTaskFragmentIfNeeded(paramsOutsideTaskBounds, TASK_ID); - verify(mSplitPresenter).resizeTaskFragment(mTransaction, overlayToken, new Rect()); - verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, overlayToken, - false); - assertThat(mSplitController.getAllOverlayTaskFragmentContainers()) - .containsExactly(overlayContainer); + SplitPresenter.sanitizeBounds(bounds, null, TASK_BOUNDS); } @Test public void testCreateOrUpdateOverlayTaskFragmentIfNeeded_createOverlay() { - final TaskFragmentContainer overlayContainer = createOrUpdateOverlayTaskFragmentIfNeeded( - TEST_OVERLAY_CREATE_PARAMS, TASK_ID); + final Rect bounds = new Rect(0, 0, 100, 100); + mSplitController.setActivityStackAttributesCalculator(params -> + new ActivityStackAttributes.Builder().setRelativeBounds(bounds).build()); + final TaskFragmentContainer overlayContainer = + createOrUpdateOverlayTaskFragmentIfNeeded("test"); + setupTaskFragmentInfo(overlayContainer, mActivity); assertThat(mSplitController.getAllOverlayTaskFragmentContainers()) .containsExactly(overlayContainer); assertThat(overlayContainer.getTaskId()).isEqualTo(TASK_ID); - assertThat(overlayContainer - .areLastRequestedBoundsEqual(TEST_OVERLAY_CREATE_PARAMS.getBounds())).isTrue(); - assertThat(overlayContainer.getOverlayTag()).isEqualTo(TEST_OVERLAY_CREATE_PARAMS.getTag()); + assertThat(overlayContainer.areLastRequestedBoundsEqual(bounds)).isTrue(); + assertThat(overlayContainer.getOverlayTag()).isEqualTo("test"); } @Test @@ -416,12 +353,14 @@ public class OverlayPresentationTest { @Test public void testGetTopNonFinishingActivityWithOverlay() { - createTestOverlayContainer(TASK_ID, "test1"); + TaskFragmentContainer overlayContainer = createTestOverlayContainer(TASK_ID, "test1"); + final Activity activity = createMockActivity(); final TaskFragmentContainer container = createMockTaskFragmentContainer(activity); final TaskContainer task = container.getTaskContainer(); - assertThat(task.getTopNonFinishingActivity(true /* includeOverlay */)).isEqualTo(mActivity); + assertThat(task.getTopNonFinishingActivity(true /* includeOverlay */)) + .isEqualTo(overlayContainer.getTopNonFinishingActivity()); assertThat(task.getTopNonFinishingActivity(false /* includeOverlay */)).isEqualTo(activity); } @@ -453,15 +392,193 @@ public class OverlayPresentationTest { .that(taskContainer.getTaskFragmentContainers()).isEmpty(); } + @Test + public void testUpdateActivityStackAttributes_nullParams_throwException() { + assertThrows(NullPointerException.class, () -> + mSplitController.updateActivityStackAttributes(null, + new ActivityStackAttributes.Builder().build())); + + assertThrows(NullPointerException.class, () -> + mSplitController.updateActivityStackAttributes(new Binder(), null)); + + verify(mSplitPresenter, never()).applyActivityStackAttributes(any(), any(), any(), any()); + } + + @Test + public void testUpdateActivityStackAttributes_nullContainer_earlyReturn() { + final TaskFragmentContainer container = mSplitController.newContainer(mActivity, + mActivity.getTaskId()); + mSplitController.updateActivityStackAttributes(container.getTaskFragmentToken(), + new ActivityStackAttributes.Builder().build()); + + verify(mSplitPresenter, never()).applyActivityStackAttributes(any(), any(), any(), any()); + } + + @Test + public void testUpdateActivityStackAttributes_notOverlay_earlyReturn() { + final TaskFragmentContainer container = createMockTaskFragmentContainer(mActivity); + + mSplitController.updateActivityStackAttributes(container.getTaskFragmentToken(), + new ActivityStackAttributes.Builder().build()); + + verify(mSplitPresenter, never()).applyActivityStackAttributes(any(), any(), any(), any()); + } + + @Test + public void testUpdateActivityStackAttributes() { + final TaskFragmentContainer container = createTestOverlayContainer(TASK_ID, "test"); + doNothing().when(mSplitPresenter).applyActivityStackAttributes(any(), any(), any(), any()); + final ActivityStackAttributes attrs = new ActivityStackAttributes.Builder().build(); + final IBinder token = container.getTaskFragmentToken(); + + mSplitController.updateActivityStackAttributes(token, attrs); + + verify(mSplitPresenter).applyActivityStackAttributes(any(), eq(container), eq(attrs), + any()); + } + + @Test + public void testOnTaskFragmentParentInfoChanged_positionOnlyChange_earlyReturn() { + final TaskFragmentContainer overlayContainer = createTestOverlayContainer(TASK_ID, "test"); + final TaskContainer taskContainer = overlayContainer.getTaskContainer(); + + assertThat(taskContainer.getOverlayContainer()).isEqualTo(overlayContainer); + + spyOn(taskContainer); + final TaskContainer.TaskProperties taskProperties = taskContainer.getTaskProperties(); + final TaskFragmentParentInfo parentInfo = new TaskFragmentParentInfo( + new Configuration(taskProperties.getConfiguration()), taskProperties.getDisplayId(), + true /* visible */, false /* hasDirectActivity */, null /* decorSurface */); + parentInfo.getConfiguration().windowConfiguration.getBounds().offset(10, 10); + + mSplitController.onTaskFragmentParentInfoChanged(mTransaction, TASK_ID, parentInfo); + + // The parent info must be applied to the task container + verify(taskContainer).updateTaskFragmentParentInfo(parentInfo); + verify(mSplitController, never()).updateContainer(any(), any()); + + assertWithMessage("The overlay container must still be dismissed even if " + + "#updateContainer is not called") + .that(taskContainer.getOverlayContainer()).isNull(); + } + + @Test + public void testOnTaskFragmentParentInfoChanged_invisibleTask_callDismissOverlayContainer() { + final TaskFragmentContainer overlayContainer = createTestOverlayContainer(TASK_ID, "test"); + final TaskContainer taskContainer = overlayContainer.getTaskContainer(); + + assertThat(taskContainer.getOverlayContainer()).isEqualTo(overlayContainer); + + spyOn(taskContainer); + final TaskContainer.TaskProperties taskProperties = taskContainer.getTaskProperties(); + final TaskFragmentParentInfo parentInfo = new TaskFragmentParentInfo( + new Configuration(taskProperties.getConfiguration()), taskProperties.getDisplayId(), + false /* visible */, false /* hasDirectActivity */, null /* decorSurface */); + + mSplitController.onTaskFragmentParentInfoChanged(mTransaction, TASK_ID, parentInfo); + + // The parent info must be applied to the task container + verify(taskContainer).updateTaskFragmentParentInfo(parentInfo); + verify(mSplitController, never()).updateContainer(any(), any()); + + assertWithMessage("The overlay container must still be dismissed even if " + + "#updateContainer is not called") + .that(taskContainer.getOverlayContainer()).isNull(); + } + + @Test + public void testApplyActivityStackAttributesForExpandedContainer() { + final TaskFragmentContainer container = createMockTaskFragmentContainer(mActivity); + final IBinder token = container.getTaskFragmentToken(); + final ActivityStackAttributes attributes = new ActivityStackAttributes.Builder().build(); + + mSplitPresenter.applyActivityStackAttributes(mTransaction, container, attributes, + null /* minDimensions */); + + verify(mSplitPresenter).resizeTaskFragmentIfRegistered(mTransaction, container, + attributes.getRelativeBounds()); + verify(mSplitPresenter).updateTaskFragmentWindowingModeIfRegistered(mTransaction, container, + WINDOWING_MODE_UNDEFINED); + verify(mSplitPresenter).updateAnimationParams(mTransaction, token, + TaskFragmentAnimationParams.DEFAULT); + verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, container, false); + verify(mSplitPresenter).setTaskFragmentDimOnTask(mTransaction, token, false); + } + + @Test + public void testApplyActivityStackAttributesForOverlayContainer() { + final TaskFragmentContainer container = createTestOverlayContainer(TASK_ID, TEST_TAG); + final IBinder token = container.getTaskFragmentToken(); + final ActivityStackAttributes attributes = new ActivityStackAttributes.Builder() + .setRelativeBounds(new Rect(0, 0, 200, 200)) + .setWindowAttributes(new WindowAttributes(DIM_AREA_ON_TASK)) + .build(); + + mSplitPresenter.applyActivityStackAttributes(mTransaction, container, attributes, + null /* minDimensions */); + + verify(mSplitPresenter).resizeTaskFragmentIfRegistered(mTransaction, container, + attributes.getRelativeBounds()); + verify(mSplitPresenter).updateTaskFragmentWindowingModeIfRegistered(mTransaction, container, + WINDOWING_MODE_MULTI_WINDOW); + verify(mSplitPresenter).updateAnimationParams(mTransaction, token, + TaskFragmentAnimationParams.DEFAULT); + verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, container, true); + verify(mSplitPresenter).setTaskFragmentDimOnTask(mTransaction, token, true); + } + + @Test + public void testApplyActivityStackAttributesForExpandedOverlayContainer() { + final TaskFragmentContainer container = createTestOverlayContainer(TASK_ID, TEST_TAG); + final IBinder token = container.getTaskFragmentToken(); + final ActivityStackAttributes attributes = new ActivityStackAttributes.Builder().build(); + + mSplitPresenter.applyActivityStackAttributes(mTransaction, container, attributes, + null /* minDimensions */); + + verify(mSplitPresenter).resizeTaskFragmentIfRegistered(mTransaction, container, + attributes.getRelativeBounds()); + verify(mSplitPresenter).updateTaskFragmentWindowingModeIfRegistered(mTransaction, container, + WINDOWING_MODE_UNDEFINED); + verify(mSplitPresenter).updateAnimationParams(mTransaction, token, + TaskFragmentAnimationParams.DEFAULT); + verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, container, false); + verify(mSplitPresenter).setTaskFragmentDimOnTask(mTransaction, token, false); + } + + @Test + public void testApplyActivityStackAttributesForOverlayContainer_exceedsMinDimensions() { + final TaskFragmentContainer container = createTestOverlayContainer(TASK_ID, TEST_TAG); + final IBinder token = container.getTaskFragmentToken(); + final Rect relativeBounds = new Rect(0, 0, 200, 200); + final ActivityStackAttributes attributes = new ActivityStackAttributes.Builder() + .setRelativeBounds(relativeBounds) + .setWindowAttributes(new WindowAttributes(DIM_AREA_ON_TASK)) + .build(); + + mSplitPresenter.applyActivityStackAttributes(mTransaction, container, attributes, + new Size(relativeBounds.width() + 1, relativeBounds.height())); + + verify(mSplitPresenter).resizeTaskFragmentIfRegistered(mTransaction, container, + new Rect()); + verify(mSplitPresenter).updateTaskFragmentWindowingModeIfRegistered(mTransaction, container, + WINDOWING_MODE_UNDEFINED); + verify(mSplitPresenter).updateAnimationParams(mTransaction, token, + TaskFragmentAnimationParams.DEFAULT); + verify(mSplitPresenter).setTaskFragmentIsolatedNavigation(mTransaction, container, false); + verify(mSplitPresenter).setTaskFragmentDimOnTask(mTransaction, token, false); + } + /** * A simplified version of {@link SplitController.ActivityStartMonitor * #createOrUpdateOverlayTaskFragmentIfNeeded} */ @Nullable - private TaskFragmentContainer createOrUpdateOverlayTaskFragmentIfNeeded( - @NonNull OverlayCreateParams params, int taskId) { - return mSplitController.createOrUpdateOverlayTaskFragmentIfNeeded(mTransaction, params, - taskId, mIntent, mActivity); + private TaskFragmentContainer createOrUpdateOverlayTaskFragmentIfNeeded(@NonNull String tag) { + final Bundle launchOptions = new Bundle(); + launchOptions.putString(KEY_OVERLAY_TAG, tag); + return mSplitController.createOrUpdateOverlayTaskFragmentIfNeeded(mTransaction, + launchOptions, mIntent, mActivity); } /** Creates a mock TaskFragment that has been registered and appeared in the organizer. */ @@ -475,10 +592,11 @@ public class OverlayPresentationTest { @NonNull private TaskFragmentContainer createTestOverlayContainer(int taskId, @NonNull String tag) { + Activity activity = createMockActivity(); TaskFragmentContainer overlayContainer = mSplitController.newContainer( - null /* pendingAppearedActivity */, mIntent, mActivity, taskId, - null /* pairedPrimaryContainer */, tag); - setupTaskFragmentInfo(overlayContainer, mActivity); + null /* pendingAppearedActivity */, mIntent, activity, taskId, + null /* pairedPrimaryContainer */, tag, Bundle.EMPTY); + setupTaskFragmentInfo(overlayContainer, activity); return overlayContainer; } diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java index 8c274a26177d..b60943a60076 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java @@ -354,7 +354,7 @@ public class SplitControllerTest { bundle.putBinder(ActivityOptions.KEY_LAUNCH_TASK_FRAGMENT_TOKEN, container.getTaskFragmentToken()); monitor.mCurrentIntent = intent; - doReturn(container).when(mSplitController).getContainer(any()); + doReturn(container).when(mSplitController).getContainer(any(IBinder.class)); monitor.onStartActivityResult(START_CANCELED, bundle); assertNull(container.getPendingAppearedIntent()); @@ -590,7 +590,7 @@ public class SplitControllerTest { assertFalse(result); verify(mSplitController, never()).newContainer(any(), any(), any(), anyInt(), any(), - anyString()); + anyString(), any()); } @Test @@ -753,7 +753,7 @@ public class SplitControllerTest { assertTrue(result); verify(mSplitController, never()).newContainer(any(), any(), any(), anyInt(), any(), - anyString()); + anyString(), any()); verify(mSplitController, never()).registerSplit(any(), any(), any(), any(), any(), any()); } @@ -796,7 +796,7 @@ public class SplitControllerTest { assertTrue(result); verify(mSplitController, never()).newContainer(any(), any(), any(), anyInt(), any(), - anyString()); + anyString(), any()); verify(mSplitController, never()).registerSplit(any(), any(), any(), any(), any(), any()); } @@ -1642,7 +1642,7 @@ public class SplitControllerTest { // We need to set those in case we are not respecting clear top. // TODO(b/231845476) we should always respect clearTop. final int windowingMode = mSplitController.getTaskContainer(primaryContainer.getTaskId()) - .getWindowingModeForSplitTaskFragment(TASK_BOUNDS); + .getWindowingModeForTaskFragment(TASK_BOUNDS); primaryContainer.setLastRequestedWindowingMode(windowingMode); secondaryContainer.setLastRequestedWindowingMode(windowingMode); primaryContainer.setLastRequestedBounds(getSplitBounds(true /* isPrimary */)); diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java index 6981d9d7ebb8..941b4e1c3e41 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java @@ -235,6 +235,19 @@ public class SplitPresenterTest { } @Test + public void testSetTaskFragmentDimOnTask() { + final TaskFragmentContainer container = mController.newContainer(mActivity, TASK_ID); + + mPresenter.setTaskFragmentDimOnTask(mTransaction, container.getTaskFragmentToken(), true); + verify(mTransaction).addTaskFragmentOperation(eq(container.getTaskFragmentToken()), any()); + + // No request to set the same adjacent TaskFragments. + clearInvocations(mTransaction); + mPresenter.setTaskFragmentDimOnTask(mTransaction, container.getTaskFragmentToken(), true); + verify(mTransaction, never()).addTaskFragmentOperation(any(), any()); + } + + @Test public void testUpdateAnimationParams() { final TaskFragmentContainer container = mController.newContainer(mActivity, TASK_ID); diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java index 7b77235f66f7..a5995a3027ac 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java @@ -75,7 +75,7 @@ public class TaskContainerTest { final Configuration configuration = new Configuration(); assertEquals(WINDOWING_MODE_MULTI_WINDOW, - taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + taskContainer.getWindowingModeForTaskFragment(splitBounds)); configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); taskContainer.updateTaskFragmentParentInfo(new TaskFragmentParentInfo(configuration, @@ -83,7 +83,7 @@ public class TaskContainerTest { null /* decorSurface */)); assertEquals(WINDOWING_MODE_MULTI_WINDOW, - taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + taskContainer.getWindowingModeForTaskFragment(splitBounds)); configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); taskContainer.updateTaskFragmentParentInfo(new TaskFragmentParentInfo(configuration, @@ -91,12 +91,12 @@ public class TaskContainerTest { null /* decorSurface */)); assertEquals(WINDOWING_MODE_FREEFORM, - taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + taskContainer.getWindowingModeForTaskFragment(splitBounds)); // Empty bounds means the split pair are stacked, so it should be UNDEFINED which will then // inherit the Task windowing mode assertEquals(WINDOWING_MODE_UNDEFINED, - taskContainer.getWindowingModeForSplitTaskFragment(new Rect())); + taskContainer.getWindowingModeForTaskFragment(new Rect())); } @Test diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 5ad144d50b87..a12fa5fe26ff 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -39,6 +39,7 @@ filegroup { } // Sources that have no dependencies that can be used directly downstream of this library +// TODO(b/322791067): move these sources to WindowManager-Shell-shared filegroup { name: "wm_shell_util-sources", srcs: [ @@ -137,6 +138,12 @@ java_library { }, } +java_library { + name: "WindowManager-Shell-shared", + + srcs: ["shared/**/*.java"], +} + android_library { name: "WindowManager-Shell", srcs: [ @@ -162,6 +169,8 @@ android_library { "com_android_wm_shell_flags_lib", "com.android.window.flags.window-aconfig-java", "WindowManager-Shell-proto", + "WindowManager-Shell-shared", + "perfetto_trace_java_protos", "dagger2", "jsr330", ], @@ -175,3 +184,74 @@ android_library { plugins: ["dagger2-compiler"], use_resource_processor: true, } + +android_app { + name: "WindowManagerShellRobolectric", + platform_apis: true, + static_libs: [ + "WindowManager-Shell", + ], + manifest: "multivalentTests/AndroidManifestRobolectric.xml", + use_resource_processor: true, +} + +android_robolectric_test { + name: "WMShellRobolectricTests", + instrumentation_for: "WindowManagerShellRobolectric", + upstream: true, + java_resource_dirs: [ + "multivalentTests/robolectric/config", + ], + srcs: [ + "multivalentTests/src/**/*.kt", + ], + static_libs: [ + "junit", + "androidx.test.runner", + "androidx.test.rules", + "androidx.test.ext.junit", + "mockito-robolectric-prebuilt", + "mockito-kotlin2", + "truth", + ], +} + +android_test { + name: "WMShellMultivalentTestsOnDevice", + srcs: [ + "multivalentTests/src/**/*.kt", + ], + static_libs: [ + "WindowManager-Shell", + "junit", + "androidx.test.runner", + "androidx.test.rules", + "androidx.test.ext.junit", + "frameworks-base-testutils", + "mockito-kotlin2", + "mockito-target-extended-minus-junit4", + "truth", + "platform-test-annotations", + "platform-test-rules", + ], + libs: [ + "android.test.base", + "android.test.runner", + ], + jni_libs: [ + "libdexmakerjvmtiagent", + "libstaticjvmtiagent", + ], + kotlincflags: ["-Xjvm-default=all"], + optimize: { + enabled: false, + }, + test_suites: ["device-tests"], + platform_apis: true, + certificate: "platform", + aaptflags: [ + "--extra-packages", + "com.android.wm.shell", + ], + manifest: "multivalentTests/AndroidManifest.xml", +} diff --git a/libs/WindowManager/Shell/OWNERS b/libs/WindowManager/Shell/OWNERS index e346b51a4f19..0c4fd140780e 100644 --- a/libs/WindowManager/Shell/OWNERS +++ b/libs/WindowManager/Shell/OWNERS @@ -2,3 +2,4 @@ xutan@google.com # Give submodule owners in shell resource approval per-file res*/*/*.xml = atsjenk@google.com, hwwang@google.com, jorgegil@google.com, lbill@google.com, madym@google.com, nmusgrave@google.com, pbdr@google.com, tkachenkoi@google.com +per-file res*/*/tv_*.xml = bronger@google.com diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig index 4511f3b91c5c..9a66c0fa9eb9 100644 --- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig +++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig @@ -1,13 +1,6 @@ package: "com.android.wm.shell" flag { - name: "example_flag" - namespace: "multitasking" - description: "An Example Flag" - bug: "300136750" -} - -flag { name: "enable_app_pairs" namespace: "multitasking" description: "Enables the ability to create and save app pairs to the Home screen" @@ -37,13 +30,6 @@ flag { } flag { - name: "enable_pip_ui_state_on_entering" - namespace: "multitasking" - description: "Enables PiP UI state callback on entering" - bug: "303718131" -} - -flag { name: "enable_pip2_implementation" namespace: "multitasking" description: "Enables the new implementation of PiP (PiP2)" @@ -57,3 +43,24 @@ flag { description: "Enables left/right split in portrait" bug: "291018646" } + +flag { + name: "enable_new_bubble_animations" + namespace: "multitasking" + description: "Enables new animations for expand and collapse for bubbles" + bug: "311450609" +} + +flag { + name: "enable_pip_umo_experience" + namespace: "multitasking" + description: "Enables new UMO experience for PiP menu" + bug: "307998712" +} + +flag { + name: "enable_bubble_bar" + namespace: "multitasking" + description: "Enables the new bubble bar UI for tablets" + bug: "286246694" +} diff --git a/libs/WindowManager/Shell/multivalentTests/AndroidManifest.xml b/libs/WindowManager/Shell/multivalentTests/AndroidManifest.xml new file mode 100644 index 000000000000..f8f8338e5f04 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/AndroidManifest.xml @@ -0,0 +1,13 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.multivalenttests"> + + <application android:debuggable="true" android:supportsRtl="true" > + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation + android:name="androidx.test.runner.AndroidJUnitRunner" + android:label="Multivalent tests for WindowManager-Shell" + android:targetPackage="com.android.wm.shell.multivalenttests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/multivalentTests/AndroidManifestRobolectric.xml b/libs/WindowManager/Shell/multivalentTests/AndroidManifestRobolectric.xml new file mode 100644 index 000000000000..ffcd7d46fbae --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/AndroidManifestRobolectric.xml @@ -0,0 +1,3 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell.multivalenttests"> +</manifest> diff --git a/libs/WindowManager/Shell/multivalentTests/AndroidTest.xml b/libs/WindowManager/Shell/multivalentTests/AndroidTest.xml new file mode 100644 index 000000000000..36fe8ec3370d --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/AndroidTest.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> +<configuration description="Runs Tests for WindowManagerShellLib"> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="install-arg" value="-t" /> + <option name="test-file-name" value="WMShellMultivalentTestsOnDevice.apk" /> + </target_preparer> + + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="framework-base-presubmit" /> + <option name="test-tag" value="WMShellMultivalentTestsOnDevice" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.wm.shell.multivalenttests" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> + <option name="hidden-api-checks" value="false"/> + </test> +</configuration> diff --git a/libs/WindowManager/Shell/multivalentTests/OWNERS b/libs/WindowManager/Shell/multivalentTests/OWNERS new file mode 100644 index 000000000000..24c1a3a6d400 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/OWNERS @@ -0,0 +1,4 @@ +atsjenk@google.com +liranb@google.com +madym@google.com + diff --git a/libs/WindowManager/Shell/multivalentTests/robolectric/config/robolectric.properties b/libs/WindowManager/Shell/multivalentTests/robolectric/config/robolectric.properties new file mode 100644 index 000000000000..7a0527ccaafb --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/robolectric/config/robolectric.properties @@ -0,0 +1,2 @@ +sdk=NEWEST_SDK + diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt new file mode 100644 index 000000000000..5825bbfbfefa --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt @@ -0,0 +1,500 @@ +/* + * 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.bubbles + +import android.content.Context +import android.content.Intent +import android.content.pm.ShortcutInfo +import android.graphics.Insets +import android.graphics.PointF +import android.graphics.Rect +import android.os.UserHandle +import android.view.WindowManager +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.wm.shell.R +import com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT +import com.google.common.truth.Truth.assertThat +import com.google.common.util.concurrent.MoreExecutors.directExecutor +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +/** Tests operations and the resulting state managed by [BubblePositioner]. */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubblePositionerTest { + + private lateinit var positioner: BubblePositioner + private val context = ApplicationProvider.getApplicationContext<Context>() + private val defaultDeviceConfig = + DeviceConfig( + windowBounds = Rect(0, 0, 1000, 2000), + isLargeScreen = false, + isSmallTablet = false, + isLandscape = false, + isRtl = false, + insets = Insets.of(0, 0, 0, 0) + ) + + @Before + fun setUp() { + val windowManager = context.getSystemService(WindowManager::class.java) + positioner = BubblePositioner(context, windowManager) + } + + @Test + fun testUpdate() { + val insets = Insets.of(10, 20, 5, 15) + val screenBounds = Rect(0, 0, 1000, 1200) + val availableRect = Rect(screenBounds) + availableRect.inset(insets) + positioner.update(defaultDeviceConfig.copy(insets = insets, windowBounds = screenBounds)) + assertThat(positioner.availableRect).isEqualTo(availableRect) + assertThat(positioner.isLandscape).isFalse() + assertThat(positioner.isLargeScreen).isFalse() + assertThat(positioner.insets).isEqualTo(insets) + } + + @Test + fun testShowBubblesVertically_phonePortrait() { + positioner.update(defaultDeviceConfig) + assertThat(positioner.showBubblesVertically()).isFalse() + } + + @Test + fun testShowBubblesVertically_phoneLandscape() { + positioner.update(defaultDeviceConfig.copy(isLandscape = true)) + assertThat(positioner.isLandscape).isTrue() + assertThat(positioner.showBubblesVertically()).isTrue() + } + + @Test + fun testShowBubblesVertically_tablet() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true)) + assertThat(positioner.showBubblesVertically()).isTrue() + } + + /** If a resting position hasn't been set, calling it will return the default position. */ + @Test + fun testGetRestingPosition_returnsDefaultPosition() { + positioner.update(defaultDeviceConfig) + val restingPosition = positioner.getRestingPosition() + val defaultPosition = positioner.defaultStartPosition + assertThat(restingPosition).isEqualTo(defaultPosition) + } + + /** If a resting position has been set, it'll return that instead of the default position. */ + @Test + fun testGetRestingPosition_returnsRestingPosition() { + positioner.update(defaultDeviceConfig) + val restingPosition = PointF(100f, 100f) + positioner.restingPosition = restingPosition + assertThat(positioner.getRestingPosition()).isEqualTo(restingPosition) + } + + /** Test that the default resting position on phone is in upper left. */ + @Test + fun testGetRestingPosition_bubble_onPhone() { + positioner.update(defaultDeviceConfig) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = positioner.getRestingPosition() + assertThat(restingPosition.x).isEqualTo(allowableStackRegion.left) + assertThat(restingPosition.y).isEqualTo(defaultYPosition) + } + + @Test + fun testGetRestingPosition_bubble_onPhone_RTL() { + positioner.update(defaultDeviceConfig.copy(isRtl = true)) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = positioner.getRestingPosition() + assertThat(restingPosition.x).isEqualTo(allowableStackRegion.right) + assertThat(restingPosition.y).isEqualTo(defaultYPosition) + } + + /** Test that the default resting position on tablet is middle left. */ + @Test + fun testGetRestingPosition_chatBubble_onTablet() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true)) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = positioner.getRestingPosition() + assertThat(restingPosition.x).isEqualTo(allowableStackRegion.left) + assertThat(restingPosition.y).isEqualTo(defaultYPosition) + } + + @Test + fun testGetRestingPosition_chatBubble_onTablet_RTL() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, isRtl = true)) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = positioner.getRestingPosition() + assertThat(restingPosition.x).isEqualTo(allowableStackRegion.right) + assertThat(restingPosition.y).isEqualTo(defaultYPosition) + } + + /** Test that the default resting position on tablet is middle right. */ + @Test + fun testGetDefaultPosition_appBubble_onTablet() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true)) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val startPosition = positioner.getDefaultStartPosition(true /* isAppBubble */) + assertThat(startPosition.x).isEqualTo(allowableStackRegion.right) + assertThat(startPosition.y).isEqualTo(defaultYPosition) + } + + @Test + fun testGetRestingPosition_appBubble_onTablet_RTL() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, isRtl = true)) + val allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val startPosition = positioner.getDefaultStartPosition(true /* isAppBubble */) + assertThat(startPosition.x).isEqualTo(allowableStackRegion.left) + assertThat(startPosition.y).isEqualTo(defaultYPosition) + } + + @Test + fun testGetRestingPosition_afterBoundsChange() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, + windowBounds = Rect(0, 0, 2000, 1600))) + + // Set the resting position to the right side + var allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = PointF(allowableStackRegion.right, allowableStackRegion.centerY()) + positioner.restingPosition = restingPosition + + // Now make the device smaller + positioner.update(defaultDeviceConfig.copy(isLargeScreen = false, + windowBounds = Rect(0, 0, 1000, 1600))) + + // Check the resting position is on the correct side + allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + assertThat(positioner.restingPosition.x).isEqualTo(allowableStackRegion.right) + } + + @Test + fun testHasUserModifiedDefaultPosition_false() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, isRtl = true)) + assertThat(positioner.hasUserModifiedDefaultPosition()).isFalse() + positioner.restingPosition = positioner.defaultStartPosition + assertThat(positioner.hasUserModifiedDefaultPosition()).isFalse() + } + + @Test + fun testHasUserModifiedDefaultPosition_true() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, isRtl = true)) + assertThat(positioner.hasUserModifiedDefaultPosition()).isFalse() + positioner.restingPosition = PointF(0f, 100f) + assertThat(positioner.hasUserModifiedDefaultPosition()).isTrue() + } + + @Test + fun testGetExpandedViewHeight_max() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + assertThat(positioner.getExpandedViewHeight(bubble)).isEqualTo(MAX_HEIGHT) + } + + @Test + fun testGetExpandedViewHeight_customHeight_valid() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + val minHeight = + context.resources.getDimensionPixelSize(R.dimen.bubble_expanded_default_height) + val bubble = + Bubble( + "key", + ShortcutInfo.Builder(context, "id").build(), + minHeight + 100 /* desiredHeight */, + 0 /* desiredHeightResId */, + "title", + 0 /* taskId */, + null /* locus */, + true /* isDismissable */, + directExecutor()) {} + + // Ensure the height is the same as the desired value + assertThat(positioner.getExpandedViewHeight(bubble)) + .isEqualTo(bubble.getDesiredHeight(context)) + } + + @Test + fun testGetExpandedViewHeight_customHeight_tooSmall() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val bubble = + Bubble( + "key", + ShortcutInfo.Builder(context, "id").build(), + 10 /* desiredHeight */, + 0 /* desiredHeightResId */, + "title", + 0 /* taskId */, + null /* locus */, + true /* isDismissable */, + directExecutor()) {} + + // Ensure the height is the same as the desired value + val minHeight = + context.resources.getDimensionPixelSize(R.dimen.bubble_expanded_default_height) + assertThat(positioner.getExpandedViewHeight(bubble)).isEqualTo(minHeight) + } + + @Test + fun testGetMaxExpandedViewHeight_onLargeTablet() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val manageButtonHeight = + context.resources.getDimensionPixelSize(R.dimen.bubble_manage_button_height) + val pointerWidth = context.resources.getDimensionPixelSize(R.dimen.bubble_pointer_width) + val expandedViewPadding = + context.resources.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding) + val expectedHeight = + 1800 - 2 * 20 - manageButtonHeight - pointerWidth - expandedViewPadding * 2 + assertThat(positioner.getMaxExpandedViewHeight(false /* isOverflow */)) + .isEqualTo(expectedHeight) + } + + @Test + fun testAreBubblesBottomAligned_largeScreen_true() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + assertThat(positioner.areBubblesBottomAligned()).isTrue() + } + + @Test + fun testAreBubblesBottomAligned_largeScreen_landscape_false() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + isLandscape = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + assertThat(positioner.areBubblesBottomAligned()).isFalse() + } + + @Test + fun testAreBubblesBottomAligned_smallTablet_false() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + isSmallTablet = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + assertThat(positioner.areBubblesBottomAligned()).isFalse() + } + + @Test + fun testAreBubblesBottomAligned_phone_false() { + val deviceConfig = + defaultDeviceConfig.copy( + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + assertThat(positioner.areBubblesBottomAligned()).isFalse() + } + + @Test + fun testExpandedViewY_phoneLandscape() { + val deviceConfig = + defaultDeviceConfig.copy( + isLandscape = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + // This bubble will have max height so it'll always be top aligned + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(positioner.getExpandedViewYTopAligned()) + } + + @Test + fun testExpandedViewY_phonePortrait() { + val deviceConfig = + defaultDeviceConfig.copy( + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + // Always top aligned in phone portrait + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(positioner.getExpandedViewYTopAligned()) + } + + @Test + fun testExpandedViewY_smallTabletLandscape() { + val deviceConfig = + defaultDeviceConfig.copy( + isSmallTablet = true, + isLandscape = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + // This bubble will have max height which is always top aligned on small tablets + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(positioner.getExpandedViewYTopAligned()) + } + + @Test + fun testExpandedViewY_smallTabletPortrait() { + val deviceConfig = + defaultDeviceConfig.copy( + isSmallTablet = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + // This bubble will have max height which is always top aligned on small tablets + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(positioner.getExpandedViewYTopAligned()) + } + + @Test + fun testExpandedViewY_largeScreenLandscape() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + isLandscape = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + // This bubble will have max height which is always top aligned on landscape, large tablet + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(positioner.getExpandedViewYTopAligned()) + } + + @Test + fun testExpandedViewY_largeScreenPortrait() { + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 1800, 2600) + ) + positioner.update(deviceConfig) + + val intent = Intent(Intent.ACTION_VIEW).setPackage(context.packageName) + val bubble = Bubble.createAppBubble(intent, UserHandle(1), null, directExecutor()) + + val manageButtonHeight = + context.resources.getDimensionPixelSize(R.dimen.bubble_manage_button_height) + val manageButtonPlusMargin = + manageButtonHeight + + 2 * context.resources.getDimensionPixelSize(R.dimen.bubble_manage_button_margin) + val pointerWidth = context.resources.getDimensionPixelSize(R.dimen.bubble_pointer_width) + + val expectedExpandedViewY = + positioner.availableRect.bottom - + manageButtonPlusMargin - + positioner.getExpandedViewHeightForLargeScreen() - + pointerWidth + + // Bubbles are bottom aligned on portrait, large tablet + assertThat(positioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) + .isEqualTo(expectedExpandedViewY) + } + + private val defaultYPosition: Float + /** + * Calculates the Y position bubbles should be placed based on the config. Based on the + * calculations in [BubblePositioner.getDefaultStartPosition] and + * [BubbleStackView.RelativeStackPosition]. + */ + get() { + val isTablet = positioner.isLargeScreen + + // On tablet the position is centered, on phone it is an offset from the top. + val desiredY = + if (isTablet) { + positioner.screenRect.height() / 2f - positioner.bubbleSize / 2f + } else { + context.resources + .getDimensionPixelOffset(R.dimen.bubble_stack_starting_offset_y) + .toFloat() + } + // Since we're visually centering the bubbles on tablet, use total screen height rather + // than the available height. + val height = + if (isTablet) { + positioner.screenRect.height() + } else { + positioner.availableRect.height() + } + val offsetPercent = (desiredY / height).coerceIn(0f, 1f) + val allowableStackRegion = + positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + return allowableStackRegion.top + allowableStackRegion.height() * offsetPercent + } +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewTest.kt new file mode 100644 index 000000000000..398fd554f030 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewTest.kt @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2024 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.content.ComponentName +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.wm.shell.taskview.TaskView + +import com.google.common.truth.Truth.assertThat +import com.google.common.util.concurrent.MoreExecutors.directExecutor +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify + +@SmallTest +@RunWith(AndroidJUnit4::class) +class BubbleTaskViewTest { + + private lateinit var bubbleTaskView: BubbleTaskView + private val context = ApplicationProvider.getApplicationContext<Context>() + private lateinit var taskView: TaskView + + @Before + fun setUp() { + taskView = mock() + bubbleTaskView = BubbleTaskView(taskView, directExecutor()) + } + + @Test + fun onTaskCreated_updatesState() { + val componentName = ComponentName(context, "TestClass") + bubbleTaskView.listener.onTaskCreated(123, componentName) + + assertThat(bubbleTaskView.taskId).isEqualTo(123) + assertThat(bubbleTaskView.componentName).isEqualTo(componentName) + assertThat(bubbleTaskView.isCreated).isTrue() + } + + @Test + fun onTaskCreated_callsDelegateListener() { + var actualTaskId = -1 + var actualComponentName: ComponentName? = null + val delegateListener = object : TaskView.Listener { + override fun onTaskCreated(taskId: Int, name: ComponentName) { + actualTaskId = taskId + actualComponentName = name + } + } + bubbleTaskView.delegateListener = delegateListener + + val componentName = ComponentName(context, "TestClass") + bubbleTaskView.listener.onTaskCreated(123, componentName) + + assertThat(actualTaskId).isEqualTo(123) + assertThat(actualComponentName).isEqualTo(componentName) + } + + @Test + fun cleanup_invalidTaskId_doesNotRemoveTask() { + bubbleTaskView.cleanup() + verify(taskView, never()).removeTask() + } + + @Test + fun cleanup_validTaskId_removesTask() { + val componentName = ComponentName(context, "TestClass") + bubbleTaskView.listener.onTaskCreated(123, componentName) + + bubbleTaskView.cleanup() + verify(taskView).removeTask() + } +} diff --git a/libs/WindowManager/Shell/multivalentTestsForDevice b/libs/WindowManager/Shell/multivalentTestsForDevice new file mode 120000 index 000000000000..20ee34ada103 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTestsForDevice @@ -0,0 +1 @@ +multivalentTests
\ No newline at end of file diff --git a/libs/WindowManager/Shell/multivalentTestsForDeviceless b/libs/WindowManager/Shell/multivalentTestsForDeviceless new file mode 120000 index 000000000000..20ee34ada103 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTestsForDeviceless @@ -0,0 +1 @@ +multivalentTests
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml index 681a52bea2b2..e04ab817215c 100644 --- a/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml +++ b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml @@ -21,4 +21,9 @@ android:orientation="vertical" android:id="@+id/bubble_bar_expanded_view"> + <com.android.wm.shell.bubbles.bar.BubbleBarHandleView + android:id="@+id/bubble_bar_handle_view" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + </com.android.wm.shell.bubbles.bar.BubbleBarExpandedView> diff --git a/libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml b/libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml index 85bf2c1e4dca..e4f793c2665b 100644 --- a/libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml +++ b/libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml @@ -30,8 +30,8 @@ android:orientation="horizontal" android:clickable="true" android:focusable="true" - android:paddingStart="16dp"> - + android:paddingStart="6dp" + android:paddingEnd="8dp"> <ImageView android:id="@+id/application_icon" android:layout_width="@dimen/desktop_mode_caption_icon_radius" @@ -43,7 +43,7 @@ android:id="@+id/application_name" android:layout_width="0dp" android:layout_height="20dp" - android:minWidth="80dp" + android:maxWidth="86dp" android:textAppearance="@android:style/TextAppearance.Material.Title" android:textSize="14sp" android:textFontWeight="500" diff --git a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml index cec7ee233236..ef7478c04dda 100644 --- a/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml +++ b/libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml @@ -18,13 +18,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/desktop_mode_caption" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal"> <ImageButton android:id="@+id/caption_handle" - android:layout_width="128dp" + android:layout_width="@dimen/desktop_mode_fullscreen_decor_caption_width" android:layout_height="@dimen/desktop_mode_fullscreen_decor_caption_height" android:paddingVertical="16dp" android:contentDescription="@string/handle_text" diff --git a/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml index 82a358cf68d6..ba064ff71f6d 100644 --- a/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml +++ b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml @@ -49,7 +49,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:padding="@dimen/pip_menu_button_start_end_offset" android:clipToPadding="false" android:alpha="0" android:contentDescription="@string/a11y_pip_menu_entered"/> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index 6ad172807f6a..9d4e6f0ce660 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -57,7 +57,7 @@ <string name="one_handed_tutorial_description" msgid="3486582858591353067">"如需退出，请从屏幕底部向上滑动，或点按应用上方的任意位置"</string> <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"启动单手模式"</string> <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"退出单手模式"</string> - <string name="bubbles_settings_button_description" msgid="1301286017420516912">"<xliff:g id="APP_NAME">%1$s</xliff:g>对话泡的设置"</string> + <string name="bubbles_settings_button_description" msgid="1301286017420516912">"<xliff:g id="APP_NAME">%1$s</xliff:g>消息气泡的设置"</string> <string name="bubble_overflow_button_content_description" msgid="8160974472718594382">"菜单"</string> <string name="bubble_accessibility_action_add_back" msgid="1830101076853540953">"重新加入叠放"</string> <string name="bubble_content_description_single" msgid="8495748092720065813">"<xliff:g id="APP_NAME">%2$s</xliff:g>：<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -69,22 +69,22 @@ <string name="bubble_accessibility_announce_expand" msgid="5388792092888203776">"展开“<xliff:g id="BUBBLE_TITLE">%1$s</xliff:g>”"</string> <string name="bubble_accessibility_announce_collapse" msgid="3178806224494537097">"收起“<xliff:g id="BUBBLE_TITLE">%1$s</xliff:g>”"</string> <string name="bubbles_app_settings" msgid="3617224938701566416">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>设置"</string> - <string name="bubble_dismiss_text" msgid="8816558050659478158">"关闭对话泡"</string> - <string name="bubbles_dont_bubble_conversation" msgid="310000317885712693">"不以对话泡形式显示对话"</string> - <string name="bubbles_user_education_title" msgid="2112319053732691899">"使用对话泡聊天"</string> - <string name="bubbles_user_education_description" msgid="4215862563054175407">"新对话会以浮动图标或对话泡形式显示。点按即可打开对话泡。拖动即可移动对话泡。"</string> - <string name="bubbles_user_education_manage_title" msgid="7042699946735628035">"随时控制对话泡"</string> - <string name="bubbles_user_education_manage" msgid="3460756219946517198">"点按“管理”按钮，可关闭来自此应用的对话泡"</string> + <string name="bubble_dismiss_text" msgid="8816558050659478158">"关闭消息气泡"</string> + <string name="bubbles_dont_bubble_conversation" msgid="310000317885712693">"不以消息气泡形式显示对话"</string> + <string name="bubbles_user_education_title" msgid="2112319053732691899">"使用消息气泡聊天"</string> + <string name="bubbles_user_education_description" msgid="4215862563054175407">"新对话会以浮动图标或消息气泡形式显示。点按即可打开消息气泡。拖动即可移动消息气泡。"</string> + <string name="bubbles_user_education_manage_title" msgid="7042699946735628035">"随时控制消息气泡"</string> + <string name="bubbles_user_education_manage" msgid="3460756219946517198">"点按“管理”按钮，可关闭来自此应用的消息气泡"</string> <string name="bubbles_user_education_got_it" msgid="3382046149225428296">"知道了"</string> - <string name="bubble_overflow_empty_title" msgid="2397251267073294968">"最近没有对话泡"</string> - <string name="bubble_overflow_empty_subtitle" msgid="2627417924958633713">"此处会显示最近的对话泡和已关闭的对话泡"</string> - <string name="bubble_bar_education_stack_title" msgid="2486903590422497245">"使用对话泡聊天"</string> + <string name="bubble_overflow_empty_title" msgid="2397251267073294968">"最近没有消息气泡"</string> + <string name="bubble_overflow_empty_subtitle" msgid="2627417924958633713">"此处会显示最近的消息气泡和已关闭的消息气泡"</string> + <string name="bubble_bar_education_stack_title" msgid="2486903590422497245">"使用消息气泡聊天"</string> <string name="bubble_bar_education_stack_text" msgid="2446934610817409820">"新对话会以图标形式显示在屏幕底部的角落中。点按图标即可展开对话，拖动图标即可关闭对话。"</string> - <string name="bubble_bar_education_manage_title" msgid="6148404487810835924">"随时控制对话泡"</string> - <string name="bubble_bar_education_manage_text" msgid="3199732148641842038">"点按此处即可管理哪些应用和对话可以显示对话泡"</string> + <string name="bubble_bar_education_manage_title" msgid="6148404487810835924">"随时控制消息气泡"</string> + <string name="bubble_bar_education_manage_text" msgid="3199732148641842038">"点按此处即可管理哪些应用和对话可以显示消息气泡"</string> <string name="notification_bubble_title" msgid="6082910224488253378">"气泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> - <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已关闭对话泡。"</string> + <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已关闭消息气泡。"</string> <string name="restart_button_description" msgid="4564728020654658478">"点按即可重启此应用，获得更好的视觉体验"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"在“设置”中更改此应用的宽高比"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"更改高宽比"</string> diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml index e4abae48c8fd..a80afe2bf40a 100644 --- a/libs/WindowManager/Shell/res/values/config.xml +++ b/libs/WindowManager/Shell/res/values/config.xml @@ -45,9 +45,6 @@ <!-- Allow PIP to resize to a slightly bigger state upon touch/showing the menu --> <bool name="config_pipEnableResizeForMenu">true</bool> - <!-- Allow PIP to resize via dragging the corner of PiP. --> - <bool name="config_pipEnableDragCornerResize">false</bool> - <!-- PiP minimum size, which is a % based off the shorter side of display width and height --> <fraction name="config_pipShortestEdgePercent">40%</fraction> @@ -134,6 +131,13 @@ <!-- Whether the additional education about reachability is enabled --> <bool name="config_letterboxIsReachabilityEducationEnabled">false</bool> + <!-- The minimum tolerance of the percentage of activity bounds within its task to hide + size compat restart button. Value lower than 0 or higher than 100 will be ignored. + 100 is the default value where the activity has to fit exactly within the task to allow + size compat restart button to be hidden. 0 means size compat restart button will always + be hidden. --> + <integer name="config_letterboxRestartButtonHideTolerance">100</integer> + <!-- Whether DragAndDrop capability is enabled --> <bool name="config_enableShellDragDrop">true</bool> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 8f9de6168bc7..28e709845e88 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -413,6 +413,28 @@ <!-- Height of desktop mode caption for fullscreen tasks. --> <dimen name="desktop_mode_fullscreen_decor_caption_height">36dp</dimen> + <!-- Width of desktop mode caption for fullscreen tasks. --> + <dimen name="desktop_mode_fullscreen_decor_caption_width">128dp</dimen> + + <!-- Required empty space to be visible for partially offscreen tasks. --> + <dimen name="freeform_required_visible_empty_space_in_header">48dp</dimen> + + <!-- Required empty space to be visible for partially offscreen tasks on a smaller screen. --> + <dimen name="small_screen_required_visible_empty_space_in_header">12dp</dimen> + + <!-- 32dp width back button + 10dp margin --> + <dimen name="caption_left_buttons_width">32dp</dimen> + + <!-- (32 dp buttons + 10dp margins) * 3 buttons--> + <dimen name="caption_right_buttons_width">126dp</dimen> + + <!-- 2 buttons * 48dp button size. --> + <dimen name="desktop_mode_right_edge_buttons_width">96dp</dimen> + + <!-- 22dp padding + 24dp app icon + 16dp expand button. + Text varies in size, we will calculate that width separately. --> + <dimen name="desktop_mode_app_details_width_minus_text">62dp</dimen> + <!-- The width of the maximize menu in desktop mode. --> <dimen name="desktop_mode_maximize_menu_width">287dp</dimen> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/CounterRotator.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/CounterRotator.java index 7e95814c06c2..fd3a749af284 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/CounterRotator.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/CounterRotator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.util; +package com.android.wm.shell.shared; import android.graphics.Point; import android.util.RotationUtils; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/TransitionUtil.java index 936faa3ee6bf..dcd4062cb819 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/TransitionUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.util; +package com.android.wm.shell.shared; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.view.RemoteAnimationTarget.MODE_CHANGING; @@ -28,14 +28,13 @@ import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.view.WindowManager.TRANSIT_TO_FRONT; +import static android.window.TransitionInfo.FLAG_FIRST_CUSTOM; import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; import static android.window.TransitionInfo.FLAG_IS_DISPLAY; import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; import static android.window.TransitionInfo.FLAG_MOVED_TO_TOP; import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT; -import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR; - import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; @@ -53,6 +52,8 @@ import java.util.function.Predicate; /** Various utility functions for transitions. */ public class TransitionUtil { + /** Flag applied to a transition change to identify it as a divider bar for animation. */ + public static final int FLAG_IS_DIVIDER_BAR = FLAG_FIRST_CUSTOM; /** @return true if the transition was triggered by opening something vs closing something */ public static boolean isOpeningType(@WindowManager.TransitionType int type) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java index 8241e1a481ee..8d30db64a3e5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java @@ -29,7 +29,7 @@ import android.window.TransitionInfo; import androidx.annotation.NonNull; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; /** * Wrapper to handle the ActivityEmbedding animation update in one diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java index ac75c73d7e6d..539832e3cf3c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java @@ -20,6 +20,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManagerPolicyConstants.TYPE_LAYER_OFFSET; import static android.window.TransitionInfo.FLAG_IS_BEHIND_STARTING_WINDOW; +import static android.window.TransitionInfo.FLAG_TRANSLUCENT; import static com.android.wm.shell.activityembedding.ActivityEmbeddingAnimationSpec.createShowSnapshotForClosingAnimation; import static com.android.wm.shell.transition.TransitionAnimationHelper.addBackgroundToTransition; @@ -45,7 +46,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.wm.shell.activityembedding.ActivityEmbeddingAnimationAdapter.SnapshotAdapter; import com.android.wm.shell.common.ScreenshotUtils; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; import java.util.ArrayList; import java.util.List; @@ -330,6 +331,11 @@ class ActivityEmbeddingAnimationRunner { if (!animation.hasExtension()) { continue; } + if (adapter.mChange.hasFlags(FLAG_TRANSLUCENT) + && adapter.mChange.getActivityComponent() != null) { + // Skip edge extension for translucent activity. + continue; + } final TransitionInfo.Change change = adapter.mChange; if (TransitionUtil.isOpeningType(adapter.mChange.getMode())) { // Need to screenshot after startTransaction is applied otherwise activity diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationSpec.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationSpec.java index efa5a1a64ade..0272f1cda6ef 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationSpec.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationSpec.java @@ -38,7 +38,7 @@ import android.view.animation.TranslateAnimation; import android.window.TransitionInfo; import com.android.internal.policy.TransitionAnimation; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; /** Animation spec for ActivityEmbedding transition. */ // TODO(b/206557124): provide an easier way to customize animation diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java index b4e852cfaa48..1f9358e2aa91 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java @@ -38,9 +38,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.util.List; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationConstants.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationConstants.java index e06d3ef4e1ab..5b0de5070a60 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationConstants.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationConstants.java @@ -21,5 +21,4 @@ package com.android.wm.shell.back; */ class BackAnimationConstants { static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.20f; - static final float PROGRESS_COMMIT_THRESHOLD = 0.1f; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index d8c691b01b61..e7f6f0d61847 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -17,7 +17,7 @@ package com.android.wm.shell.back; import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_HOME; -import static com.android.window.flags.Flags.predictiveBackSystemAnimations; +import static com.android.window.flags.Flags.predictiveBackSystemAnims; import static com.android.wm.shell.common.ExecutorUtils.executeRemoteCallWithTaskPermission; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION; @@ -70,9 +70,11 @@ import com.android.wm.shell.common.RemoteCallable; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.annotations.ShellBackgroundThread; import com.android.wm.shell.common.annotations.ShellMainThread; +import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; +import java.io.PrintWriter; import java.util.concurrent.atomic.AtomicBoolean; /** @@ -124,6 +126,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont private final Context mContext; private final ContentResolver mContentResolver; private final ShellController mShellController; + private final ShellCommandHandler mShellCommandHandler; private final ShellExecutor mShellExecutor; private final Handler mBgHandler; @@ -173,6 +176,10 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont private StatusBarCustomizer mCustomizer; private boolean mTrackingLatency; + // Keep previous navigation type before remove mBackNavigationInfo. + @BackNavigationInfo.BackTargetType + private int mPreviousNavigationType; + public BackAnimationController( @NonNull ShellInit shellInit, @NonNull ShellController shellController, @@ -180,7 +187,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont @NonNull @ShellBackgroundThread Handler backgroundHandler, Context context, @NonNull BackAnimationBackground backAnimationBackground, - ShellBackAnimationRegistry shellBackAnimationRegistry) { + ShellBackAnimationRegistry shellBackAnimationRegistry, + ShellCommandHandler shellCommandHandler) { this( shellInit, shellController, @@ -190,7 +198,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont context, context.getContentResolver(), backAnimationBackground, - shellBackAnimationRegistry); + shellBackAnimationRegistry, + shellCommandHandler); } @VisibleForTesting @@ -203,7 +212,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont Context context, ContentResolver contentResolver, @NonNull BackAnimationBackground backAnimationBackground, - ShellBackAnimationRegistry shellBackAnimationRegistry) { + ShellBackAnimationRegistry shellBackAnimationRegistry, + ShellCommandHandler shellCommandHandler) { mShellController = shellController; mShellExecutor = shellExecutor; mActivityTaskManager = activityTaskManager; @@ -219,6 +229,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont .build(); mShellBackAnimationRegistry = shellBackAnimationRegistry; mLatencyTracker = LatencyTracker.getInstance(mContext); + mShellCommandHandler = shellCommandHandler; } private void onInit() { @@ -227,12 +238,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont createAdapter(); mShellController.addExternalInterface(KEY_EXTRA_SHELL_BACK_ANIMATION, this::createExternalInterface, this); + mShellCommandHandler.addDumpCallback(this::dump, this); } private void setupAnimationDeveloperSettingsObserver( @NonNull ContentResolver contentResolver, @NonNull @ShellBackgroundThread final Handler backgroundHandler) { - if (predictiveBackSystemAnimations()) { + if (predictiveBackSystemAnims()) { ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation aconfig flag is enabled, therefore " + "developer settings flag is ignored and no content observer registered"); return; @@ -255,7 +267,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont */ @ShellBackgroundThread private void updateEnableAnimationFromFlags() { - boolean isEnabled = predictiveBackSystemAnimations() || isDeveloperSettingEnabled(); + boolean isEnabled = predictiveBackSystemAnims() || isDeveloperSettingEnabled(); mEnableAnimations.set(isEnabled); ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation enabled=%s", isEnabled); } @@ -395,8 +407,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mCurrentTracker.updateStartLocation(); // Dispatch onBackStarted, only to app callbacks. // System callbacks will receive onBackStarted when the remote animation starts. - if (!shouldDispatchToAnimator()) { - tryDispatchOnBackStarted(mActiveCallback, mCurrentTracker.createStartEvent(null)); + if (!shouldDispatchToAnimator() && mActiveCallback != null) { + tryDispatchAppOnBackStarted(mActiveCallback, mCurrentTracker.createStartEvent(null)); } } @@ -499,7 +511,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mActiveCallback = mBackNavigationInfo.getOnBackInvokedCallback(); // App is handling back animation. Cancel system animation latency tracking. cancelLatencyTracking(); - tryDispatchOnBackStarted(mActiveCallback, touchTracker.createStartEvent(null)); + tryDispatchAppOnBackStarted(mActiveCallback, touchTracker.createStartEvent(null)); } } @@ -543,14 +555,24 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont && mBackNavigationInfo.isPrepareRemoteAnimation(); } - private void tryDispatchOnBackStarted(IOnBackInvokedCallback callback, + private void tryDispatchAppOnBackStarted( + IOnBackInvokedCallback callback, + BackMotionEvent backEvent) { + if (mOnBackStartDispatched && callback != null) { + return; + } + dispatchOnBackStarted(callback, backEvent); + mOnBackStartDispatched = true; + } + + private void dispatchOnBackStarted( + IOnBackInvokedCallback callback, BackMotionEvent backEvent) { - if (callback == null || mOnBackStartDispatched) { + if (callback == null) { return; } try { callback.onBackStarted(backEvent); - mOnBackStartDispatched = true; } catch (RemoteException e) { Log.e(TAG, "dispatchOnBackStarted error: ", e); } @@ -853,6 +875,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mShellBackAnimationRegistry.resetDefaultCrossActivity(); cancelLatencyTracking(); if (mBackNavigationInfo != null) { + mPreviousNavigationType = mBackNavigationInfo.getType(); mBackNavigationInfo.onBackNavigationFinished(triggerBack); mBackNavigationInfo = null; } @@ -932,9 +955,17 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont if (apps.length >= 1) { mCurrentTracker.updateStartLocation(); - tryDispatchOnBackStarted( - mActiveCallback, - mCurrentTracker.createStartEvent(apps[0])); + BackMotionEvent startEvent = + mCurrentTracker.createStartEvent(apps[0]); + // {@code mActiveCallback} is the callback from + // the BackAnimationRunners and not a real app-side + // callback. We also dispatch to the app-side callback + // (which should be a system callback with PRIORITY_SYSTEM) + // to keep consistent with app registered callbacks. + dispatchOnBackStarted(mActiveCallback, startEvent); + tryDispatchAppOnBackStarted( + mBackNavigationInfo.getOnBackInvokedCallback(), + startEvent); } // Dispatch the first progress after animation start for @@ -957,7 +988,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mShellExecutor.execute( () -> { if (!mShellBackAnimationRegistry.cancel( - mBackNavigationInfo.getType())) { + mBackNavigationInfo != null + ? mBackNavigationInfo.getType() + : mPreviousNavigationType)) { return; } if (!mBackGestureStarted) { @@ -968,4 +1001,20 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont }; mBackAnimationAdapter = new BackAnimationAdapter(runner); } + + /** + * Description of current BackAnimationController state. + */ + private void dump(PrintWriter pw, String prefix) { + pw.println(prefix + "BackAnimationController state:"); + pw.println(prefix + " mEnableAnimations=" + mEnableAnimations.get()); + pw.println(prefix + " mBackGestureStarted=" + mBackGestureStarted); + pw.println(prefix + " mPostCommitAnimationInProgress=" + mPostCommitAnimationInProgress); + pw.println(prefix + " mShouldStartOnNextMoveEvent=" + mShouldStartOnNextMoveEvent); + pw.println(prefix + " mCurrentTracker state:"); + mCurrentTracker.dump(pw, prefix + " "); + pw.println(prefix + " mQueuedTracker state:"); + mQueuedTracker.dump(pw, prefix + " "); + } + } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java index 215a6cc99e58..55982dca79b3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java @@ -18,9 +18,9 @@ package com.android.wm.shell.back; import static android.view.RemoteAnimationTarget.MODE_CLOSING; import static android.view.RemoteAnimationTarget.MODE_OPENING; +import static android.window.BackEvent.EDGE_RIGHT; import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY; -import static com.android.wm.shell.back.BackAnimationConstants.PROGRESS_COMMIT_THRESHOLD; import static com.android.wm.shell.back.BackAnimationConstants.UPDATE_SYSUI_FLAGS_THRESHOLD; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; @@ -91,7 +91,7 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { } }; private static final float MIN_WINDOW_ALPHA = 0.01f; - private static final float WINDOW_X_SHIFT_DP = 96; + private static final float WINDOW_X_SHIFT_DP = 48; private static final int SCALE_FACTOR = 100; // TODO(b/264710590): Use the progress commit threshold from ViewConfiguration once it exists. private static final float TARGET_COMMIT_PROGRESS = 0.5f; @@ -126,6 +126,8 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { private SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction(); private boolean mBackInProgress = false; + private boolean mIsRightEdge; + private boolean mTriggerBack = false; private PointF mTouchPos = new PointF(); private IRemoteAnimationFinishedCallback mFinishCallback; @@ -197,6 +199,10 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { } private void applyTransform(SurfaceControl leash, RectF targetRect, float targetAlpha) { + if (leash == null || !leash.isValid()) { + return; + } + final float scale = targetRect.width() / mStartTaskRect.width(); mTransformMatrix.reset(); mTransformMatrix.setScale(scale, scale); @@ -209,11 +215,16 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { private void finishAnimation() { if (mEnteringTarget != null) { - mEnteringTarget.leash.release(); + if (mEnteringTarget.leash != null && mEnteringTarget.leash.isValid()) { + mTransaction.setCornerRadius(mEnteringTarget.leash, 0); + mEnteringTarget.leash.release(); + } mEnteringTarget = null; } if (mClosingTarget != null) { - mClosingTarget.leash.release(); + if (mClosingTarget.leash != null) { + mClosingTarget.leash.release(); + } mClosingTarget = null; } if (mBackground != null) { @@ -241,14 +252,15 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { private void onGestureProgress(@NonNull BackEvent backEvent) { if (!mBackInProgress) { + mIsRightEdge = backEvent.getSwipeEdge() == EDGE_RIGHT; mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); mBackInProgress = true; } mTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); float progress = backEvent.getProgress(); - float springProgress = (progress > PROGRESS_COMMIT_THRESHOLD - ? mapLinear(progress, 0.1f, 1, TARGET_COMMIT_PROGRESS, 1) + float springProgress = (mTriggerBack + ? mapLinear(progress, 0f, 1, TARGET_COMMIT_PROGRESS, 1) : mapLinear(progress, 0, 1f, 0, TARGET_COMMIT_PROGRESS)) * SCALE_FACTOR; mLeavingProgressSpring.animateToFinalPosition(springProgress); mEnteringProgressSpring.animateToFinalPosition(springProgress); @@ -256,7 +268,9 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { } private void onGestureCommitted() { - if (mEnteringTarget == null || mClosingTarget == null) { + if (mEnteringTarget == null || mClosingTarget == null || mClosingTarget.leash == null + || mEnteringTarget.leash == null || !mEnteringTarget.leash.isValid() + || !mClosingTarget.leash.isValid()) { finishAnimation(); return; } @@ -296,12 +310,16 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { float top = mapRange(progress, mEnteringStartRect.top, mStartTaskRect.top); float width = mapRange(progress, mEnteringStartRect.width(), mStartTaskRect.width()); float height = mapRange(progress, mEnteringStartRect.height(), mStartTaskRect.height()); - float alpha = mapRange(progress, mEnteringProgress, 1.0f); - + float alpha = mapRange(progress, getPreCommitEnteringAlpha(), 1.0f); mEnteringRect.set(left, top, left + width, top + height); applyTransform(mEnteringTarget.leash, mEnteringRect, alpha); } + private float getPreCommitEnteringAlpha() { + return Math.max(smoothstep(ENTER_ALPHA_THRESHOLD, 0.7f, mEnteringProgress), + MIN_WINDOW_ALPHA); + } + private float getEnteringProgress() { return mEnteringProgress * SCALE_FACTOR; } @@ -311,9 +329,7 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { if (mEnteringTarget != null && mEnteringTarget.leash != null) { transformWithProgress( mEnteringProgress, - Math.max( - smoothstep(ENTER_ALPHA_THRESHOLD, 1, mEnteringProgress), - MIN_WINDOW_ALPHA), /* alpha */ + getPreCommitEnteringAlpha(), mEnteringTarget.leash, mEnteringRect, -mWindowXShift, @@ -322,6 +338,11 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { } } + private float getPreCommitLeavingAlpha() { + return Math.max(1 - smoothstep(0, ENTER_ALPHA_THRESHOLD, mLeavingProgress), + MIN_WINDOW_ALPHA); + } + private float getLeavingProgress() { return mLeavingProgress * SCALE_FACTOR; } @@ -331,20 +352,17 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { if (mClosingTarget != null && mClosingTarget.leash != null) { transformWithProgress( mLeavingProgress, - Math.max( - 1 - smoothstep(0, ENTER_ALPHA_THRESHOLD, mLeavingProgress), - MIN_WINDOW_ALPHA), + getPreCommitLeavingAlpha(), mClosingTarget.leash, mClosingRect, 0, - mWindowXShift + mIsRightEdge ? 0 : mWindowXShift ); } } private void transformWithProgress(float progress, float alpha, SurfaceControl surface, RectF targetRect, float deltaXMin, float deltaXMax) { - final float touchY = mTouchPos.y; final int width = mStartTaskRect.width(); final int height = mStartTaskRect.height(); @@ -376,12 +394,14 @@ public class CrossActivityBackAnimation extends ShellBackAnimation { private final class Callback extends IOnBackInvokedCallback.Default { @Override public void onBackStarted(BackMotionEvent backEvent) { + mTriggerBack = backEvent.getTriggerBack(); mProgressAnimator.onBackStarted(backEvent, CrossActivityBackAnimation.this::onGestureProgress); } @Override public void onBackProgressed(@NonNull BackMotionEvent backEvent) { + mTriggerBack = backEvent.getTriggerBack(); mProgressAnimator.onBackProgressed(backEvent); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java index 80fc3a867d48..adc78391f033 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java @@ -136,6 +136,9 @@ public class CrossTaskBackAnimation extends ShellBackAnimation { mStartTaskRect.set(mClosingTarget.windowConfiguration.getBounds()); mStartTaskRect.offsetTo(0, 0); + // inset bottom in case of pinned taskbar being present + mStartTaskRect.inset(0, 0, 0, mClosingTarget.contentInsets.bottom); + // Draw background. mBackground.ensureBackground(mClosingTarget.windowConfiguration.getBounds(), BACKGROUNDCOLOR, mTransaction); @@ -205,7 +208,9 @@ public class CrossTaskBackAnimation extends ShellBackAnimation { float top = mapRange(progress, mClosingStartRect.top, targetTop); float width = mapRange(progress, mClosingStartRect.width(), targetWidth); float height = mapRange(progress, mClosingStartRect.height(), targetHeight); - mTransaction.setLayer(mClosingTarget.leash, 0); + if (mClosingTarget.leash != null && mClosingTarget.leash.isValid()) { + mTransaction.setLayer(mClosingTarget.leash, 0); + } mClosingCurrentRect.set(left, top, left + width, top + height); applyTransform(mClosingTarget.leash, mClosingCurrentRect, mCornerRadius); @@ -223,7 +228,7 @@ public class CrossTaskBackAnimation extends ShellBackAnimation { /** Transform the target window to match the target rect. */ private void applyTransform(SurfaceControl leash, RectF targetRect, float cornerRadius) { - if (leash == null) { + if (leash == null || !leash.isValid()) { return; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/TouchTracker.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/TouchTracker.java index 4bd56d460818..8f04f126960c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/TouchTracker.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/TouchTracker.java @@ -24,6 +24,8 @@ import android.view.RemoteAnimationTarget; import android.window.BackEvent; import android.window.BackMotionEvent; +import java.io.PrintWriter; + /** * Helper class to record the touch location for gesture and generate back events. */ @@ -61,6 +63,10 @@ class TouchTracker { if ((touchX < mStartThresholdX && mSwipeEdge == BackEvent.EDGE_LEFT) || (touchX > mStartThresholdX && mSwipeEdge == BackEvent.EDGE_RIGHT)) { mStartThresholdX = touchX; + if ((mSwipeEdge == BackEvent.EDGE_LEFT && mStartThresholdX < mInitTouchX) + || (mSwipeEdge == BackEvent.EDGE_RIGHT && mStartThresholdX > mInitTouchX)) { + mInitTouchX = mStartThresholdX; + } } mLatestTouchX = touchX; mLatestTouchY = touchY; @@ -129,6 +135,7 @@ class TouchTracker { /* progress = */ 0, /* velocityX = */ 0, /* velocityY = */ 0, + /* triggerBack = */ mTriggerBack, /* swipeEdge = */ mSwipeEdge, /* departingAnimationTarget = */ target); } @@ -204,6 +211,7 @@ class TouchTracker { /* progress = */ progress, /* velocityX = */ mLatestVelocityX, /* velocityY = */ mLatestVelocityY, + /* triggerBack = */ mTriggerBack, /* swipeEdge = */ mSwipeEdge, /* departingAnimationTarget = */ null); } @@ -219,6 +227,12 @@ class TouchTracker { mNonLinearFactor = nonLinearFactor; } + void dump(PrintWriter pw, String prefix) { + pw.println(prefix + "TouchTracker state:"); + pw.println(prefix + " mState=" + mState); + pw.println(prefix + " mTriggerBack=" + mTriggerBack); + } + enum TouchTrackerState { INITIAL, ACTIVE, FINISHED } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java index 7a3210e0a46d..da530d740d48 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java @@ -19,6 +19,7 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.os.AsyncTask.Status.FINISHED; import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.annotation.DimenRes; import android.annotation.Hide; @@ -47,6 +48,7 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.InstanceId; +import com.android.internal.protolog.common.ProtoLog; import com.android.launcher3.icons.BubbleIconFactory; import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView; import com.android.wm.shell.bubbles.bar.BubbleBarLayerView; @@ -64,7 +66,7 @@ public class Bubble implements BubbleViewProvider { private static final String TAG = "Bubble"; /** A string suffix used in app bubbles' {@link #mKey}. */ - private static final String KEY_APP_BUBBLE = "key_app_bubble"; + public static final String KEY_APP_BUBBLE = "key_app_bubble"; /** Whether the bubble is an app bubble. */ private final boolean mIsAppBubble; @@ -105,6 +107,8 @@ public class Bubble implements BubbleViewProvider { private BubbleExpandedView mExpandedView; @Nullable private BubbleBarExpandedView mBubbleBarExpandedView; + @Nullable + private BubbleTaskView mBubbleTaskView; private BubbleViewInfoTask mInflationTask; private boolean mInflateSynchronously; @@ -394,6 +398,17 @@ public class Bubble implements BubbleViewProvider { } /** + * Returns the existing {@link #mBubbleTaskView} if it's not {@code null}. Otherwise a new + * instance of {@link BubbleTaskView} is created. + */ + public BubbleTaskView getOrCreateBubbleTaskView(BubbleTaskViewFactory taskViewFactory) { + if (mBubbleTaskView == null) { + mBubbleTaskView = taskViewFactory.create(); + } + return mBubbleTaskView; + } + + /** * @return the ShortcutInfo id if it exists, or the metadata shortcut id otherwise. */ String getShortcutId() { @@ -415,6 +430,10 @@ public class Bubble implements BubbleViewProvider { * the bubble. */ void cleanupExpandedView() { + cleanupExpandedView(true); + } + + private void cleanupExpandedView(boolean cleanupTaskView) { if (mExpandedView != null) { mExpandedView.cleanUpExpandedState(); mExpandedView = null; @@ -423,17 +442,38 @@ public class Bubble implements BubbleViewProvider { mBubbleBarExpandedView.cleanUpExpandedState(); mBubbleBarExpandedView = null; } + if (cleanupTaskView) { + cleanupTaskView(); + } if (mIntent != null) { mIntent.unregisterCancelListener(mIntentCancelListener); } mIntentActive = false; } + private void cleanupTaskView() { + if (mBubbleTaskView != null) { + mBubbleTaskView.cleanup(); + mBubbleTaskView = null; + } + } + /** * Call when all the views should be removed/cleaned up. */ - void cleanupViews() { - cleanupExpandedView(); + public void cleanupViews() { + ProtoLog.d(WM_SHELL_BUBBLES, "Bubble#cleanupViews=%s", getKey()); + cleanupViews(true); + } + + /** + * Call when all the views should be removed/cleaned up. + * + * <p>If we're switching between bar and floating modes, pass {@code false} on + * {@code cleanupTaskView} to avoid recreating it in the new mode. + */ + void cleanupViews(boolean cleanupTaskView) { + cleanupExpandedView(cleanupTaskView); mIconView = null; } @@ -468,14 +508,18 @@ public class Bubble implements BubbleViewProvider { * * @param callback the callback to notify one the bubble is ready to be displayed. * @param context the context for the bubble. - * @param controller the bubble controller. + * @param expandedViewManager the bubble expanded view manager. + * @param taskViewFactory the task view factory used to create the task view for the bubble. + * @param positioner the bubble positioner. * @param stackView the view the bubble is added to, iff showing as floating. * @param layerView the layer the bubble is added to, iff showing in the bubble bar. - * @param iconFactory the icon factory use to create images for the bubble. + * @param iconFactory the icon factory used to create images for the bubble. */ void inflate(BubbleViewInfoTask.Callback callback, Context context, - BubbleController controller, + BubbleExpandedViewManager expandedViewManager, + BubbleTaskViewFactory taskViewFactory, + BubblePositioner positioner, @Nullable BubbleStackView stackView, @Nullable BubbleBarLayerView layerView, BubbleIconFactory iconFactory, @@ -485,7 +529,9 @@ public class Bubble implements BubbleViewProvider { } mInflationTask = new BubbleViewInfoTask(this, context, - controller, + expandedViewManager, + taskViewFactory, + positioner, stackView, layerView, iconFactory, @@ -866,9 +912,8 @@ public class Bubble implements BubbleViewProvider { if (uid != -1) { intent.putExtra(Settings.EXTRA_APP_UID, uid); } - intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); return intent; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 249f52bd6156..5c6f73f0a4a2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -23,7 +23,6 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_CONTROLLER; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.wm.shell.bubbles.Bubbles.DISMISS_BLOCKED; @@ -114,6 +113,7 @@ import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.taskview.TaskView; +import com.android.wm.shell.taskview.TaskViewTaskController; import com.android.wm.shell.taskview.TaskViewTransitions; import com.android.wm.shell.transition.Transitions; @@ -137,7 +137,7 @@ import java.util.function.IntConsumer; * The controller manages addition, removal, and visible state of bubbles on screen. */ public class BubbleController implements ConfigurationChangeListener, - RemoteCallable<BubbleController> { + RemoteCallable<BubbleController>, Bubbles.SysuiProxy.Provider { private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleController" : TAG_BUBBLES; @@ -173,7 +173,7 @@ public class BubbleController implements ConfigurationChangeListener, private final Context mContext; private final BubblesImpl mImpl = new BubblesImpl(); private Bubbles.BubbleExpandListener mExpandListener; - @Nullable private BubbleStackView.SurfaceSynchronizer mSurfaceSynchronizer; + @Nullable private final BubbleStackView.SurfaceSynchronizer mSurfaceSynchronizer; private final FloatingContentCoordinator mFloatingContentCoordinator; private final BubbleDataRepository mDataRepository; private final WindowManagerShellWrapper mWindowManagerShellWrapper; @@ -191,18 +191,20 @@ public class BubbleController implements ConfigurationChangeListener, private final ShellCommandHandler mShellCommandHandler; private final IWindowManager mWmService; private final BubbleProperties mBubbleProperties; + private final BubbleTaskViewFactory mBubbleTaskViewFactory; + private final BubbleExpandedViewManager mExpandedViewManager; // Used to post to main UI thread private final ShellExecutor mMainExecutor; private final Handler mMainHandler; private final ShellExecutor mBackgroundExecutor; - private BubbleLogger mLogger; - private BubbleData mBubbleData; + private final BubbleLogger mLogger; + private final BubbleData mBubbleData; @Nullable private BubbleStackView mStackView; @Nullable private BubbleBarLayerView mLayerView; private BubbleIconFactory mBubbleIconFactory; - private BubblePositioner mBubblePositioner; + private final BubblePositioner mBubblePositioner; private Bubbles.SysuiProxy mSysuiProxy; // Tracks the id of the current (foreground) user. @@ -232,13 +234,17 @@ public class BubbleController implements ConfigurationChangeListener, /** Whether or not the BubbleStackView has been added to the WindowManager. */ private boolean mAddedToWindowManager = false; - /** Saved screen density, used to detect display size changes in {@link #onConfigChanged}. */ + /** + * Saved screen density, used to detect display size changes in {@link #onConfigurationChanged}. + */ private int mDensityDpi = Configuration.DENSITY_DPI_UNDEFINED; - /** Saved screen bounds, used to detect screen size changes in {@link #onConfigChanged}. **/ - private Rect mScreenBounds = new Rect(); + /** + * Saved screen bounds, used to detect screen size changes in {@link #onConfigurationChanged}. + */ + private final Rect mScreenBounds = new Rect(); - /** Saved font scale, used to detect font size changes in {@link #onConfigChanged}. */ + /** Saved font scale, used to detect font size changes in {@link #onConfigurationChanged}. */ private float mFontScale = 0; /** Saved direction, used to detect layout direction changes @link #onConfigChanged}. */ @@ -253,9 +259,9 @@ public class BubbleController implements ConfigurationChangeListener, private boolean mIsStatusBarShade = true; /** One handed mode controller to register transition listener. */ - private Optional<OneHandedController> mOneHandedOptional; + private final Optional<OneHandedController> mOneHandedOptional; /** Drag and drop controller to register listener for onDragStarted. */ - private Optional<DragAndDropController> mDragAndDropController; + private final DragAndDropController mDragAndDropController; /** Used to send bubble events to launcher. */ private Bubbles.BubbleStateListener mBubbleStateListener; @@ -281,7 +287,7 @@ public class BubbleController implements ConfigurationChangeListener, BubblePositioner positioner, DisplayController displayController, Optional<OneHandedController> oneHandedOptional, - Optional<DragAndDropController> dragAndDropController, + DragAndDropController dragAndDropController, @ShellMainThread ShellExecutor mainExecutor, @ShellMainThread Handler mainHandler, @ShellBackgroundThread ShellExecutor bgExecutor, @@ -330,6 +336,16 @@ public class BubbleController implements ConfigurationChangeListener, mWmService = wmService; mBubbleProperties = bubbleProperties; shellInit.addInitCallback(this::onInit, this); + mBubbleTaskViewFactory = new BubbleTaskViewFactory() { + @Override + public BubbleTaskView create() { + TaskViewTaskController taskViewTaskController = new TaskViewTaskController( + context, organizer, taskViewTransitions, syncQueue); + TaskView taskView = new TaskView(context, taskViewTaskController); + return new BubbleTaskView(taskView, mainExecutor); + } + }; + mExpandedViewManager = BubbleExpandedViewManager.fromBubbleController(this); } private void registerOneHandedState(OneHandedController oneHanded) { @@ -431,6 +447,9 @@ public class BubbleController implements ConfigurationChangeListener, boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { for (Bubble b : mBubbleData.getBubbles()) { if (task.taskId == b.getTaskId()) { + ProtoLog.d(WM_SHELL_BUBBLES, + "onActivityRestartAttempt - taskId=%d selecting matching bubble=%s", + task.taskId, b.getKey()); mBubbleData.setSelectedBubble(b); mBubbleData.setExpanded(true); return; @@ -438,6 +457,9 @@ public class BubbleController implements ConfigurationChangeListener, } for (Bubble b : mBubbleData.getOverflowBubbles()) { if (task.taskId == b.getTaskId()) { + ProtoLog.d(WM_SHELL_BUBBLES, "onActivityRestartAttempt - taskId=%d " + + "selecting matching overflow bubble=%s", + task.taskId, b.getKey()); promoteBubbleFromOverflow(b); mBubbleData.setExpanded(true); return; @@ -459,7 +481,7 @@ public class BubbleController implements ConfigurationChangeListener, }); mOneHandedOptional.ifPresent(this::registerOneHandedState); - mDragAndDropController.ifPresent(controller -> controller.addListener(this::collapseStack)); + mDragAndDropController.addListener(this::collapseStack); // Clear out any persisted bubbles on disk that no longer have a valid user. List<UserInfo> users = mUserManager.getAliveUsers(); @@ -577,10 +599,15 @@ public class BubbleController implements ConfigurationChangeListener, // Hide the stack temporarily if the status bar has been made invisible, and the stack // is collapsed. An expanded stack should remain visible until collapsed. mStackView.setTemporarilyInvisible(!visible && !isStackExpanded()); + ProtoLog.d(WM_SHELL_BUBBLES, "onStatusBarVisibilityChanged=%b stackExpanded=%b", + visible, isStackExpanded()); } } private void onZenStateChanged() { + if (hasBubbles()) { + ProtoLog.d(WM_SHELL_BUBBLES, "onZenStateChanged"); + } for (Bubble b : mBubbleData.getBubbles()) { b.setShowDot(b.showInShade()); } @@ -589,9 +616,10 @@ public class BubbleController implements ConfigurationChangeListener, @VisibleForTesting public void onStatusBarStateChanged(boolean isShade) { boolean didChange = mIsStatusBarShade != isShade; - if (DEBUG_BUBBLE_CONTROLLER) { - Log.d(TAG, "onStatusBarStateChanged isShade=" + isShade + " didChange=" + didChange); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onStatusBarStateChanged " + + "isShade=%b didChange=%b mNotifEntryToExpandOnShadeUnlock=%s", + isShade, didChange, (mNotifEntryToExpandOnShadeUnlock != null + ? mNotifEntryToExpandOnShadeUnlock.getKey() : "null")); mIsStatusBarShade = isShade; if (!mIsStatusBarShade && didChange) { // Only collapse stack on change @@ -607,6 +635,8 @@ public class BubbleController implements ConfigurationChangeListener, @VisibleForTesting public void onBubbleMetadataFlagChanged(Bubble bubble) { + ProtoLog.d(WM_SHELL_BUBBLES, "onBubbleMetadataFlagChanged=%s flags=%d", + bubble.getKey(), bubble.getFlags()); // Make sure NoMan knows suppression state so that anyone querying it can tell. try { mBarService.onBubbleMetadataFlagChanged(bubble.getKey(), bubble.getFlags()); @@ -619,6 +649,8 @@ public class BubbleController implements ConfigurationChangeListener, /** Called when the current user changes. */ @VisibleForTesting public void onUserChanged(int newUserId) { + ProtoLog.d(WM_SHELL_BUBBLES, "onUserChanged currentUser=%d newUser=%d", + mCurrentUserId, newUserId); saveBubbles(mCurrentUserId); mCurrentUserId = newUserId; @@ -706,6 +738,7 @@ public class BubbleController implements ConfigurationChangeListener, return mBubbleIconFactory; } + @Override public Bubbles.SysuiProxy getSysuiProxy() { return mSysuiProxy; } @@ -725,15 +758,16 @@ public class BubbleController implements ConfigurationChangeListener, // window to show this in, but we use a separate code path. // TODO(b/273312602): consider foldables where we do need a stack view when folded if (mLayerView == null) { - mLayerView = new BubbleBarLayerView(mContext, this); + mLayerView = new BubbleBarLayerView(mContext, this, mBubbleData); mLayerView.setUnBubbleConversationCallback(mSysuiProxy::onUnbubbleConversation); } } else { if (mStackView == null) { + BubbleStackViewManager bubbleStackViewManager = + BubbleStackViewManager.fromBubbleController(this); mStackView = new BubbleStackView( - mContext, this, mBubbleData, mSurfaceSynchronizer, - mFloatingContentCoordinator, - mMainExecutor); + mContext, bubbleStackViewManager, mBubblePositioner, mBubbleData, + mSurfaceSynchronizer, mFloatingContentCoordinator, this, mMainExecutor); mStackView.onOrientationChanged(); if (mExpandListener != null) { mStackView.setExpandListener(mExpandListener); @@ -781,7 +815,13 @@ public class BubbleController implements ConfigurationChangeListener, try { mAddedToWindowManager = true; registerBroadcastReceiver(); - mBubbleData.getOverflow().initialize(this, isShowingAsBubbleBar()); + if (isShowingAsBubbleBar()) { + mBubbleData.getOverflow().initializeForBubbleBar( + mExpandedViewManager, mBubblePositioner); + } else { + mBubbleData.getOverflow().initialize( + mExpandedViewManager, mStackView, mBubblePositioner); + } // (TODO: b/273314541) some duplication in the inset listener if (isShowingAsBubbleBar()) { mWindowManager.addView(mLayerView, mWmLayoutParams); @@ -819,6 +859,7 @@ public class BubbleController implements ConfigurationChangeListener, */ void updateWindowFlagsForBackpress(boolean interceptBack) { if (mAddedToWindowManager) { + ProtoLog.d(WM_SHELL_BUBBLES, "updateFlagsForBackPress interceptBack=%b", interceptBack); mWmLayoutParams.flags = interceptBack ? 0 : WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE @@ -893,11 +934,13 @@ public class BubbleController implements ConfigurationChangeListener, * Called by the BubbleStackView and whenever all bubbles have animated out, and none have been * added in the meantime. */ - @VisibleForTesting public void onAllBubblesAnimatedOut() { if (mStackView != null) { mStackView.setVisibility(INVISIBLE); removeFromWindowManagerMaybe(); + } else if (mLayerView != null) { + mLayerView.setVisibility(INVISIBLE); + removeFromWindowManagerMaybe(); } } @@ -960,7 +1003,9 @@ public class BubbleController implements ConfigurationChangeListener, for (Bubble b : mBubbleData.getBubbles()) { b.inflate(null /* callback */, mContext, - this, + mExpandedViewManager, + mBubbleTaskViewFactory, + mBubblePositioner, mStackView, mLayerView, mBubbleIconFactory, @@ -969,7 +1014,9 @@ public class BubbleController implements ConfigurationChangeListener, for (Bubble b : mBubbleData.getOverflowBubbles()) { b.inflate(null /* callback */, mContext, - this, + mExpandedViewManager, + mBubbleTaskViewFactory, + mBubblePositioner, mStackView, mLayerView, mBubbleIconFactory, @@ -1009,8 +1056,9 @@ public class BubbleController implements ConfigurationChangeListener, } private void onNotificationPanelExpandedChanged(boolean expanded) { - ProtoLog.d(WM_SHELL_BUBBLES, "onNotificationPanelExpandedChanged: expanded=%b", expanded); if (mStackView != null && mStackView.isExpanded()) { + ProtoLog.d(WM_SHELL_BUBBLES, + "onNotificationPanelExpandedChanged expanded=%b", expanded); if (expanded) { mStackView.stopMonitoringSwipeUpGesture(); } else { @@ -1047,7 +1095,6 @@ public class BubbleController implements ConfigurationChangeListener, return mBubbleData.hasBubbles() || mBubbleData.isShowingOverflow(); } - @VisibleForTesting public boolean isStackExpanded() { return mBubbleData.isExpanded(); } @@ -1092,6 +1139,7 @@ public class BubbleController implements ConfigurationChangeListener, /** Promote the provided bubble from the overflow view. */ public void promoteBubbleFromOverflow(Bubble bubble) { mLogger.log(bubble, BubbleLogger.Event.BUBBLE_OVERFLOW_REMOVE_BACK_TO_STACK); + ProtoLog.d(WM_SHELL_BUBBLES, "promoteBubbleFromOverflow=%s", bubble.getKey()); bubble.setInflateSynchronously(mInflateSynchronously); bubble.setShouldAutoExpand(true); bubble.markAsAccessedAt(System.currentTimeMillis()); @@ -1105,9 +1153,8 @@ public class BubbleController implements ConfigurationChangeListener, * <p>This is used by external callers (launcher). */ @VisibleForTesting - public void expandStackAndSelectBubbleFromLauncher(String key, int bubbleBarOffsetX, - int bubbleBarOffsetY) { - mBubblePositioner.setBubbleBarPosition(bubbleBarOffsetX, bubbleBarOffsetY); + public void expandStackAndSelectBubbleFromLauncher(String key, Rect bubbleBarBounds) { + mBubblePositioner.setBubbleBarPosition(bubbleBarBounds); if (BubbleOverflow.KEY.equals(key)) { mBubbleData.setSelectedBubbleFromLauncher(mBubbleData.getOverflow()); @@ -1208,11 +1255,8 @@ public class BubbleController implements ConfigurationChangeListener, // Skip update, but store it in user bubbles so it gets restored after user switch mSavedUserBubbleData.get(bubbleUserId, new UserBubbleData()).add(notif.getKey(), true /* shownInShade */); - if (DEBUG_BUBBLE_CONTROLLER) { - Log.d(TAG, - "Ignore update to bubble for not active user. Bubble userId=" + bubbleUserId - + " current userId=" + mCurrentUserId); - } + Log.w(TAG, "updateBubble, ignore update for non-active user=" + bubbleUserId + + " currentUser=" + mCurrentUserId); } } @@ -1249,6 +1293,9 @@ public class BubbleController implements ConfigurationChangeListener, } String appBubbleKey = Bubble.getAppBubbleKeyForApp(intent.getPackage(), user); + Log.i(TAG, "showOrHideAppBubble, key= " + appBubbleKey + " stackVisibility= " + + (mStackView != null ? mStackView.getVisibility() : " null ") + + " statusBarShade=" + mIsStatusBarShade); PackageManager packageManager = getPackageManagerForUser(mContext, user.getIdentifier()); if (!isResizableActivity(intent, packageManager, appBubbleKey)) return; @@ -1258,19 +1305,31 @@ public class BubbleController implements ConfigurationChangeListener, if (isStackExpanded()) { if (selectedBubble != null && appBubbleKey.equals(selectedBubble.getKey())) { // App bubble is expanded, lets collapse + Log.i(TAG, " showOrHideAppBubble, selected bubble is app bubble, collapsing"); collapseStack(); } else { // App bubble is not selected, select it + Log.i(TAG, " showOrHideAppBubble, expanded, selecting existing app bubble"); mBubbleData.setSelectedBubble(existingAppBubble); } } else { // App bubble is not selected, select it & expand + Log.i(TAG, " showOrHideAppBubble, expand and select existing app bubble"); mBubbleData.setSelectedBubble(existingAppBubble); mBubbleData.setExpanded(true); } } else { - // App bubble does not exist, lets add and expand it - Bubble b = Bubble.createAppBubble(intent, user, icon, mMainExecutor); + // Check if it exists in the overflow + Bubble b = mBubbleData.getOverflowBubbleWithKey(appBubbleKey); + if (b != null) { + // It's in the overflow, so remove it & reinflate + Log.i(TAG, " showOrHideAppBubble, expanding app bubble from overflow"); + mBubbleData.removeOverflowBubble(b); + } else { + // App bubble does not exist, lets add and expand it + Log.i(TAG, " showOrHideAppBubble, creating and expanding app bubble"); + b = Bubble.createAppBubble(intent, user, icon, mMainExecutor); + } b.setShouldAutoExpand(true); inflateAndAdd(b, /* suppressFlyout= */ true, /* showInShade= */ false); } @@ -1341,7 +1400,9 @@ public class BubbleController implements ConfigurationChangeListener, bubble.inflate( (b) -> mBubbleData.overflowBubble(Bubbles.DISMISS_RELOAD_FROM_DISK, bubble), mContext, - this, + mExpandedViewManager, + mBubbleTaskViewFactory, + mBubblePositioner, mStackView, mLayerView, mBubbleIconFactory, @@ -1361,14 +1422,22 @@ public class BubbleController implements ConfigurationChangeListener, mStackView.resetOverflowView(); mStackView.removeAllViews(); } - // cleanup existing bubble views so they can be recreated later if needed. - mBubbleData.getBubbles().forEach(Bubble::cleanupViews); + // cleanup existing bubble views so they can be recreated later if needed, but retain + // TaskView. + mBubbleData.getBubbles().forEach(b -> b.cleanupViews(/* cleanupTaskView= */ false)); // remove the current bubble container from window manager, null it out, and create a new // container based on the current mode. removeFromWindowManagerMaybe(); mLayerView = null; mStackView = null; + + if (!mBubbleData.hasBubbles()) { + // if there are no bubbles, don't create the stack or layer views. they will be created + // later when the first bubble is added. + return; + } + ensureBubbleViewsAndWindowCreated(); // inflate bubble views @@ -1387,7 +1456,9 @@ public class BubbleController implements ConfigurationChangeListener, Bubble bubble = mBubbleData.getBubbles().get(i); bubble.inflate(callback, mContext, - this, + mExpandedViewManager, + mBubbleTaskViewFactory, + mBubblePositioner, mStackView, mLayerView, mBubbleIconFactory, @@ -1462,8 +1533,14 @@ public class BubbleController implements ConfigurationChangeListener, // Lazy init stack view when a bubble is created ensureBubbleViewsAndWindowCreated(); bubble.setInflateSynchronously(mInflateSynchronously); - bubble.inflate(b -> mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade), - mContext, this, mStackView, mLayerView, + bubble.inflate( + b -> mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade), + mContext, + mExpandedViewManager, + mBubbleTaskViewFactory, + mBubblePositioner, + mStackView, + mLayerView, mBubbleIconFactory, false /* skipInflation */); } @@ -1473,7 +1550,6 @@ public class BubbleController implements ConfigurationChangeListener, * <p> * Must be called from the main thread. */ - @VisibleForTesting @MainThread public void removeBubble(String key, int reason) { if (mBubbleData.hasAnyBubbleWithKey(key)) { @@ -1698,8 +1774,11 @@ public class BubbleController implements ConfigurationChangeListener, @Override public void removeBubble(Bubble removedBubble) { if (mLayerView != null) { - // TODO: need to check if there's something that needs to happen here, e.g. if - // the currently selected & expanded bubble is removed? + mLayerView.removeBubble(removedBubble); + if (!mBubbleData.hasBubbles() && !isStackExpanded()) { + mLayerView.setVisibility(INVISIBLE); + removeFromWindowManagerMaybe(); + } } } @@ -1754,18 +1833,19 @@ public class BubbleController implements ConfigurationChangeListener, @Override public void applyUpdate(BubbleData.Update update) { - if (DEBUG_BUBBLE_CONTROLLER) { - Log.d(TAG, "applyUpdate:" + " bubbleAdded=" + (update.addedBubble != null) - + " bubbleRemoved=" - + (update.removedBubbles != null && update.removedBubbles.size() > 0) - + " bubbleUpdated=" + (update.updatedBubble != null) - + " orderChanged=" + update.orderChanged - + " expandedChanged=" + update.expandedChanged - + " selectionChanged=" + update.selectionChanged - + " suppressed=" + (update.suppressedBubble != null) - + " unsuppressed=" + (update.unsuppressedBubble != null) - + " shouldShowEducation=" + update.shouldShowEducation); - } + ProtoLog.d(WM_SHELL_BUBBLES, "mBubbleDataListener#applyUpdate:" + + " added=%s removed=%b updated=%s orderChanged=%b expansionChanged=%b" + + " expanded=%b selectionChanged=%b selected=%s" + + " suppressed=%s unsupressed=%s shouldShowEducation=%b", + update.addedBubble != null ? update.addedBubble.getKey() : "null", + update.removedBubbles.isEmpty(), + update.updatedBubble != null ? update.updatedBubble.getKey() : "null", + update.orderChanged, update.expandedChanged, update.expanded, + update.selectionChanged, + update.selectedBubble != null ? update.selectedBubble.getKey() : "null", + update.suppressedBubble != null ? update.suppressedBubble.getKey() : "null", + update.unsuppressedBubble != null ? update.unsuppressedBubble.getKey() : "null", + update.shouldShowEducation); ensureBubbleViewsAndWindowCreated(); @@ -1959,7 +2039,8 @@ public class BubbleController implements ConfigurationChangeListener, if (mStackView == null && mLayerView == null) { return; } - + ProtoLog.v(WM_SHELL_BUBBLES, "updateBubbleViews mIsStatusBarShade=%s hasBubbles=%s", + mIsStatusBarShade, hasBubbles()); if (!mIsStatusBarShade) { // Bubbles don't appear when the device is locked. if (mStackView != null) { @@ -2163,10 +2244,10 @@ public class BubbleController implements ConfigurationChangeListener, } @Override - public void showBubble(String key, int bubbleBarOffsetX, int bubbleBarOffsetY) { + public void showBubble(String key, Rect bubbleBarBounds) { mMainExecutor.execute( () -> mController.expandStackAndSelectBubbleFromLauncher( - key, bubbleBarOffsetX, bubbleBarOffsetY)); + key, bubbleBarBounds)); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java index bbb4b74c2a17..6c2f925119f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java @@ -15,11 +15,10 @@ */ package com.android.wm.shell.bubbles; -import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_DATA; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.annotation.NonNull; import android.app.PendingIntent; @@ -36,8 +35,8 @@ import android.view.View; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.internal.util.FrameworkStatsLog; -import com.android.launcher3.icons.BubbleIconFactory; import com.android.wm.shell.R; import com.android.wm.shell.bubbles.Bubbles.DismissReason; import com.android.wm.shell.common.bubbles.BubbleBarUpdate; @@ -179,7 +178,7 @@ public class BubbleData { * This interface reports changes to the state and appearance of bubbles which should be applied * as necessary to the UI. */ - interface Listener { + public interface Listener { /** Reports changes have have occurred as a result of the most recent operation. */ void applyUpdate(Update update); } @@ -332,9 +331,6 @@ public class BubbleData { } public void setExpanded(boolean expanded) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setExpanded: " + expanded); - } setExpandedInternal(expanded); dispatchPendingChanges(); } @@ -346,9 +342,8 @@ public class BubbleData { * updated to have the correct state. */ public void setSelectedBubbleFromLauncher(BubbleViewProvider bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setSelectedBubbleFromLauncher: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "setSelectedBubbleFromLauncher=%s", + (bubble != null ? bubble.getKey() : "null")); mExpanded = true; if (Objects.equals(bubble, mSelectedBubble)) { return; @@ -369,9 +364,6 @@ public class BubbleData { } public void setSelectedBubble(BubbleViewProvider bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setSelectedBubble: " + bubble); - } setSelectedBubbleInternal(bubble); dispatchPendingChanges(); } @@ -425,16 +417,19 @@ public class BubbleData { /** * When this method is called it is expected that all info in the bubble has completed loading. - * @see Bubble#inflate(BubbleViewInfoTask.Callback, Context, BubbleController, BubbleStackView, - * BubbleIconFactory, boolean) + * @see Bubble#inflate(BubbleViewInfoTask.Callback, Context, BubbleExpandedViewManager, + * BubbleTaskViewFactory, BubblePositioner, BubbleStackView, + * com.android.wm.shell.bubbles.bar.BubbleBarLayerView, + * com.android.launcher3.icons.BubbleIconFactory, boolean) */ void notificationEntryUpdated(Bubble bubble, boolean suppressFlyout, boolean showInShade) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "notificationEntryUpdated: " + bubble); - } mPendingBubbles.remove(bubble.getKey()); // No longer pending once we're here Bubble prevBubble = getBubbleInStackWithKey(bubble.getKey()); suppressFlyout |= !bubble.isTextChanged(); + ProtoLog.d(WM_SHELL_BUBBLES, + "notifEntryUpdated=%s prevBubble=%b suppressFlyout=%b showInShade=%b autoExpand=%b", + bubble.getKey(), (prevBubble != null), suppressFlyout, showInShade, + bubble.shouldAutoExpand()); if (prevBubble == null) { // Create a new bubble @@ -482,14 +477,24 @@ public class BubbleData { * Dismisses the bubble with the matching key, if it exists. */ public void dismissBubbleWithKey(String key, @DismissReason int reason) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "notificationEntryRemoved: key=" + key + " reason=" + reason); - } doRemove(key, reason); dispatchPendingChanges(); } /** + * Explicitly removes a bubble from the overflow, if it exists. + * + * @param bubble the bubble to remove. + */ + public void removeOverflowBubble(Bubble bubble) { + if (bubble == null) return; + if (mOverflowBubbles.remove(bubble)) { + mStateChange.removedOverflowBubble = bubble; + dispatchPendingChanges(); + } + } + + /** * Adds a group key indicating that the summary for this group should be suppressed. * * @param groupKey the group key of the group whose summary should be suppressed. @@ -589,9 +594,7 @@ public class BubbleData { } private void doAdd(Bubble bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "doAdd: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "doAdd=%s", bubble.getKey()); mBubbles.add(0, bubble); mStateChange.addedBubble = bubble; // Adding the first bubble doesn't change the order @@ -620,9 +623,7 @@ public class BubbleData { } private void doUpdate(Bubble bubble, boolean reorder) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "doUpdate: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "BubbleData - doUpdate=%s", bubble.getKey()); mStateChange.updatedBubble = bubble; if (!isExpanded() && reorder) { int prevPos = mBubbles.indexOf(bubble); @@ -649,9 +650,6 @@ public class BubbleData { } private void doRemove(String key, @DismissReason int reason) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "doRemove: " + key); - } // If it was pending remove it if (mPendingBubbles.containsKey(key)) { mPendingBubbles.remove(key); @@ -672,9 +670,7 @@ public class BubbleData { && shouldRemoveHiddenBubble) { Bubble b = getOverflowBubbleWithKey(key); - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "Cancel overflow bubble: " + b); - } + ProtoLog.d(WM_SHELL_BUBBLES, "doRemove - cancel overflow bubble=%s", key); if (b != null) { b.stopInflation(); } @@ -685,9 +681,7 @@ public class BubbleData { } if (hasSuppressedBubbleWithKey(key) && shouldRemoveHiddenBubble) { Bubble b = getSuppressedBubbleWithKey(key); - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "Cancel suppressed bubble: " + b); - } + ProtoLog.d(WM_SHELL_BUBBLES, "doRemove - cancel suppressed bubble=%s", key); if (b != null) { mSuppressedBubbles.remove(b.getLocusId()); b.stopInflation(); @@ -697,6 +691,7 @@ public class BubbleData { return; } Bubble bubbleToRemove = mBubbles.get(indexToRemove); + ProtoLog.d(WM_SHELL_BUBBLES, "doRemove=%s", bubbleToRemove.getKey()); bubbleToRemove.stopInflation(); overflowBubble(reason, bubbleToRemove); @@ -730,17 +725,12 @@ public class BubbleData { } // Move selection to the new bubble at the same position. int newIndex = Math.min(indexOfSelected, mBubbles.size() - 1); - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setNewSelectedIndex: " + indexOfSelected); - } BubbleViewProvider newSelected = mBubbles.get(newIndex); setSelectedBubbleInternal(newSelected); } private void doSuppress(Bubble bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "doSuppressed: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "doSuppress=%s", bubble.getKey()); mStateChange.suppressedBubble = bubble; bubble.setSuppressBubble(true); @@ -763,9 +753,7 @@ public class BubbleData { } private void doUnsuppress(Bubble bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "doUnsuppressed: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "doUnsuppress=%s", bubble.getKey()); bubble.setSuppressBubble(false); mStateChange.unsuppressedBubble = bubble; mBubbles.add(bubble); @@ -787,9 +775,7 @@ public class BubbleData { || reason == Bubbles.DISMISS_RELOAD_FROM_DISK)) { return; } - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "Overflowing: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "overflowBubble=%s", bubble.getKey()); mLogger.logOverflowAdd(bubble, reason); mOverflowBubbles.remove(bubble); mOverflowBubbles.add(0, bubble); @@ -798,9 +784,7 @@ public class BubbleData { if (mOverflowBubbles.size() == mMaxOverflowBubbles + 1) { // Remove oldest bubble. Bubble oldest = mOverflowBubbles.get(mOverflowBubbles.size() - 1); - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "Overflow full. Remove: " + oldest); - } + ProtoLog.d(WM_SHELL_BUBBLES, "overflow full, remove=%s", oldest.getKey()); mStateChange.bubbleRemoved(oldest, Bubbles.DISMISS_OVERFLOW_MAX_REACHED); mLogger.log(bubble, BubbleLogger.Event.BUBBLE_OVERFLOW_REMOVE_MAX_REACHED); mOverflowBubbles.remove(oldest); @@ -809,9 +793,7 @@ public class BubbleData { } public void dismissAll(@DismissReason int reason) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "dismissAll: reason=" + reason); - } + ProtoLog.d(WM_SHELL_BUBBLES, "dismissAll reason=%d", reason); if (mBubbles.isEmpty() && mSuppressedBubbles.isEmpty()) { return; } @@ -837,9 +819,10 @@ public class BubbleData { * @param visible whether the task with the locusId is visible or not. */ public void onLocusVisibilityChanged(int taskId, LocusId locusId, boolean visible) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "onLocusVisibilityChanged: " + locusId + " visible=" + visible); - } + if (locusId == null) return; + + ProtoLog.d(WM_SHELL_BUBBLES, "onLocusVisibilityChanged=%s visible=%b taskId=%d", + locusId.getId(), visible, taskId); Bubble matchingBubble = getBubbleInStackWithLocusId(locusId); // Don't add the locus if it's from a bubble'd activity, we only suppress for non-bubbled. @@ -896,9 +879,8 @@ public class BubbleData { * @param bubble the new selected bubble */ private void setSelectedBubbleInternal(@Nullable BubbleViewProvider bubble) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setSelectedBubbleInternal: " + bubble); - } + ProtoLog.d(WM_SHELL_BUBBLES, "setSelectedBubbleInternal=%s", + (bubble != null ? bubble.getKey() : "null")); if (Objects.equals(bubble, mSelectedBubble)) { return; } @@ -955,12 +937,10 @@ public class BubbleData { * @param shouldExpand the new requested state */ private void setExpandedInternal(boolean shouldExpand) { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "setExpandedInternal: shouldExpand=" + shouldExpand); - } if (mExpanded == shouldExpand) { return; } + ProtoLog.d(WM_SHELL_BUBBLES, "setExpandedInternal=%b", shouldExpand); if (shouldExpand) { if (mBubbles.isEmpty() && !mShowingOverflow) { Log.e(TAG, "Attempt to expand stack when empty!"); @@ -1012,9 +992,6 @@ public class BubbleData { * @return true if the position of any bubbles changed as a result */ private boolean repackAll() { - if (DEBUG_BUBBLE_DATA) { - Log.d(TAG, "repackAll()"); - } if (mBubbles.isEmpty()) { return false; } @@ -1055,7 +1032,6 @@ public class BubbleData { /** * The set of bubbles in row. */ - @VisibleForTesting(visibility = PACKAGE) public List<Bubble> getBubbles() { return Collections.unmodifiableList(mBubbles); } @@ -1144,7 +1120,6 @@ public class BubbleData { return null; } - @VisibleForTesting(visibility = PRIVATE) public Bubble getOverflowBubbleWithKey(String key) { for (int i = 0; i < mOverflowBubbles.size(); i++) { Bubble bubble = mOverflowBubbles.get(i); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDebugConfig.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDebugConfig.java index f56b1712c5c1..f1a68e246fe1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDebugConfig.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDebugConfig.java @@ -37,17 +37,7 @@ public class BubbleDebugConfig { // Default log tag for the Bubbles package. public static final String TAG_BUBBLES = "Bubbles"; - - static final boolean DEBUG_BUBBLE_CONTROLLER = false; - static final boolean DEBUG_BUBBLE_DATA = false; - static final boolean DEBUG_BUBBLE_STACK_VIEW = false; - static final boolean DEBUG_BUBBLE_EXPANDED_VIEW = false; - static final boolean DEBUG_EXPERIMENTS = true; - static final boolean DEBUG_OVERFLOW = false; public static final boolean DEBUG_USER_EDUCATION = false; - static final boolean DEBUG_POSITIONER = false; - public static final boolean DEBUG_COLLAPSE_ANIMATOR = false; - public static boolean DEBUG_EXPANDED_VIEW_DRAGGING = false; private static final boolean FORCE_SHOW_USER_EDUCATION = false; private static final String FORCE_SHOW_USER_EDUCATION_SETTING = diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEducationController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEducationController.kt index e57f02c71e44..bd4708259b50 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEducationController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleEducationController.kt @@ -40,7 +40,13 @@ class BubbleEducationController(private val context: Context) { /** Whether education view should show for the collapsed stack. */ fun shouldShowStackEducation(bubble: BubbleViewProvider?): Boolean { - val shouldShow = bubble != null && + if (BubbleDebugConfig.neverShowUserEducation(context)) { + logDebug("Show stack edu: never") + return false + } + + val shouldShow = + bubble != null && bubble.isConversationBubble && // show education for conversation bubbles only (!hasSeenStackEducation || BubbleDebugConfig.forceShowUserEducation(context)) logDebug("Show stack edu: $shouldShow") @@ -49,7 +55,13 @@ class BubbleEducationController(private val context: Context) { /** Whether the educational view should show for the expanded view "manage" menu. */ fun shouldShowManageEducation(bubble: BubbleViewProvider?): Boolean { - val shouldShow = bubble != null && + if (BubbleDebugConfig.neverShowUserEducation(context)) { + logDebug("Show manage edu: never") + return false + } + + val shouldShow = + bubble != null && bubble.isConversationBubble && // show education for conversation bubbles only (!hasSeenManageEducation || BubbleDebugConfig.forceShowUserEducation(context)) logDebug("Show manage edu: $shouldShow") diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java index a3eb429b1d7e..df9ba63b4cc2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java @@ -23,16 +23,14 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_EXPANDED_VIEW; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT; -import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.annotation.NonNull; import android.annotation.SuppressLint; import android.app.ActivityOptions; -import android.app.ActivityTaskManager; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; @@ -49,7 +47,6 @@ import android.graphics.PointF; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.ShapeDrawable; -import android.os.RemoteException; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.IntProperty; @@ -70,11 +67,11 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.ScreenDecorationsUtils; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.common.AlphaOptimizedButton; import com.android.wm.shell.common.TriangleShape; import com.android.wm.shell.taskview.TaskView; -import com.android.wm.shell.taskview.TaskViewTaskController; import java.io.PrintWriter; @@ -146,7 +143,6 @@ public class BubbleExpandedView extends LinearLayout { private AlphaOptimizedButton mManageButton; private TaskView mTaskView; - private TaskViewTaskController mTaskViewTaskController; private BubbleOverflowContainerView mOverflowView; private int mTaskId = INVALID_TASK_ID; @@ -188,7 +184,7 @@ public class BubbleExpandedView extends LinearLayout { private boolean mIsOverflow; private boolean mIsClipping; - private BubbleController mController; + private BubbleExpandedViewManager mManager; private BubbleStackView mStackView; private BubblePositioner mPositioner; @@ -204,13 +200,9 @@ public class BubbleExpandedView extends LinearLayout { @Override public void onInitialized() { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onInitialized: destroyed=" + mDestroyed - + " initialized=" + mInitialized - + " bubble=" + getBubbleKey()); - } - if (mDestroyed || mInitialized) { + ProtoLog.d(WM_SHELL_BUBBLES, "onInitialized: destroyed=%b initialized=%b bubble=%s", + mDestroyed, mInitialized, getBubbleKey()); return; } @@ -221,10 +213,8 @@ public class BubbleExpandedView extends LinearLayout { // TODO: I notice inconsistencies in lifecycle // Post to keep the lifecycle normal post(() -> { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onInitialized: calling startActivity, bubble=" - + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onInitialized: calling startActivity, bubble=%s", + getBubbleKey()); try { Rect launchBounds = new Rect(); mTaskView.getBoundsOnScreen(launchBounds); @@ -271,7 +261,7 @@ public class BubbleExpandedView extends LinearLayout { // the bubble again so we'll just remove it. Log.w(TAG, "Exception while displaying bubble: " + getBubbleKey() + ", " + e.getMessage() + "; removing bubble"); - mController.removeBubble(getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT); + mManager.removeBubble(getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT); } }); mInitialized = true; @@ -284,16 +274,14 @@ public class BubbleExpandedView extends LinearLayout { @Override public void onTaskCreated(int taskId, ComponentName name) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onTaskCreated: taskId=" + taskId - + " bubble=" + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onTaskCreated: taskId=%d bubble=%s", + taskId, getBubbleKey()); // The taskId is saved to use for removeTask, preventing appearance in recent tasks. mTaskId = taskId; if (mBubble != null && mBubble.isAppBubble()) { // Let the controller know sooner what the taskId is. - mController.setAppBubbleTaskId(mBubble.getKey(), mTaskId); + mManager.setAppBubbleTaskId(mBubble.getKey(), mTaskId); } // With the task org, the taskAppeared callback will only happen once the task has @@ -303,17 +291,17 @@ public class BubbleExpandedView extends LinearLayout { @Override public void onTaskVisibilityChanged(int taskId, boolean visible) { + ProtoLog.d(WM_SHELL_BUBBLES, "onTaskVisibilityChanged=%b bubble=%s taskId=%d", + visible, getBubbleKey(), taskId); setContentVisibility(visible); } @Override public void onTaskRemovalStarted(int taskId) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onTaskRemovalStarted: taskId=" + taskId - + " bubble=" + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onTaskRemovalStarted: taskId=%d bubble=%s", + taskId, getBubbleKey()); if (mBubble != null) { - mController.removeBubble(mBubble.getKey(), Bubbles.DISMISS_TASK_FINISHED); + mManager.removeBubble(mBubble.getKey(), Bubbles.DISMISS_TASK_FINISHED); } if (mTaskView != null) { // Release the surface @@ -433,16 +421,20 @@ public class BubbleExpandedView extends LinearLayout { * Initialize {@link BubbleController} and {@link BubbleStackView} here, this method must need * to be called after view inflate. */ - void initialize(BubbleController controller, BubbleStackView stackView, boolean isOverflow) { - mController = controller; + void initialize(BubbleExpandedViewManager expandedViewManager, + BubbleStackView stackView, + BubblePositioner positioner, + boolean isOverflow, + @Nullable BubbleTaskView bubbleTaskView) { + mManager = expandedViewManager; mStackView = stackView; mIsOverflow = isOverflow; - mPositioner = mController.getPositioner(); + mPositioner = positioner; if (mIsOverflow) { mOverflowView = (BubbleOverflowContainerView) LayoutInflater.from(getContext()).inflate( R.layout.bubble_overflow_container, null /* root */); - mOverflowView.setBubbleController(mController); + mOverflowView.initialize(expandedViewManager, positioner); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT); mExpandedViewContainer.addView(mOverflowView, lp); mExpandedViewContainer.setLayoutParams( @@ -450,18 +442,22 @@ public class BubbleExpandedView extends LinearLayout { bringChildToFront(mOverflowView); mManageButton.setVisibility(GONE); } else { - mTaskViewTaskController = new TaskViewTaskController(mContext, - mController.getTaskOrganizer(), - mController.getTaskViewTransitions(), mController.getSyncTransactionQueue()); - mTaskView = new TaskView(mContext, mTaskViewTaskController); - mTaskView.setListener(mController.getMainExecutor(), mTaskViewListener); + mTaskView = bubbleTaskView.getTaskView(); + bubbleTaskView.setDelegateListener(mTaskViewListener); // set a fixed width so it is not recalculated as part of a rotation. the width will be // updated manually after the rotation. FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(getContentWidth(), MATCH_PARENT); + if (mTaskView.getParent() != null) { + ((ViewGroup) mTaskView.getParent()).removeView(mTaskView); + } mExpandedViewContainer.addView(mTaskView, lp); bringChildToFront(mTaskView); + if (bubbleTaskView.isCreated()) { + mTaskViewListener.onTaskCreated( + bubbleTaskView.getTaskId(), bubbleTaskView.getComponentName()); + } } } @@ -644,9 +640,6 @@ public class BubbleExpandedView extends LinearLayout { super.onDetachedFromWindow(); mImeVisible = false; mNeedsNewHeight = false; - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onDetachedFromWindow: bubble=" + getBubbleKey()); - } } /** @@ -805,10 +798,6 @@ public class BubbleExpandedView extends LinearLayout { * and setting {@code false} actually means rendering the contents in transparent. */ public void setContentVisibility(boolean visibility) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "setContentVisibility: visibility=" + visibility - + " bubble=" + getBubbleKey()); - } mIsContentVisible = visibility; if (mTaskView != null && !mIsAnimating) { mTaskView.setAlpha(visibility ? 1f : 0f); @@ -867,15 +856,12 @@ public class BubbleExpandedView extends LinearLayout { * Sets the bubble used to populate this view. */ void update(Bubble bubble) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "update: bubble=" + bubble); - } if (mStackView == null) { Log.w(TAG, "Stack is null for bubble: " + bubble); return; } boolean isNew = mBubble == null || didBackingContentChange(bubble); - if (isNew || bubble != null && bubble.getKey().equals(mBubble.getKey())) { + if (isNew || bubble.getKey().equals(mBubble.getKey())) { mBubble = bubble; mManageButton.setContentDescription(getResources().getString( R.string.bubbles_settings_button_description, bubble.getAppName())); @@ -958,11 +944,6 @@ public class BubbleExpandedView extends LinearLayout { } mNeedsNewHeight = false; } - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "updateHeight: bubble=" + getBubbleKey() - + " height=" + height - + " mNeedsNewHeight=" + mNeedsNewHeight); - } } } @@ -974,10 +955,6 @@ public class BubbleExpandedView extends LinearLayout { * waiting for layout. */ public void updateView(int[] containerLocationOnScreen) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "updateView: bubble=" - + getBubbleKey()); - } mExpandedViewContainerLocation = containerLocationOnScreen; updateHeight(); if (mTaskView != null @@ -1101,31 +1078,8 @@ public class BubbleExpandedView extends LinearLayout { return ((LinearLayout.LayoutParams) mManageButton.getLayoutParams()).getMarginStart(); } - /** - * Cleans up anything related to the task. The TaskView itself is released after the task - * has been removed. - * - * If this view should be reused after this method is called, then - * {@link #initialize(BubbleController, BubbleStackView, boolean)} must be invoked first. - */ + /** Hide the task view. */ public void cleanUpExpandedState() { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "cleanUpExpandedState: bubble=" + getBubbleKey() + " task=" + mTaskId); - } - if (getTaskId() != INVALID_TASK_ID) { - // Ensure the task is removed from WM - if (ENABLE_SHELL_TRANSITIONS) { - if (mTaskView != null) { - mTaskView.removeTask(); - } - } else { - try { - ActivityTaskManager.getService().removeTask(getTaskId()); - } catch (RemoteException e) { - Log.w(TAG, e.getMessage()); - } - } - } if (mTaskView != null) { mTaskView.setVisibility(GONE); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedViewManager.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedViewManager.kt new file mode 100644 index 000000000000..b0d3cc4a5d5c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedViewManager.kt @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2024 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 + +/** Manager interface for bubble expanded views. */ +interface BubbleExpandedViewManager { + + val overflowBubbles: List<Bubble> + fun setOverflowListener(listener: BubbleData.Listener) + fun collapseStack() + fun updateWindowFlagsForBackpress(intercept: Boolean) + fun promoteBubbleFromOverflow(bubble: Bubble) + fun removeBubble(key: String, reason: Int) + fun dismissBubble(bubble: Bubble, reason: Int) + fun setAppBubbleTaskId(key: String, taskId: Int) + fun isStackExpanded(): Boolean + fun isShowingAsBubbleBar(): Boolean + + companion object { + /** + * Convenience function for creating a [BubbleExpandedViewManager] that delegates to the + * given `controller`. + */ + @JvmStatic + fun fromBubbleController(controller: BubbleController): BubbleExpandedViewManager { + return object : BubbleExpandedViewManager { + + override val overflowBubbles: List<Bubble> + get() = controller.overflowBubbles + + override fun setOverflowListener(listener: BubbleData.Listener) { + controller.setOverflowListener(listener) + } + + override fun collapseStack() { + controller.collapseStack() + } + + override fun updateWindowFlagsForBackpress(intercept: Boolean) { + controller.updateWindowFlagsForBackpress(intercept) + } + + override fun promoteBubbleFromOverflow(bubble: Bubble) { + controller.promoteBubbleFromOverflow(bubble) + } + + override fun removeBubble(key: String, reason: Int) { + controller.removeBubble(key, reason) + } + + override fun dismissBubble(bubble: Bubble, reason: Int) { + controller.dismissBubble(bubble, reason) + } + + override fun setAppBubbleTaskId(key: String, taskId: Int) { + controller.setAppBubbleTaskId(key, taskId) + } + + override fun isStackExpanded(): Boolean = controller.isStackExpanded + + override fun isShowingAsBubbleBar(): Boolean = controller.isShowingAsBubbleBar + } + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt index 22e836aacfc5..f32974e1765d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt @@ -29,6 +29,7 @@ import android.util.PathParser import android.view.LayoutInflater import android.view.View.VISIBLE import android.widget.FrameLayout +import androidx.core.content.ContextCompat import com.android.launcher3.icons.BubbleIconFactory import com.android.wm.shell.R import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView @@ -55,13 +56,32 @@ class BubbleOverflow(private val context: Context, private val positioner: Bubbl } /** Call before use and again if cleanUpExpandedState was called. */ - fun initialize(controller: BubbleController, forBubbleBar: Boolean) { - if (forBubbleBar) { - createBubbleBarExpandedView().initialize(controller, true /* isOverflow */) - } else { - createExpandedView() - .initialize(controller, controller.stackView, true /* isOverflow */) - } + fun initialize( + expandedViewManager: BubbleExpandedViewManager, + stackView: BubbleStackView, + positioner: BubblePositioner + ) { + createExpandedView() + .initialize( + expandedViewManager, + stackView, + positioner, + /* isOverflow= */ true, + /* bubbleTaskView= */ null + ) + } + + fun initializeForBubbleBar( + expandedViewManager: BubbleExpandedViewManager, + positioner: BubblePositioner + ) { + createBubbleBarExpandedView() + .initialize( + expandedViewManager, + positioner, + /* isOverflow= */ true, + /* bubbleTaskView= */ null + ) } fun cleanUpExpandedState() { @@ -113,7 +133,10 @@ class BubbleOverflow(private val context: Context, private val positioner: Bubbl context, res.getDimensionPixelSize(R.dimen.bubble_size), res.getDimensionPixelSize(R.dimen.bubble_badge_size), - res.getColor(com.android.launcher3.icons.R.color.important_conversation), + ContextCompat.getColor( + context, + com.android.launcher3.icons.R.color.important_conversation + ), res.getDimensionPixelSize(com.android.internal.R.dimen.importance_ring_stroke_width) ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflowContainerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflowContainerView.java index 9655470ce914..b06de4f4002c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflowContainerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflowContainerView.java @@ -16,9 +16,9 @@ package com.android.wm.shell.bubbles; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_OVERFLOW; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.annotation.NonNull; import android.content.Context; @@ -28,7 +28,6 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Log; import android.util.TypedValue; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -43,6 +42,7 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.android.internal.protolog.common.ProtoLog; import com.android.internal.util.ContrastColorUtil; import com.android.wm.shell.R; @@ -62,7 +62,8 @@ public class BubbleOverflowContainerView extends LinearLayout { private ImageView mEmptyStateImage; private int mHorizontalMargin; private int mVerticalMargin; - private BubbleController mController; + private BubbleExpandedViewManager mExpandedViewManager; + private BubblePositioner mPositioner; private BubbleOverflowAdapter mAdapter; private RecyclerView mRecyclerView; private List<Bubble> mOverflowBubbles = new ArrayList<>(); @@ -70,7 +71,7 @@ public class BubbleOverflowContainerView extends LinearLayout { private View.OnKeyListener mKeyListener = (view, i, keyEvent) -> { if (keyEvent.getAction() == KeyEvent.ACTION_UP && keyEvent.getKeyCode() == KeyEvent.KEYCODE_BACK) { - mController.collapseStack(); + mExpandedViewManager.collapseStack(); return true; } return false; @@ -126,8 +127,11 @@ public class BubbleOverflowContainerView extends LinearLayout { setFocusableInTouchMode(true); } - public void setBubbleController(BubbleController controller) { - mController = controller; + /** Initializes the view. Must be called after creation. */ + public void initialize(BubbleExpandedViewManager expandedViewManager, + BubblePositioner positioner) { + mExpandedViewManager = expandedViewManager; + mPositioner = positioner; } public void show() { @@ -149,9 +153,9 @@ public class BubbleOverflowContainerView extends LinearLayout { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - if (mController != null) { + if (mExpandedViewManager != null) { // For the overflow to get key events (e.g. back press) we need to adjust the flags - mController.updateWindowFlagsForBackpress(true); + mExpandedViewManager.updateWindowFlagsForBackpress(true); } setOnKeyListener(mKeyListener); } @@ -159,8 +163,8 @@ public class BubbleOverflowContainerView extends LinearLayout { @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - if (mController != null) { - mController.updateWindowFlagsForBackpress(false); + if (mExpandedViewManager != null) { + mExpandedViewManager.updateWindowFlagsForBackpress(false); } setOnKeyListener(null); } @@ -177,15 +181,15 @@ public class BubbleOverflowContainerView extends LinearLayout { mRecyclerView.addItemDecoration(new OverflowItemDecoration()); } mAdapter = new BubbleOverflowAdapter(getContext(), mOverflowBubbles, - mController::promoteBubbleFromOverflow, - mController.getPositioner()); + mExpandedViewManager::promoteBubbleFromOverflow, + mPositioner); mRecyclerView.setAdapter(mAdapter); mOverflowBubbles.clear(); - mOverflowBubbles.addAll(mController.getOverflowBubbles()); + mOverflowBubbles.addAll(mExpandedViewManager.getOverflowBubbles()); mAdapter.notifyDataSetChanged(); - mController.setOverflowListener(mDataListener); + mExpandedViewManager.setOverflowListener(mDataListener); updateEmptyStateVisibility(); updateTheme(); } @@ -245,9 +249,6 @@ public class BubbleOverflowContainerView extends LinearLayout { Bubble toRemove = update.removedOverflowBubble; if (toRemove != null) { - if (DEBUG_OVERFLOW) { - Log.d(TAG, "remove: " + toRemove); - } toRemove.cleanupViews(); final int indexToRemove = mOverflowBubbles.indexOf(toRemove); mOverflowBubbles.remove(toRemove); @@ -257,9 +258,6 @@ public class BubbleOverflowContainerView extends LinearLayout { Bubble toAdd = update.addedOverflowBubble; if (toAdd != null) { final int indexToAdd = mOverflowBubbles.indexOf(toAdd); - if (DEBUG_OVERFLOW) { - Log.d(TAG, "add: " + toAdd + " prevIndex: " + indexToAdd); - } if (indexToAdd > 0) { mOverflowBubbles.remove(toAdd); mOverflowBubbles.add(0, toAdd); @@ -272,10 +270,9 @@ public class BubbleOverflowContainerView extends LinearLayout { updateEmptyStateVisibility(); - if (DEBUG_OVERFLOW) { - Log.d(TAG, BubbleDebugConfig.formatBubblesString( - mController.getOverflowBubbles(), null)); - } + ProtoLog.d(WM_SHELL_BUBBLES, "Apply overflow update, added=%s removed=%s", + (toAdd != null ? toAdd.getKey() : "null"), + (toRemove != null ? toRemove.getKey() : "null")); } }; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java index 662a5c47d633..cda29c95281d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java @@ -16,19 +16,20 @@ package com.android.wm.shell.bubbles; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; + import android.content.Context; import android.content.res.Resources; import android.graphics.Insets; -import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; -import android.util.Log; import android.view.Surface; import android.view.WindowManager; import androidx.annotation.VisibleForTesting; +import com.android.internal.protolog.common.ProtoLog; import com.android.launcher3.icons.IconNormalizer; import com.android.wm.shell.R; @@ -37,9 +38,6 @@ import com.android.wm.shell.R; * placement and positioning calculations to refer to. */ public class BubblePositioner { - private static final String TAG = BubbleDebugConfig.TAG_WITH_CLASS_NAME - ? "BubblePositioner" - : BubbleDebugConfig.TAG_BUBBLES; /** The screen edge the bubble stack is pinned to */ public enum StackPinnedEdge { @@ -95,10 +93,9 @@ public class BubblePositioner { private int mMinimumFlyoutWidthLargeScreen; private PointF mRestingStackPosition; - private int[] mPaddings = new int[4]; private boolean mShowingInBubbleBar; - private final Point mBubbleBarPosition = new Point(); + private final Rect mBubbleBarBounds = new Rect(); public BubblePositioner(Context context, WindowManager windowManager) { mContext = context; @@ -112,21 +109,24 @@ public class BubblePositioner { */ public void update(DeviceConfig deviceConfig) { mDeviceConfig = deviceConfig; - - if (BubbleDebugConfig.DEBUG_POSITIONER) { - Log.w(TAG, "update positioner:" - + " rotation: " + mRotation - + " insets: " + deviceConfig.getInsets() - + " isLargeScreen: " + deviceConfig.isLargeScreen() - + " isSmallTablet: " + deviceConfig.isSmallTablet() - + " showingInBubbleBar: " + mShowingInBubbleBar - + " bounds: " + deviceConfig.getWindowBounds()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "update positioner: " + + "rotation=%d insets=%s largeScreen=%b " + + "smallTablet=%b isBubbleBar=%b bounds=%s", + mRotation, deviceConfig.getInsets(), deviceConfig.isLargeScreen(), + deviceConfig.isSmallTablet(), mShowingInBubbleBar, + deviceConfig.getWindowBounds()); updateInternal(mRotation, deviceConfig.getInsets(), deviceConfig.getWindowBounds()); } @VisibleForTesting public void updateInternal(int rotation, Insets insets, Rect bounds) { + BubbleStackView.RelativeStackPosition prevStackPosition = null; + if (mRestingStackPosition != null && mScreenRect != null && !mScreenRect.equals(bounds)) { + // Save the resting position as a relative position with the previous bounds, at the + // end of the update we'll restore it based on the new bounds. + prevStackPosition = new BubbleStackView.RelativeStackPosition(getRestingPosition(), + getAllowableStackPositionRegion(1)); + } mRotation = rotation; mInsets = insets; @@ -189,6 +189,12 @@ public class BubblePositioner { R.dimen.bubbles_flyout_min_width_large_screen); mMaxBubbles = calculateMaxBubbles(); + + if (prevStackPosition != null) { + // Get the new resting position based on the updated values + mRestingStackPosition = prevStackPosition.getAbsolutePositionInRegion( + getAllowableStackPositionRegion(1)); + } } /** @@ -344,46 +350,44 @@ public class BubblePositioner { final int pointerTotalHeight = getPointerSize(); final int expandedViewLargeScreenInsetFurthestEdge = getExpandedViewLargeScreenInsetFurthestEdge(isOverflow); + int[] paddings = new int[4]; if (mDeviceConfig.isLargeScreen()) { // Note: // If we're in portrait OR if we're a small tablet, then the two insets values will // be equal. If we're landscape and a large tablet, the two values will be different. // [left, top, right, bottom] - mPaddings[0] = onLeft + paddings[0] = onLeft ? mExpandedViewLargeScreenInsetClosestEdge - pointerTotalHeight : expandedViewLargeScreenInsetFurthestEdge; - mPaddings[1] = 0; - mPaddings[2] = onLeft + paddings[1] = 0; + paddings[2] = onLeft ? expandedViewLargeScreenInsetFurthestEdge : mExpandedViewLargeScreenInsetClosestEdge - pointerTotalHeight; // Overflow doesn't show manage button / get padding from it so add padding here - mPaddings[3] = isOverflow ? mExpandedViewPadding : 0; - return mPaddings; + paddings[3] = isOverflow ? mExpandedViewPadding : 0; + return paddings; } else { int leftPadding = mInsets.left + mExpandedViewPadding; int rightPadding = mInsets.right + mExpandedViewPadding; - final float expandedViewWidth = isOverflow - ? mOverflowWidth - : mExpandedViewLargeScreenWidth; if (showBubblesVertically()) { if (!onLeft) { rightPadding += mBubbleSize - pointerTotalHeight; leftPadding += isOverflow - ? (mPositionRect.width() - rightPadding - expandedViewWidth) + ? (mPositionRect.width() - rightPadding - mOverflowWidth) : 0; } else { leftPadding += mBubbleSize - pointerTotalHeight; rightPadding += isOverflow - ? (mPositionRect.width() - leftPadding - expandedViewWidth) + ? (mPositionRect.width() - leftPadding - mOverflowWidth) : 0; } } // [left, top, right, bottom] - mPaddings[0] = leftPadding; - mPaddings[1] = showBubblesVertically() ? 0 : mPointerMargin; - mPaddings[2] = rightPadding; - mPaddings[3] = 0; - return mPaddings; + paddings[0] = leftPadding; + paddings[1] = showBubblesVertically() ? 0 : mPointerMargin; + paddings[2] = rightPadding; + paddings[3] = 0; + return paddings; } } @@ -395,7 +399,7 @@ public class BubblePositioner { } /** Gets the y position of the expanded view if it was top-aligned. */ - public float getExpandedViewYTopAligned() { + public int getExpandedViewYTopAligned() { final int top = getAvailableRect().top; if (showBubblesVertically()) { return top - mPointerWidth + mExpandedViewPadding; @@ -413,7 +417,7 @@ public class BubblePositioner { return getExpandedViewHeightForLargeScreen(); } // Subtract top insets because availableRect.height would account for that - int expandedContainerY = (int) getExpandedViewYTopAligned() - getInsets().top; + int expandedContainerY = getExpandedViewYTopAligned() - getInsets().top; int paddingTop = showBubblesVertically() ? 0 : mPointerHeight; @@ -474,11 +478,11 @@ public class BubblePositioner { public float getExpandedViewY(BubbleViewProvider bubble, float bubblePosition) { boolean isOverflow = bubble == null || BubbleOverflow.KEY.equals(bubble.getKey()); float expandedViewHeight = getExpandedViewHeight(bubble); - float topAlignment = getExpandedViewYTopAligned(); + int topAlignment = getExpandedViewYTopAligned(); int manageButtonHeight = isOverflow ? mExpandedViewPadding : mManageButtonHeightIncludingMargins; - // On largescreen portrait bubbles are bottom aligned. + // On large screen portrait bubbles are bottom aligned. if (areBubblesBottomAligned() && expandedViewHeight == MAX_HEIGHT) { return mPositionRect.bottom - manageButtonHeight - getExpandedViewHeightForLargeScreen() - mPointerWidth; @@ -794,15 +798,10 @@ public class BubblePositioner { } /** - * Sets the position of the bubble bar in screen coordinates. - * - * @param offsetX the offset of the bubble bar from the edge of the screen on the X axis - * @param offsetY the offset of the bubble bar from the edge of the screen on the Y axis + * Sets the position of the bubble bar in display coordinates. */ - public void setBubbleBarPosition(int offsetX, int offsetY) { - mBubbleBarPosition.set( - getAvailableRect().width() - offsetX, - getAvailableRect().height() + mInsets.top + mInsets.bottom - offsetY); + public void setBubbleBarPosition(Rect bubbleBarBounds) { + mBubbleBarBounds.set(bubbleBarBounds); } /** @@ -823,7 +822,7 @@ public class BubblePositioner { /** The bottom position of the expanded view when showing above the bubble bar. */ public int getExpandedViewBottomForBubbleBar() { - return mBubbleBarPosition.y - mExpandedViewPadding; + return mBubbleBarBounds.top - mExpandedViewPadding; } /** @@ -834,9 +833,9 @@ public class BubblePositioner { } /** - * Returns the on screen co-ordinates of the bubble bar. + * Returns the display coordinates of the bubble bar. */ - public Point getBubbleBarPosition() { - return mBubbleBarPosition; + public Rect getBubbleBarBounds() { + return mBubbleBarBounds; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index b7f749e8a8b6..35c1e8c2a047 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -21,7 +21,6 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static com.android.wm.shell.animation.Interpolators.ALPHA_IN; import static com.android.wm.shell.animation.Interpolators.ALPHA_OUT; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_STACK_VIEW; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.wm.shell.bubbles.BubblePositioner.NUM_VISIBLE_WHEN_RESTING; @@ -204,8 +203,9 @@ public class BubbleStackView extends FrameLayout Choreographer.getInstance().postFrameCallback(frameCallback); } }; - private final BubbleController mBubbleController; + private final BubbleStackViewManager mManager; private final BubbleData mBubbleData; + private final Bubbles.SysuiProxy.Provider mSysuiProxyProvider; private StackViewState mStackViewState = new StackViewState(); private final ValueAnimator mDismissBubbleAnimator; @@ -300,6 +300,9 @@ public class BubbleStackView extends FrameLayout */ private int mPointerIndexDown = -1; + /** Indicates whether bubbles should be reordered at the end of a gesture. */ + private boolean mShouldReorderBubblesAfterGestureCompletes = false; + @Nullable private BubblesNavBarGestureTracker mBubblesNavBarGestureTracker; @@ -708,6 +711,11 @@ public class BubbleStackView extends FrameLayout // Hide the stack after a delay, if needed. updateTemporarilyInvisibleAnimation(false /* hideImmediately */); + + if (mShouldReorderBubblesAfterGestureCompletes) { + mShouldReorderBubblesAfterGestureCompletes = false; + updateBubbleOrderInternal(mBubbleData.getBubbles(), true); + } } }; @@ -849,6 +857,7 @@ public class BubbleStackView extends FrameLayout private BubbleOverflow mBubbleOverflow; private StackEducationView mStackEduView; + private StackEducationView.Manager mStackEducationViewManager; private ManageEducationView mManageEduView; private DismissView mDismissView; @@ -864,15 +873,18 @@ public class BubbleStackView extends FrameLayout private BubblePositioner mPositioner; @SuppressLint("ClickableViewAccessibility") - public BubbleStackView(Context context, BubbleController bubbleController, - BubbleData data, @Nullable SurfaceSynchronizer synchronizer, + public BubbleStackView(Context context, BubbleStackViewManager bubbleStackViewManager, + BubblePositioner bubblePositioner, BubbleData data, + @Nullable SurfaceSynchronizer synchronizer, FloatingContentCoordinator floatingContentCoordinator, + Bubbles.SysuiProxy.Provider sysuiProxyProvider, ShellExecutor mainExecutor) { super(context); mMainExecutor = mainExecutor; - mBubbleController = bubbleController; + mManager = bubbleStackViewManager; mBubbleData = data; + mSysuiProxyProvider = sysuiProxyProvider; Resources res = getResources(); mBubbleSize = res.getDimensionPixelSize(R.dimen.bubble_size); @@ -882,7 +894,7 @@ public class BubbleStackView extends FrameLayout mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding); int elevation = res.getDimensionPixelSize(R.dimen.bubble_elevation); - mPositioner = mBubbleController.getPositioner(); + mPositioner = bubblePositioner; final TypedArray ta = mContext.obtainStyledAttributes( new int[]{android.R.attr.dialogCornerRadius}); @@ -892,7 +904,7 @@ public class BubbleStackView extends FrameLayout final Runnable onBubbleAnimatedOut = () -> { if (getBubbleCount() == 0) { mExpandedViewTemporarilyHidden = false; - mBubbleController.onAllBubblesAnimatedOut(); + mManager.onAllBubblesAnimatedOut(); } }; mStackAnimationController = new StackAnimationController( @@ -1177,14 +1189,17 @@ public class BubbleStackView extends FrameLayout if (mStackAnimationController.isStackOnLeftSide()) { int availableRectOffsetX = mPositioner.getAvailableRect().left - mPositioner.getScreenRect().left; - animate().translationX(-(mBubbleSize + availableRectOffsetX)).start(); + mBubbleContainer + .animate() + .translationX(-(mBubbleSize + availableRectOffsetX)) + .start(); } else { int availableRectOffsetX = mPositioner.getAvailableRect().right - mPositioner.getScreenRect().right; - animate().translationX(mBubbleSize - availableRectOffsetX).start(); + mBubbleContainer.animate().translationX(mBubbleSize - availableRectOffsetX).start(); } } else { - animate().translationX(0).start(); + mBubbleContainer.animate().translationX(0).start(); } }; @@ -1291,16 +1306,12 @@ public class BubbleStackView extends FrameLayout // We only show user education for conversation bubbles right now return false; } - final boolean seen = getPrefBoolean(ManageEducationViewKt.PREF_MANAGED_EDUCATION); + final boolean seen = getPrefBoolean(ManageEducationView.PREF_MANAGED_EDUCATION); final boolean shouldShow = (!seen || BubbleDebugConfig.forceShowUserEducation(mContext)) && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null; - if (BubbleDebugConfig.DEBUG_USER_EDUCATION) { - Log.d(TAG, "Show manage edu: " + shouldShow); - } + ProtoLog.d(WM_SHELL_BUBBLES, "Show manage edu=%b", shouldShow); if (shouldShow && BubbleDebugConfig.neverShowUserEducation(mContext)) { - if (BubbleDebugConfig.DEBUG_USER_EDUCATION) { - Log.d(TAG, "Want to show manage edu, but it is forced hidden"); - } + Log.w(TAG, "Want to show manage edu, but it is forced hidden"); return false; } return shouldShow; @@ -1342,15 +1353,11 @@ public class BubbleStackView extends FrameLayout // We only show user education for conversation bubbles right now return false; } - final boolean seen = getPrefBoolean(StackEducationViewKt.PREF_STACK_EDUCATION); + final boolean seen = getPrefBoolean(StackEducationView.PREF_STACK_EDUCATION); final boolean shouldShow = !seen || BubbleDebugConfig.forceShowUserEducation(mContext); - if (BubbleDebugConfig.DEBUG_USER_EDUCATION) { - Log.d(TAG, "Show stack edu: " + shouldShow); - } + ProtoLog.d(WM_SHELL_BUBBLES, "Show stack edu=%b", shouldShow); if (shouldShow && BubbleDebugConfig.neverShowUserEducation(mContext)) { - if (BubbleDebugConfig.DEBUG_USER_EDUCATION) { - Log.d(TAG, "Want to show stack edu, but it is forced hidden"); - } + Log.w(TAG, "Want to show stack edu, but it is forced hidden"); return false; } return shouldShow; @@ -1369,7 +1376,9 @@ public class BubbleStackView extends FrameLayout return false; } if (mStackEduView == null) { - mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController); + mStackEducationViewManager = mManager::updateWindowFlagsForBackpress; + mStackEduView = + new StackEducationView(mContext, mPositioner, mStackEducationViewManager); addView(mStackEduView); } return showStackEdu(); @@ -1398,7 +1407,9 @@ public class BubbleStackView extends FrameLayout private void updateUserEdu() { if (isStackEduVisible() && !mStackEduView.isHiding()) { removeView(mStackEduView); - mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController); + mStackEducationViewManager = mManager::updateWindowFlagsForBackpress; + mStackEduView = + new StackEducationView(mContext, mPositioner, mStackEducationViewManager); addView(mStackEduView); showStackEdu(); } @@ -1493,7 +1504,7 @@ public class BubbleStackView extends FrameLayout mBubbleSize = mPositioner.getBubbleSize(); for (Bubble b : mBubbleData.getBubbles()) { if (b.getIconView() == null) { - Log.d(TAG, "Display size changed. Icon null: " + b); + Log.w(TAG, "Display size changed. Icon null: " + b); continue; } b.getIconView().setLayoutParams(new LayoutParams(mBubbleSize, mBubbleSize)); @@ -1799,10 +1810,6 @@ public class BubbleStackView extends FrameLayout // via BubbleData.Listener @SuppressLint("ClickableViewAccessibility") void addBubble(Bubble bubble) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "addBubble: " + bubble); - } - final boolean firstBubble = getBubbleCount() == 0; if (firstBubble && shouldShowStackEdu()) { @@ -1848,9 +1855,6 @@ public class BubbleStackView extends FrameLayout // via BubbleData.Listener void removeBubble(Bubble bubble) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "removeBubble: " + bubble); - } if (isExpanded() && getBubbleCount() == 1) { mRemovingLastBubbleWhileExpanded = true; // We're expanded while the last bubble is being removed. Let the scrim animate away @@ -1897,7 +1901,7 @@ public class BubbleStackView extends FrameLayout bubble.cleanupViews(); logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED); } else { - Log.d(TAG, "was asked to remove Bubble, but didn't find the view! " + bubble); + Log.w(TAG, "was asked to remove Bubble, but didn't find the view! " + bubble); } } @@ -1925,7 +1929,18 @@ public class BubbleStackView extends FrameLayout /** * Update bubble order and pointer position. */ - public void updateBubbleOrder(List<Bubble> bubbles, boolean updatePointerPositoion) { + public void updateBubbleOrder(List<Bubble> bubbles, boolean updatePointerPosition) { + // Don't reorder bubbles in the middle of a gesture because that would remove bubbles from + // view hierarchy and will cancel all touch events. Instead wait until the gesture is + // finished and then reorder. + if (mIsGestureInProgress) { + mShouldReorderBubblesAfterGestureCompletes = true; + return; + } + updateBubbleOrderInternal(bubbles, updatePointerPosition); + } + + private void updateBubbleOrderInternal(List<Bubble> bubbles, boolean updatePointerPosition) { final Runnable reorder = () -> { for (int i = 0; i < bubbles.size(); i++) { Bubble bubble = bubbles.get(i); @@ -1936,13 +1951,13 @@ public class BubbleStackView extends FrameLayout reorder.run(); updateBadges(false /* setBadgeForCollapsedStack */); updateZOrder(); - } else if (!isExpansionAnimating()) { + } else { List<View> bubbleViews = bubbles.stream() .map(b -> b.getIconView()).collect(Collectors.toList()); mStackAnimationController.animateReorder(bubbleViews, reorder); } - if (updatePointerPositoion) { + if (updatePointerPosition) { updatePointerPosition(false /* forIme */); } } @@ -1954,10 +1969,6 @@ public class BubbleStackView extends FrameLayout */ // via BubbleData.Listener public void setSelectedBubble(@Nullable BubbleViewProvider bubbleToSelect) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "setSelectedBubble: " + bubbleToSelect); - } - if (bubbleToSelect == null) { mBubbleData.setShowingOverflow(false); return; @@ -2050,10 +2061,6 @@ public class BubbleStackView extends FrameLayout */ // via BubbleData.Listener public void setExpanded(boolean shouldExpand) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "setExpanded: " + shouldExpand); - } - if (!shouldExpand) { // If we're collapsing, release the animating-out surface immediately since we have no // need for it, and this ensures it cannot remain visible as we collapse. @@ -2068,7 +2075,7 @@ public class BubbleStackView extends FrameLayout hideCurrentInputMethod(); - mBubbleController.getSysuiProxy().onStackExpandChanged(shouldExpand); + mSysuiProxyProvider.getSysuiProxy().onStackExpandChanged(shouldExpand); if (wasExpanded) { stopMonitoringSwipeUpGesture(); @@ -2081,7 +2088,7 @@ public class BubbleStackView extends FrameLayout logBubbleEvent(mExpandedBubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__EXPANDED); logBubbleEvent(mExpandedBubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__STACK_EXPANDED); - mBubbleController.isNotificationPanelExpanded(notifPanelExpanded -> { + mManager.checkNotificationPanelExpandedState(notifPanelExpanded -> { if (!notifPanelExpanded && mIsExpanded) { startMonitoringSwipeUpGesture(); } @@ -2095,7 +2102,6 @@ public class BubbleStackView extends FrameLayout * Monitor for swipe up gesture that is used to collapse expanded view */ void startMonitoringSwipeUpGesture() { - ProtoLog.d(WM_SHELL_BUBBLES, "startMonitoringSwipeUpGesture"); stopMonitoringSwipeUpGestureInternal(); if (isGestureNavEnabled()) { @@ -2143,7 +2149,6 @@ public class BubbleStackView extends FrameLayout * Stop monitoring for swipe up gesture */ void stopMonitoringSwipeUpGesture() { - ProtoLog.d(WM_SHELL_BUBBLES, "stopMonitoringSwipeUpGesture"); stopMonitoringSwipeUpGestureInternal(); } @@ -2171,9 +2176,6 @@ public class BubbleStackView extends FrameLayout } void setBubbleSuppressed(Bubble bubble, boolean suppressed) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "setBubbleSuppressed: suppressed=" + suppressed + " bubble=" + bubble); - } if (suppressed) { int index = getBubbleIndex(bubble); mBubbleContainer.removeViewAt(index); @@ -2202,7 +2204,7 @@ public class BubbleStackView extends FrameLayout */ void hideCurrentInputMethod() { mPositioner.setImeVisible(false, 0); - mBubbleController.hideCurrentInputMethod(); + mManager.hideCurrentInputMethod(); } /** Set the stack position to whatever the positioner says. */ @@ -2308,6 +2310,8 @@ public class BubbleStackView extends FrameLayout } private void animateExpansion() { + ProtoLog.d(WM_SHELL_BUBBLES, "animateExpansion, expandedBubble=%s", + mExpandedBubble != null ? mExpandedBubble.getKey() : "null"); cancelDelayedExpandCollapseSwitchAnimations(); final boolean showVertically = mPositioner.showBubblesVertically(); mIsExpanded = true; @@ -2323,7 +2327,8 @@ public class BubbleStackView extends FrameLayout updateOverflowVisibility(); updatePointerPosition(false /* forIme */); mExpandedAnimationController.expandFromStack(() -> { - if (mIsExpanded && mExpandedBubble.getExpandedView() != null) { + if (mIsExpanded && mExpandedBubble != null + && mExpandedBubble.getExpandedView() != null) { maybeShowManageEdu(); } updateOverflowDotVisibility(true /* expanding */); @@ -2384,7 +2389,7 @@ public class BubbleStackView extends FrameLayout } mExpandedViewContainer.setAnimationMatrix(mExpandedViewContainerMatrix); - if (mExpandedBubble.getExpandedView() != null) { + if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { mExpandedBubble.getExpandedView().setContentAlpha(0f); mExpandedBubble.getExpandedView().setBackgroundAlpha(0f); @@ -2433,7 +2438,7 @@ public class BubbleStackView extends FrameLayout private void animateCollapse() { cancelDelayedExpandCollapseSwitchAnimations(); - + ProtoLog.d(WM_SHELL_BUBBLES, "animateCollapse"); if (isManageEduVisible()) { mManageEduView.hide(); } @@ -2476,11 +2481,6 @@ public class BubbleStackView extends FrameLayout mManageEduView.hide(); } - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "animateCollapse"); - Log.d(TAG, BubbleDebugConfig.formatBubblesString(getBubblesOnScreen(), - mExpandedBubble)); - } updateZOrder(); updateBadges(true /* setBadgeForCollapsedStack */); afterExpandedViewAnimation(); @@ -2580,6 +2580,18 @@ public class BubbleStackView extends FrameLayout mExpandedViewTemporarilyHidden = false; mIsBubbleSwitchAnimating = false; mExpandedViewContainer.setAnimationMatrix(null); + + // When a bubble is being dragged, the expanded view is temporarily hidden. + // If the motion ends with dismissing the bubble, with multiple bubbles in + // the stack, we'll end up here to switch to the new bubble. However, the + // expanded view animation might not actually set the z ordering for the + // expanded view correctly, because the view may still be temporarily + // hidden. So set it again here. + BubbleExpandedView bev = mExpandedBubble.getExpandedView(); + if (bev != null) { + mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false); + mExpandedBubble.getExpandedView().setAnimating(false); + } }) .start(); }, 25); @@ -2659,7 +2671,7 @@ public class BubbleStackView extends FrameLayout if (!mExpandedBubble.getExpandedView().isUsingMaxHeight()) { mExpandedViewContainer.animate().translationY(newExpandedViewTop); } - List<Animator> animList = new ArrayList(); + List<Animator> animList = new ArrayList<>(); for (int i = 0; i < mBubbleContainer.getChildCount(); i++) { View child = mBubbleContainer.getChildAt(i); float transY = mPositioner.getExpandedBubbleXY(i, getState()).y; @@ -2862,7 +2874,7 @@ public class BubbleStackView extends FrameLayout if (!shouldShowFlyout(bubble)) { return; } - + ProtoLog.d(WM_SHELL_BUBBLES, "animateFlyout=%s", bubble.getKey()); mFlyoutDragDeltaX = 0f; clearFlyoutOnHide(); mAfterFlyoutHidden = () -> { @@ -3004,6 +3016,9 @@ public class BubbleStackView extends FrameLayout @VisibleForTesting public void showManageMenu(boolean show) { if ((mManageMenu.getVisibility() == VISIBLE) == show) return; + ProtoLog.d(WM_SHELL_BUBBLES, "showManageMenu=%b for bubble=%s", + show, (mExpandedBubble != null ? mExpandedBubble.getKey() : "null")); + mShowingManage = show; // This should not happen, since the manage menu is only visible when there's an expanded @@ -3011,7 +3026,7 @@ public class BubbleStackView extends FrameLayout if (mExpandedBubble == null || mExpandedBubble.getExpandedView() == null) { mManageMenu.setVisibility(View.INVISIBLE); mManageMenuScrim.setVisibility(INVISIBLE); - mBubbleController.getSysuiProxy().onManageMenuExpandChanged(false /* show */); + mSysuiProxyProvider.getSysuiProxy().onManageMenuExpandChanged(false /* show */); return; } if (show) { @@ -3025,7 +3040,7 @@ public class BubbleStackView extends FrameLayout } }; - mBubbleController.getSysuiProxy().onManageMenuExpandChanged(show); + mSysuiProxyProvider.getSysuiProxy().onManageMenuExpandChanged(show); mManageMenuScrim.animate() .setInterpolator(show ? ALPHA_IN : ALPHA_OUT) .alpha(show ? BUBBLE_EXPANDED_SCRIM_ALPHA : 0f) @@ -3135,10 +3150,6 @@ public class BubbleStackView extends FrameLayout } private void updateExpandedBubble() { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "updateExpandedBubble()"); - } - mExpandedViewContainer.removeAllViews(); if (mIsExpanded && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { @@ -3286,9 +3297,6 @@ public class BubbleStackView extends FrameLayout } private void updateExpandedView() { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "updateExpandedView: mIsExpanded=" + mIsExpanded); - } boolean isOverflowExpanded = mExpandedBubble != null && BubbleOverflow.KEY.equals(mExpandedBubble.getKey()); int[] paddings = mPositioner.getExpandedViewContainerPadding( @@ -3513,7 +3521,14 @@ public class BubbleStackView extends FrameLayout */ void onVerticalOffsetChanged(int offset) { // adjust dismiss view vertical position, so that it is still visible to the user - mDismissView.setPadding(/* left = */ 0, /* top = */ 0, /* right = */ 0, offset); + ViewGroup.LayoutParams lp = mDismissView.getLayoutParams(); + if (lp instanceof FrameLayout.LayoutParams) { + FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) lp; + layoutParams.bottomMargin = offset; + mDismissView.setLayoutParams(layoutParams); + } + mMagneticTarget.setScreenVerticalOffset(offset); + mMagneticTarget.updateLocationOnScreen(); } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackViewManager.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackViewManager.kt new file mode 100644 index 000000000000..fb597a05663b --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackViewManager.kt @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2024 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 java.util.function.Consumer + +/** Defines callbacks from [BubbleStackView] to its manager. */ +interface BubbleStackViewManager { + + /** Notifies that all bubbles animated out. */ + fun onAllBubblesAnimatedOut() + + /** Notifies whether backpress should be intercepted. */ + fun updateWindowFlagsForBackpress(interceptBack: Boolean) + + /** + * Checks the current expansion state of the notification panel, and invokes [callback] with the + * result. + */ + fun checkNotificationPanelExpandedState(callback: Consumer<Boolean>) + + /** Requests to hide the current input method. */ + fun hideCurrentInputMethod() + + companion object { + + @JvmStatic + fun fromBubbleController(controller: BubbleController) = object : BubbleStackViewManager { + override fun onAllBubblesAnimatedOut() { + controller.onAllBubblesAnimatedOut() + } + + override fun updateWindowFlagsForBackpress(interceptBack: Boolean) { + controller.updateWindowFlagsForBackpress(interceptBack) + } + + override fun checkNotificationPanelExpandedState(callback: Consumer<Boolean>) { + controller.isNotificationPanelExpanded(callback) + } + + override fun hideCurrentInputMethod() { + controller.hideCurrentInputMethod() + } + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskView.kt new file mode 100644 index 000000000000..65f8e48eb822 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskView.kt @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2024 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.ActivityTaskManager +import android.app.ActivityTaskManager.INVALID_TASK_ID +import android.content.ComponentName +import android.os.RemoteException +import android.util.Log +import androidx.annotation.VisibleForTesting +import com.android.wm.shell.taskview.TaskView +import com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS +import java.util.concurrent.Executor + +/** + * A wrapper class around [TaskView] for bubble expanded views. + * + * [delegateListener] allows callers to change listeners after a task has been created. + */ +class BubbleTaskView(val taskView: TaskView, executor: Executor) { + + /** Whether the task is already created. */ + var isCreated = false + private set + + /** The task id. */ + var taskId = INVALID_TASK_ID + private set + + /** The component name of the application running in the task. */ + var componentName: ComponentName? = null + private set + + /** [TaskView.Listener] for users of this class. */ + var delegateListener: TaskView.Listener? = null + + /** A [TaskView.Listener] that delegates to [delegateListener]. */ + @get:VisibleForTesting + val listener = object : TaskView.Listener { + override fun onInitialized() { + delegateListener?.onInitialized() + } + + override fun onReleased() { + delegateListener?.onReleased() + } + + override fun onTaskCreated(taskId: Int, name: ComponentName) { + delegateListener?.onTaskCreated(taskId, name) + this@BubbleTaskView.taskId = taskId + isCreated = true + componentName = name + } + + override fun onTaskVisibilityChanged(taskId: Int, visible: Boolean) { + delegateListener?.onTaskVisibilityChanged(taskId, visible) + } + + override fun onTaskRemovalStarted(taskId: Int) { + delegateListener?.onTaskRemovalStarted(taskId) + } + + override fun onBackPressedOnTaskRoot(taskId: Int) { + delegateListener?.onBackPressedOnTaskRoot(taskId) + } + } + + init { + taskView.setListener(executor, listener) + } + + /** + * Removes the [TaskView] from window manager. + * + * This should be called after all other cleanup animations have finished. + */ + fun cleanup() { + if (taskId != INVALID_TASK_ID) { + // Ensure the task is removed from WM + if (ENABLE_SHELL_TRANSITIONS) { + taskView.removeTask() + } else { + try { + ActivityTaskManager.getService().removeTask(taskId) + } catch (e: RemoteException) { + Log.w(TAG, e.message ?: "") + } + } + } + } + + private companion object { + const val TAG = "BubbleTaskView" + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewFactory.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewFactory.kt new file mode 100644 index 000000000000..230626f49c51 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewFactory.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 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 + +/** Factory for creating [BubbleTaskView]s. */ +fun interface BubbleTaskViewFactory { + /** Creates a new instance of [BubbleTaskView]. */ + fun create(): BubbleTaskView +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java index da4a9898a44c..21b70b8e32da 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java @@ -20,7 +20,7 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_BUBBLE_EXPANDED_VIEW; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.app.ActivityOptions; import android.app.ActivityTaskManager; @@ -29,16 +29,14 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.graphics.Rect; -import android.os.RemoteException; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import androidx.annotation.Nullable; -import com.android.wm.shell.common.ShellExecutor; -import com.android.wm.shell.common.annotations.ShellMainThread; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.taskview.TaskView; -import com.android.wm.shell.taskview.TaskViewTaskController; /** * Handles creating and updating the {@link TaskView} associated with a {@link Bubble}. @@ -64,8 +62,7 @@ public class BubbleTaskViewHelper { } private final Context mContext; - private final BubbleController mController; - private final @ShellMainThread ShellExecutor mMainExecutor; + private final BubbleExpandedViewManager mExpandedViewManager; private final BubbleTaskViewHelper.Listener mListener; private final View mParentView; @@ -73,7 +70,6 @@ public class BubbleTaskViewHelper { private Bubble mBubble; @Nullable private PendingIntent mPendingIntent; - private TaskViewTaskController mTaskViewTaskController; @Nullable private TaskView mTaskView; private int mTaskId = INVALID_TASK_ID; @@ -84,11 +80,8 @@ public class BubbleTaskViewHelper { @Override public void onInitialized() { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onInitialized: destroyed=" + mDestroyed - + " initialized=" + mInitialized - + " bubble=" + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onInitialized: destroyed=%b initialized=%b bubble=%s", + mDestroyed, mInitialized, getBubbleKey()); if (mDestroyed || mInitialized) { return; @@ -104,10 +97,8 @@ public class BubbleTaskViewHelper { // TODO: I notice inconsistencies in lifecycle // Post to keep the lifecycle normal mParentView.post(() -> { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onInitialized: calling startActivity, bubble=" - + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onInitialized: calling startActivity, bubble=%s", + getBubbleKey()); try { options.setTaskAlwaysOnTop(true); options.setLaunchedFromBubble(true); @@ -151,7 +142,8 @@ public class BubbleTaskViewHelper { // the bubble again so we'll just remove it. Log.w(TAG, "Exception while displaying bubble: " + getBubbleKey() + ", " + e.getMessage() + "; removing bubble"); - mController.removeBubble(getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT); + mExpandedViewManager.removeBubble( + getBubbleKey(), Bubbles.DISMISS_INVALID_INTENT); } mInitialized = true; }); @@ -164,10 +156,8 @@ public class BubbleTaskViewHelper { @Override public void onTaskCreated(int taskId, ComponentName name) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onTaskCreated: taskId=" + taskId - + " bubble=" + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onTaskCreated: taskId=%d bubble=%s", + taskId, getBubbleKey()); // The taskId is saved to use for removeTask, preventing appearance in recent tasks. mTaskId = taskId; @@ -183,37 +173,41 @@ public class BubbleTaskViewHelper { @Override public void onTaskRemovalStarted(int taskId) { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "onTaskRemovalStarted: taskId=" + taskId - + " bubble=" + getBubbleKey()); - } + ProtoLog.d(WM_SHELL_BUBBLES, "onTaskRemovalStarted: taskId=%d bubble=%s", + taskId, getBubbleKey()); if (mBubble != null) { - mController.removeBubble(mBubble.getKey(), Bubbles.DISMISS_TASK_FINISHED); + mExpandedViewManager.removeBubble(mBubble.getKey(), Bubbles.DISMISS_TASK_FINISHED); + } + if (mTaskView != null) { + mTaskView.release(); + ((ViewGroup) mParentView).removeView(mTaskView); + mTaskView = null; } } @Override public void onBackPressedOnTaskRoot(int taskId) { - if (mTaskId == taskId && mController.isStackExpanded()) { + if (mTaskId == taskId && mExpandedViewManager.isStackExpanded()) { mListener.onBackPressed(); } } }; public BubbleTaskViewHelper(Context context, - BubbleController controller, + BubbleExpandedViewManager expandedViewManager, BubbleTaskViewHelper.Listener listener, + BubbleTaskView bubbleTaskView, View parent) { mContext = context; - mController = controller; - mMainExecutor = mController.getMainExecutor(); + mExpandedViewManager = expandedViewManager; mListener = listener; mParentView = parent; - mTaskViewTaskController = new TaskViewTaskController(mContext, - mController.getTaskOrganizer(), - mController.getTaskViewTransitions(), mController.getSyncTransactionQueue()); - mTaskView = new TaskView(mContext, mTaskViewTaskController); - mTaskView.setListener(mMainExecutor, mTaskViewListener); + mTaskView = bubbleTaskView.getTaskView(); + bubbleTaskView.setDelegateListener(mTaskViewListener); + if (bubbleTaskView.isCreated()) { + mTaskId = bubbleTaskView.getTaskId(); + mListener.onTaskCreated(); + } } /** @@ -231,24 +225,6 @@ public class BubbleTaskViewHelper { return false; } - /** Cleans up anything related to the task and {@code TaskView}. */ - public void cleanUpTaskView() { - if (DEBUG_BUBBLE_EXPANDED_VIEW) { - Log.d(TAG, "cleanUpExpandedState: bubble=" + getBubbleKey() + " task=" + mTaskId); - } - if (mTaskId != INVALID_TASK_ID) { - try { - ActivityTaskManager.getService().removeTask(mTaskId); - } catch (RemoteException e) { - Log.w(TAG, e.getMessage()); - } - } - if (mTaskView != null) { - mTaskView.release(); - mTaskView = null; - } - } - /** Returns the bubble key associated with this view. */ @Nullable public String getBubbleKey() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java index bb30c5eeebcf..69119cf4338e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java @@ -70,7 +70,9 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask private Bubble mBubble; private WeakReference<Context> mContext; - private WeakReference<BubbleController> mController; + private WeakReference<BubbleExpandedViewManager> mExpandedViewManager; + private WeakReference<BubbleTaskViewFactory> mTaskViewFactory; + private WeakReference<BubblePositioner> mPositioner; private WeakReference<BubbleStackView> mStackView; private WeakReference<BubbleBarLayerView> mLayerView; private BubbleIconFactory mIconFactory; @@ -84,7 +86,9 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask */ BubbleViewInfoTask(Bubble b, Context context, - BubbleController controller, + BubbleExpandedViewManager expandedViewManager, + BubbleTaskViewFactory taskViewFactory, + BubblePositioner positioner, @Nullable BubbleStackView stackView, @Nullable BubbleBarLayerView layerView, BubbleIconFactory factory, @@ -93,7 +97,9 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask Executor mainExecutor) { mBubble = b; mContext = new WeakReference<>(context); - mController = new WeakReference<>(controller); + mExpandedViewManager = new WeakReference<>(expandedViewManager); + mTaskViewFactory = new WeakReference<>(taskViewFactory); + mPositioner = new WeakReference<>(positioner); mStackView = new WeakReference<>(stackView); mLayerView = new WeakReference<>(layerView); mIconFactory = factory; @@ -109,11 +115,13 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask return null; } if (mLayerView.get() != null) { - return BubbleViewInfo.populateForBubbleBar(mContext.get(), mController.get(), - mLayerView.get(), mIconFactory, mBubble, mSkipInflation); + return BubbleViewInfo.populateForBubbleBar(mContext.get(), mExpandedViewManager.get(), + mTaskViewFactory.get(), mPositioner.get(), mLayerView.get(), mIconFactory, + mBubble, mSkipInflation); } else { - return BubbleViewInfo.populate(mContext.get(), mController.get(), mStackView.get(), - mIconFactory, mBubble, mSkipInflation); + return BubbleViewInfo.populate(mContext.get(), mExpandedViewManager.get(), + mTaskViewFactory.get(), mPositioner.get(), mStackView.get(), mIconFactory, + mBubble, mSkipInflation); } } @@ -135,7 +143,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask } private boolean verifyState() { - if (mController.get().isShowingAsBubbleBar()) { + if (mExpandedViewManager.get().isShowingAsBubbleBar()) { return mLayerView.get() != null; } else { return mStackView.get() != null; @@ -167,16 +175,23 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask Bitmap badgeBitmap; @Nullable - public static BubbleViewInfo populateForBubbleBar(Context c, BubbleController controller, - BubbleBarLayerView layerView, BubbleIconFactory iconFactory, Bubble b, + public static BubbleViewInfo populateForBubbleBar(Context c, + BubbleExpandedViewManager expandedViewManager, + BubbleTaskViewFactory taskViewFactory, + BubblePositioner positioner, + BubbleBarLayerView layerView, + BubbleIconFactory iconFactory, + Bubble b, boolean skipInflation) { BubbleViewInfo info = new BubbleViewInfo(); if (!skipInflation && !b.isInflated()) { + BubbleTaskView bubbleTaskView = b.getOrCreateBubbleTaskView(taskViewFactory); LayoutInflater inflater = LayoutInflater.from(c); info.bubbleBarExpandedView = (BubbleBarExpandedView) inflater.inflate( R.layout.bubble_bar_expanded_view, layerView, false /* attachToRoot */); - info.bubbleBarExpandedView.initialize(controller, false /* isOverflow */); + info.bubbleBarExpandedView.initialize( + expandedViewManager, positioner, false /* isOverflow */, bubbleTaskView); } if (!populateCommonInfo(info, c, b, iconFactory)) { @@ -189,8 +204,13 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask @VisibleForTesting @Nullable - public static BubbleViewInfo populate(Context c, BubbleController controller, - BubbleStackView stackView, BubbleIconFactory iconFactory, Bubble b, + public static BubbleViewInfo populate(Context c, + BubbleExpandedViewManager expandedViewManager, + BubbleTaskViewFactory taskViewFactory, + BubblePositioner positioner, + BubbleStackView stackView, + BubbleIconFactory iconFactory, + Bubble b, boolean skipInflation) { BubbleViewInfo info = new BubbleViewInfo(); @@ -199,11 +219,14 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask LayoutInflater inflater = LayoutInflater.from(c); info.imageView = (BadgedImageView) inflater.inflate( R.layout.bubble_view, stackView, false /* attachToRoot */); - info.imageView.initialize(controller.getPositioner()); + info.imageView.initialize(positioner); + BubbleTaskView bubbleTaskView = b.getOrCreateBubbleTaskView(taskViewFactory); info.expandedView = (BubbleExpandedView) inflater.inflate( R.layout.bubble_expanded_view, stackView, false /* attachToRoot */); - info.expandedView.initialize(controller, stackView, false /* isOverflow */); + info.expandedView.initialize( + expandedViewManager, stackView, positioner, false /* isOverflow */, + bubbleTaskView); } if (!populateCommonInfo(info, c, b, iconFactory)) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java index 759246eb285d..28af0ca6ac6c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java @@ -321,6 +321,13 @@ public interface Bubbles { /** Callback to tell SysUi components execute some methods. */ interface SysuiProxy { + + /** Provider interface for {@link SysuiProxy}. */ + interface Provider { + /** Returns {@link SysuiProxy}. */ + SysuiProxy getSysuiProxy(); + } + void isNotificationPanelExpand(Consumer<Boolean> callback); void getPendingOrActiveEntry(String key, Consumer<BubbleEntry> callback); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblesTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblesTransitionObserver.java index 9e8a385262e4..c1f704ab455d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblesTransitionObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblesTransitionObserver.java @@ -24,8 +24,8 @@ import android.window.TransitionInfo; import androidx.annotation.NonNull; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; /** * Observer used to identify tasks that are opening or moving to front. If a bubble activity is diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl index 5776ad109d19..7a5afec934f5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl @@ -17,6 +17,7 @@ package com.android.wm.shell.bubbles; import android.content.Intent; +import android.graphics.Rect; import com.android.wm.shell.bubbles.IBubblesListener; /** @@ -29,7 +30,7 @@ interface IBubbles { oneway void unregisterBubbleListener(in IBubblesListener listener) = 2; - oneway void showBubble(in String key, in int bubbleBarOffsetX, in int bubbleBarOffsetY) = 3; + oneway void showBubble(in String key, in Rect bubbleBarBounds) = 3; oneway void removeBubble(in String key) = 4; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt index 61e17c8ec459..da71b1c741bb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt @@ -33,15 +33,16 @@ import com.android.wm.shell.animation.Interpolators * User education view to highlight the manage button that allows a user to configure the settings * for the bubble. Shown only the first time a user expands a bubble. */ -class ManageEducationView(context: Context, positioner: BubblePositioner) : LinearLayout(context) { - - private val TAG = - if (BubbleDebugConfig.TAG_WITH_CLASS_NAME) "ManageEducationView" - else BubbleDebugConfig.TAG_BUBBLES - - private val ANIMATE_DURATION: Long = 200 +class ManageEducationView( + context: Context, + private val positioner: BubblePositioner +) : LinearLayout(context) { + + companion object { + const val PREF_MANAGED_EDUCATION: String = "HasSeenBubblesManageOnboarding" + private const val ANIMATE_DURATION: Long = 200 + } - private val positioner: BubblePositioner = positioner private val manageView by lazy { requireViewById<ViewGroup>(R.id.manage_education_view) } private val manageButton by lazy { requireViewById<Button>(R.id.manage_button) } private val gotItButton by lazy { requireViewById<Button>(R.id.got_it) } @@ -128,7 +129,7 @@ class ManageEducationView(context: Context, positioner: BubblePositioner) : Line .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .alpha(1f) } - setShouldShow(false) + updateManageEducationSeen() } /** @@ -218,13 +219,11 @@ class ManageEducationView(context: Context, positioner: BubblePositioner) : Line } } - private fun setShouldShow(shouldShow: Boolean) { + private fun updateManageEducationSeen() { context .getSharedPreferences(context.packageName, Context.MODE_PRIVATE) .edit() - .putBoolean(PREF_MANAGED_EDUCATION, !shouldShow) + .putBoolean(PREF_MANAGED_EDUCATION, true) .apply() } } - -const val PREF_MANAGED_EDUCATION: String = "HasSeenBubblesManageOnboarding" diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt index 2cabb65abe7a..c4108c4129e9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt @@ -34,19 +34,21 @@ import com.android.wm.shell.animation.Interpolators */ class StackEducationView( context: Context, - positioner: BubblePositioner, - controller: BubbleController + private val positioner: BubblePositioner, + private val manager: Manager ) : LinearLayout(context) { - private val TAG = - if (BubbleDebugConfig.TAG_WITH_CLASS_NAME) "BubbleStackEducationView" - else BubbleDebugConfig.TAG_BUBBLES - - private val ANIMATE_DURATION: Long = 200 - private val ANIMATE_DURATION_SHORT: Long = 40 + companion object { + const val PREF_STACK_EDUCATION: String = "HasSeenBubblesOnboarding" + private const val ANIMATE_DURATION: Long = 200 + private const val ANIMATE_DURATION_SHORT: Long = 40 + } - private val positioner: BubblePositioner = positioner - private val controller: BubbleController = controller + /** Callbacks to notify managers of [StackEducationView] about events. */ + interface Manager { + /** Notifies whether backpress should be intercepted. */ + fun updateWindowFlagsForBackpress(interceptBack: Boolean) + } private val view by lazy { requireViewById<View>(R.id.stack_education_layout) } private val titleTextView by lazy { requireViewById<TextView>(R.id.stack_education_title) } @@ -97,7 +99,7 @@ class StackEducationView( override fun onDetachedFromWindow() { super.onDetachedFromWindow() setOnKeyListener(null) - controller.updateWindowFlagsForBackpress(false /* interceptBack */) + manager.updateWindowFlagsForBackpress(false /* interceptBack */) } private fun setTextColor() { @@ -128,7 +130,7 @@ class StackEducationView( isHiding = false if (visibility == VISIBLE) return false - controller.updateWindowFlagsForBackpress(true /* interceptBack */) + manager.updateWindowFlagsForBackpress(true /* interceptBack */) layoutParams.width = if (positioner.isLargeScreen || positioner.isLandscape) context.resources.getDimensionPixelSize(R.dimen.bubbles_user_education_width) @@ -175,7 +177,7 @@ class StackEducationView( .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .alpha(1f) } - setShouldShow(false) + updateStackEducationSeen() return true } @@ -189,20 +191,18 @@ class StackEducationView( if (visibility != VISIBLE || isHiding) return isHiding = true - controller.updateWindowFlagsForBackpress(false /* interceptBack */) + manager.updateWindowFlagsForBackpress(false /* interceptBack */) animate() .alpha(0f) .setDuration(if (isExpanding) ANIMATE_DURATION_SHORT else ANIMATE_DURATION) .withEndAction { visibility = GONE } } - private fun setShouldShow(shouldShow: Boolean) { + private fun updateStackEducationSeen() { context .getSharedPreferences(context.packageName, Context.MODE_PRIVATE) .edit() - .putBoolean(PREF_STACK_EDUCATION, !shouldShow) + .putBoolean(PREF_STACK_EDUCATION, true) .apply() } } - -const val PREF_STACK_EDUCATION: String = "HasSeenBubblesOnboarding" diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java index 5b0239f6d659..7798aa753aa2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java @@ -420,7 +420,7 @@ public class ExpandedAnimationController bubbleView.setTranslationY(y); } - final float expandedY = mPositioner.getExpandedViewYTopAligned(); + final int expandedY = mPositioner.getExpandedViewYTopAligned(); final boolean draggedOutEnough = y > expandedY + mBubbleSizePx || y < expandedY - mBubbleSizePx; if (draggedOutEnough != mBubbleDraggedOutEnough) { @@ -563,7 +563,7 @@ public class ExpandedAnimationController ? p.x - mBubbleSizePx * ANIMATE_TRANSLATION_FACTOR : p.x + mBubbleSizePx * ANIMATE_TRANSLATION_FACTOR; animationForChild(child) - .translationX(fromX, p.y) + .translationX(fromX, p.x) .start(); } else { float fromY = p.y - mBubbleSizePx * ANIMATE_TRANSLATION_FACTOR; @@ -634,4 +634,9 @@ public class ExpandedAnimationController .start(); } } + + /** Returns true if we're in the middle of a collapse or expand animation. */ + boolean isAnimating() { + return mAnimatingCollapse || mAnimatingExpand; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationControllerImpl.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationControllerImpl.java index 845dca34b41f..e43609fe8ff0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationControllerImpl.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationControllerImpl.java @@ -15,14 +15,11 @@ */ package com.android.wm.shell.bubbles.animation; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_COLLAPSE_ANIMATOR; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.DEBUG_EXPANDED_VIEW_DRAGGING; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES; -import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.wm.shell.bubbles.BubbleExpandedView.BACKGROUND_ALPHA; import static com.android.wm.shell.bubbles.BubbleExpandedView.BOTTOM_CLIP_PROPERTY; import static com.android.wm.shell.bubbles.BubbleExpandedView.CONTENT_ALPHA; import static com.android.wm.shell.bubbles.BubbleExpandedView.MANAGE_BUTTON_ALPHA; +import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -31,7 +28,6 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; -import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.ViewConfiguration; @@ -41,6 +37,7 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; +import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.animation.FlingAnimationUtils; import com.android.wm.shell.animation.Interpolators; import com.android.wm.shell.bubbles.BubbleExpandedView; @@ -55,8 +52,6 @@ import java.util.List; */ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimationController { - private static final String TAG = TAG_WITH_CLASS_NAME ? "ExpandedViewAnimCtrl" : TAG_BUBBLES; - private static final float COLLAPSE_THRESHOLD = 0.02f; private static final int COLLAPSE_DURATION_MS = 250; @@ -121,9 +116,6 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio @Override public void setExpandedView(BubbleExpandedView expandedView) { if (mExpandedView != null) { - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "updating expandedView, resetting previous"); - } if (mCollapseAnimation != null) { mCollapseAnimation.cancel(); } @@ -140,17 +132,14 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio if (mExpandedView != null) { mDraggedAmount = OverScroll.dampedScroll(distance, mExpandedView.getContentHeight()); - if (DEBUG_COLLAPSE_ANIMATOR && DEBUG_EXPANDED_VIEW_DRAGGING) { - Log.d(TAG, "updateDrag: distance=" + distance + " dragged=" + mDraggedAmount); - } + ProtoLog.d(WM_SHELL_BUBBLES, + "updateDrag: distance=%f dragged=%d", distance, mDraggedAmount); setCollapsedAmount(mDraggedAmount); if (!mNotifiedAboutThreshold && isPastCollapseThreshold()) { mNotifiedAboutThreshold = true; - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "notifying over collapse threshold"); - } + ProtoLog.d(WM_SHELL_BUBBLES, "notifying over collapse threshold"); vibrateIfEnabled(); } } @@ -172,45 +161,35 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio if (mSwipeDownVelocity > mMinFlingVelocity) { // Swipe velocity is positive and over fling velocity. // This is a swipe down, always reset to expanded state, regardless of dragged amount. - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, - "not collapsing expanded view, swipe down velocity: " + mSwipeDownVelocity - + " minV: " + mMinFlingVelocity); - } + ProtoLog.d(WM_SHELL_BUBBLES, + "not collapsing expanded view, swipe down velocity=%f minV=%d", + mSwipeDownVelocity, mMinFlingVelocity); return false; } if (mSwipeUpVelocity > mMinFlingVelocity) { // Swiping up and over fling velocity, collapse the view. - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, - "collapse expanded view, swipe up velocity: " + mSwipeUpVelocity + " minV: " - + mMinFlingVelocity); - } + ProtoLog.d(WM_SHELL_BUBBLES, + "collapse expanded view, swipe up velocity=%f minV=%d", + mSwipeUpVelocity, mMinFlingVelocity); return true; } if (isPastCollapseThreshold()) { - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "collapse expanded view, past threshold, dragged: " + mDraggedAmount); - } + ProtoLog.d(WM_SHELL_BUBBLES, + "collapse expanded view, past threshold, dragged=%d", mDraggedAmount); return true; } - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "not collapsing expanded view"); - } + ProtoLog.d(WM_SHELL_BUBBLES, "not collapsing expanded view"); return false; } @Override public void animateCollapse(Runnable startStackCollapse, Runnable after) { - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, - "expandedView animate collapse swipeVel=" + mSwipeUpVelocity + " minFlingVel=" - + mMinFlingVelocity); - } + ProtoLog.d(WM_SHELL_BUBBLES, "expandedView animate collapse swipeVel=%f minFlingVel=%d", + mSwipeUpVelocity, mMinFlingVelocity); if (mExpandedView != null) { // Mark it as animating immediately to avoid updates to the view before animation starts mExpandedView.setAnimating(true); @@ -243,9 +222,7 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio @Override public void animateBackToExpanded() { - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "expandedView animate back to expanded"); - } + ProtoLog.d(WM_SHELL_BUBBLES, "expandedView animate back to expanded"); BubbleExpandedView expandedView = mExpandedView; if (expandedView == null) { return; @@ -298,9 +275,7 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio @Override public void reset() { - if (DEBUG_COLLAPSE_ANIMATOR) { - Log.d(TAG, "reset expandedView collapsed state"); - } + ProtoLog.d(WM_SHELL_BUBBLES, "reset expandedView collapsed state"); if (mExpandedView == null) { return; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java index e48732801094..bb0dd95b042f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java @@ -769,8 +769,10 @@ public class StackAnimationController extends boolean swapped = false; for (int newIndex = 0; newIndex < bubbleViews.size(); newIndex++) { View view = bubbleViews.get(newIndex); - final int oldIndex = mLayout.indexOfChild(view); - swapped |= animateSwap(view, oldIndex, newIndex, updateAllIcons, after); + if (view != null) { + final int oldIndex = mLayout.indexOfChild(view); + swapped |= animateSwap(view, oldIndex, newIndex, updateAllIcons, after); + } } if (!swapped) { // All bubbles were at the right position. Make sure badges and z order is correct. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java index 7f34ee0cdd3d..84a616f1e1a0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java @@ -22,7 +22,10 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; +import android.graphics.Rect; import android.util.Log; +import android.util.Size; +import android.view.View; import android.widget.FrameLayout; import androidx.annotation.Nullable; @@ -33,6 +36,7 @@ import com.android.wm.shell.bubbles.BubbleOverflow; import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubbleViewProvider; import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix; +import com.android.wm.shell.common.magnetictarget.MagnetizedObject.MagneticTarget; /** * Helper class to animate a {@link BubbleBarExpandedView} on a bubble. @@ -44,6 +48,15 @@ public class BubbleBarAnimationHelper { private static final float EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT = 0.1f; private static final float EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT = .75f; private static final int EXPANDED_VIEW_ALPHA_ANIMATION_DURATION = 150; + private static final int EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION = 100; + private static final int EXPANDED_VIEW_ANIMATE_POSITION_DURATION = 300; + private static final int EXPANDED_VIEW_DISMISS_DURATION = 250; + private static final int EXPANDED_VIEW_DRAG_ANIMATION_DURATION = 150; + /** + * Additional scale applied to expanded view when it is positioned inside a magnetic target. + */ + private static final float EXPANDED_VIEW_IN_TARGET_SCALE = 0.6f; + private static final float EXPANDED_VIEW_DRAG_SCALE = 0.5f; /** Spring config for the expanded view scale-in animation. */ private final PhysicsAnimator.SpringConfig mScaleInSpringConfig = @@ -62,6 +75,7 @@ public class BubbleBarAnimationHelper { private final Context mContext; private final BubbleBarLayerView mLayerView; private final BubblePositioner mPositioner; + private final int[] mTmpLocation = new int[2]; private BubbleViewProvider mExpandedBubble; private boolean mIsExpanded = false; @@ -136,12 +150,12 @@ public class BubbleBarAnimationHelper { bbev.setVisibility(VISIBLE); // Set the pivot point for the scale, so the view animates out from the bubble bar. - Point bubbleBarPosition = mPositioner.getBubbleBarPosition(); + Rect bubbleBarBounds = mPositioner.getBubbleBarBounds(); mExpandedViewContainerMatrix.setScale( 1f - EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT, 1f - EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT, - bubbleBarPosition.x, - bubbleBarPosition.y); + bubbleBarBounds.centerX(), + bubbleBarBounds.top); bbev.setAnimationMatrix(mExpandedViewContainerMatrix); @@ -181,7 +195,8 @@ public class BubbleBarAnimationHelper { Log.w(TAG, "Trying to animate collapse without a bubble"); return; } - + bbev.setScaleX(1f); + bbev.setScaleY(1f); mExpandedViewContainerMatrix.setScaleX(1f); mExpandedViewContainerMatrix.setScaleY(1f); @@ -209,11 +224,173 @@ public class BubbleBarAnimationHelper { } /** + * Animate the expanded bubble when it is being dragged + */ + public void animateStartDrag() { + final BubbleBarExpandedView bbev = getExpandedView(); + if (bbev == null) { + Log.w(TAG, "Trying to animate start drag without a bubble"); + return; + } + bbev.setPivotX(bbev.getWidth() / 2f); + bbev.setPivotY(0f); + bbev.animate() + .scaleX(EXPANDED_VIEW_DRAG_SCALE) + .scaleY(EXPANDED_VIEW_DRAG_SCALE) + .setInterpolator(Interpolators.EMPHASIZED) + .setDuration(EXPANDED_VIEW_DRAG_ANIMATION_DURATION) + .start(); + } + + /** + * Animates dismissal of currently expanded bubble + * + * @param endRunnable a runnable to run at the end of the animation + */ + public void animateDismiss(Runnable endRunnable) { + mIsExpanded = false; + final BubbleBarExpandedView bbev = getExpandedView(); + if (bbev == null) { + Log.w(TAG, "Trying to animate dismiss without a bubble"); + return; + } + + int[] location = bbev.getLocationOnScreen(); + int diffFromBottom = mPositioner.getScreenRect().bottom - location[1]; + + bbev.animate() + // 2x distance from bottom so the view flies out + .translationYBy(diffFromBottom * 2) + .setDuration(EXPANDED_VIEW_DISMISS_DURATION) + .withEndAction(endRunnable) + .start(); + } + + /** + * Animate current expanded bubble back to its rest position + */ + public void animateToRestPosition() { + BubbleBarExpandedView bbev = getExpandedView(); + if (bbev == null) { + Log.w(TAG, "Trying to animate expanded view to rest position without a bubble"); + return; + } + Point restPoint = getExpandedViewRestPosition(getExpandedViewSize()); + bbev.animate() + .x(restPoint.x) + .y(restPoint.y) + .scaleX(1f) + .scaleY(1f) + .setDuration(EXPANDED_VIEW_ANIMATE_POSITION_DURATION) + .setInterpolator(Interpolators.EMPHASIZED_DECELERATE) + .withStartAction(() -> bbev.setAnimating(true)) + .withEndAction(() -> { + bbev.setAnimating(false); + bbev.resetPivot(); + }) + .start(); + } + + /** + * Animates currently expanded bubble into the given {@link MagneticTarget}. + * + * @param target magnetic target to snap to + * @param endRunnable a runnable to run at the end of the animation + */ + public void animateIntoTarget(MagneticTarget target, @Nullable Runnable endRunnable) { + BubbleBarExpandedView bbev = getExpandedView(); + if (bbev == null) { + Log.w(TAG, "Trying to snap the expanded view to target without a bubble"); + return; + } + + // Calculate scale of expanded view so it fits inside the magnetic target + float bbevMaxSide = Math.max(bbev.getWidth(), bbev.getHeight()); + View targetView = target.getTargetView(); + float targetMaxSide = Math.max(targetView.getWidth(), targetView.getHeight()); + // Reduce target size to have some padding between the target and expanded view + targetMaxSide *= EXPANDED_VIEW_IN_TARGET_SCALE; + float scaleInTarget = targetMaxSide / bbevMaxSide; + + // Scale around the top center of the expanded view. Same as when dragging. + bbev.setPivotX(bbev.getWidth() / 2f); + bbev.setPivotY(0); + + // When the view animates into the target, it is scaled down with the pivot at center top. + // Find the point on the view that would be the center of the view at its final scale. + // Once we know that, we can calculate x and y distance from the center of the target view + // and use that for the translation animation to ensure that the view at final scale is + // placed at the center of the target. + + // Set mTmpLocation to the current location of the view on the screen, taking into account + // any scale applied. + bbev.getLocationOnScreen(mTmpLocation); + // Since pivotX is at the center of the x-axis, even at final scale, center of the view on + // x-axis will be the same as the center of the view at current size. + // Get scaled width of the view and adjust mTmpLocation so that point on x-axis is at the + // center of the view at its current size. + float currentWidth = bbev.getWidth() * bbev.getScaleX(); + mTmpLocation[0] += currentWidth / 2; + // Since pivotY is at the top of the view, at final scale, top coordinate of the view + // remains the same. + // Get height of the view at final scale and adjust mTmpLocation so that point on y-axis is + // moved down by half of the height at final scale. + float targetHeight = bbev.getHeight() * scaleInTarget; + mTmpLocation[1] += targetHeight / 2; + // mTmpLocation is now set to the point on the view that will be the center of the view once + // scale is applied. + + // Calculate the difference between the target's center coordinates and mTmpLocation + float xDiff = target.getCenterOnScreen().x - mTmpLocation[0]; + float yDiff = target.getCenterOnScreen().y - mTmpLocation[1]; + + bbev.animate() + .translationX(bbev.getTranslationX() + xDiff) + .translationY(bbev.getTranslationY() + yDiff) + .scaleX(scaleInTarget) + .scaleY(scaleInTarget) + .setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION) + .setInterpolator(Interpolators.EMPHASIZED) + .withStartAction(() -> bbev.setAnimating(true)) + .withEndAction(() -> { + bbev.setAnimating(false); + if (endRunnable != null) { + endRunnable.run(); + } + }) + .start(); + } + + /** + * Animate currently expanded view when it is released from dismiss view + */ + public void animateUnstuckFromDismissView() { + BubbleBarExpandedView expandedView = getExpandedView(); + if (expandedView == null) { + Log.w(TAG, "Trying to unsnap the expanded view from dismiss without a bubble"); + return; + } + expandedView + .animate() + .scaleX(EXPANDED_VIEW_DRAG_SCALE) + .scaleY(EXPANDED_VIEW_DRAG_SCALE) + .setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION) + .setInterpolator(Interpolators.EMPHASIZED) + .withStartAction(() -> expandedView.setAnimating(true)) + .withEndAction(() -> expandedView.setAnimating(false)) + .start(); + } + + /** * Cancel current animations */ public void cancelAnimations() { PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); mExpandedViewAlphaAnimator.cancel(); + BubbleBarExpandedView bbev = getExpandedView(); + if (bbev != null) { + bbev.animate().cancel(); + } } private @Nullable BubbleBarExpandedView getExpandedView() { @@ -231,21 +408,34 @@ public class BubbleBarAnimationHelper { return; } - boolean isOverflowExpanded = mExpandedBubble.getKey().equals(BubbleOverflow.KEY); - final int padding = mPositioner.getBubbleBarExpandedViewPadding(); - final int width = mPositioner.getExpandedViewWidthForBubbleBar(isOverflowExpanded); - final int height = mPositioner.getExpandedViewHeightForBubbleBar(isOverflowExpanded); + final Size size = getExpandedViewSize(); + Point position = getExpandedViewRestPosition(size); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) bbev.getLayoutParams(); - lp.width = width; - lp.height = height; + lp.width = size.getWidth(); + lp.height = size.getHeight(); bbev.setLayoutParams(lp); + bbev.setX(position.x); + bbev.setY(position.y); + bbev.updateLocation(); + bbev.maybeShowOverflow(); + } + + private Point getExpandedViewRestPosition(Size size) { + final int padding = mPositioner.getBubbleBarExpandedViewPadding(); + Point point = new Point(); if (mLayerView.isOnLeft()) { - bbev.setX(mPositioner.getInsets().left + padding); + point.x = mPositioner.getInsets().left + padding; } else { - bbev.setX(mPositioner.getAvailableRect().width() - width - padding); + point.x = mPositioner.getAvailableRect().width() - size.getWidth() - padding; } - bbev.setY(mPositioner.getExpandedViewBottomForBubbleBar() - height); - bbev.updateLocation(); - bbev.maybeShowOverflow(); + point.y = mPositioner.getExpandedViewBottomForBubbleBar() - size.getHeight(); + return point; + } + + private Size getExpandedViewSize() { + boolean isOverflowExpanded = mExpandedBubble.getKey().equals(BubbleOverflow.KEY); + final int width = mPositioner.getExpandedViewWidthForBubbleBar(isOverflowExpanded); + final int height = mPositioner.getExpandedViewHeightForBubbleBar(isOverflowExpanded); + return new Size(width, height); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index d073f1df938a..ebb8e3e2d207 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -16,6 +16,8 @@ package com.android.wm.shell.bubbles.bar; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; + import android.annotation.Nullable; import android.app.ActivityManager; import android.content.Context; @@ -27,25 +29,24 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.view.ViewOutlineProvider; import android.widget.FrameLayout; import com.android.internal.policy.ScreenDecorationsUtils; import com.android.wm.shell.R; import com.android.wm.shell.bubbles.Bubble; -import com.android.wm.shell.bubbles.BubbleController; +import com.android.wm.shell.bubbles.BubbleExpandedViewManager; import com.android.wm.shell.bubbles.BubbleOverflowContainerView; +import com.android.wm.shell.bubbles.BubblePositioner; +import com.android.wm.shell.bubbles.BubbleTaskView; import com.android.wm.shell.bubbles.BubbleTaskViewHelper; import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.taskview.TaskView; import java.util.function.Supplier; -/** - * Expanded view of a bubble when it's part of the bubble bar. - * - * {@link BubbleController#isShowingAsBubbleBar()} - */ +/** Expanded view of a bubble when it's part of the bubble bar. */ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskViewHelper.Listener { /** * The expanded view listener notifying the {@link BubbleBarLayerView} about the internal @@ -63,14 +64,14 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView private static final String TAG = BubbleBarExpandedView.class.getSimpleName(); private static final int INVALID_TASK_ID = -1; - private BubbleController mController; + private BubbleExpandedViewManager mManager; private boolean mIsOverflow; private BubbleTaskViewHelper mBubbleTaskViewHelper; private BubbleBarMenuViewController mMenuViewController; private @Nullable Supplier<Rect> mLayerBoundsSupplier; private @Nullable Listener mListener; - private BubbleBarHandleView mHandleView = new BubbleBarHandleView(getContext()); + private BubbleBarHandleView mHandleView; private @Nullable TaskView mTaskView; private @Nullable BubbleOverflowContainerView mOverflowView; @@ -111,7 +112,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView setElevation(getResources().getDimensionPixelSize(R.dimen.bubble_elevation)); mCaptionHeight = context.getResources().getDimensionPixelSize( R.dimen.bubble_bar_expanded_view_caption_height); - addView(mHandleView); + mHandleView = findViewById(R.id.bubble_bar_handle_view); applyThemeAttrs(); setClipToOutline(true); setOutlineProvider(new ViewOutlineProvider() { @@ -129,25 +130,33 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView mMenuViewController.hideMenu(false /* animated */); } - /** Set the BubbleController on the view, must be called before doing anything else. */ - public void initialize(BubbleController controller, boolean isOverflow) { - mController = controller; + /** Initializes the view, must be called before doing anything else. */ + public void initialize(BubbleExpandedViewManager expandedViewManager, + BubblePositioner positioner, + boolean isOverflow, + @Nullable BubbleTaskView bubbleTaskView) { + mManager = expandedViewManager; mIsOverflow = isOverflow; if (mIsOverflow) { mOverflowView = (BubbleOverflowContainerView) LayoutInflater.from(getContext()).inflate( R.layout.bubble_overflow_container, null /* root */); - mOverflowView.setBubbleController(mController); + mOverflowView.initialize(expandedViewManager, positioner); addView(mOverflowView); } else { - - mBubbleTaskViewHelper = new BubbleTaskViewHelper(mContext, mController, - /* listener= */ this, + mTaskView = bubbleTaskView.getTaskView(); + mBubbleTaskViewHelper = new BubbleTaskViewHelper(mContext, expandedViewManager, + /* listener= */ this, bubbleTaskView, /* viewParent= */ this); - mTaskView = mBubbleTaskViewHelper.getTaskView(); - addView(mTaskView); + if (mTaskView.getParent() != null) { + ((ViewGroup) mTaskView.getParent()).removeView(mTaskView); + } + FrameLayout.LayoutParams lp = + new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT); + addView(mTaskView, lp); mTaskView.setEnableSurfaceClipping(true); mTaskView.setCornerRadius(mCornerRadius); + mTaskView.setVisibility(VISIBLE); // Handle view needs to draw on top of task view. bringChildToFront(mHandleView); @@ -168,13 +177,13 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView @Override public void onOpenAppSettings(Bubble bubble) { - mController.collapseStack(); + mManager.collapseStack(); mContext.startActivityAsUser(bubble.getSettingsIntent(mContext), bubble.getUser()); } @Override public void onDismissBubble(Bubble bubble) { - mController.dismissBubble(bubble, Bubbles.DISMISS_USER_REMOVED); + mManager.dismissBubble(bubble, Bubbles.DISMISS_USER_REMOVED); } }); mHandleView.setOnClickListener(view -> { @@ -256,14 +265,8 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView mListener.onBackPressed(); } - /** Cleans up task view, should be called when the bubble is no longer active. */ + /** Cleans up the expanded view, should be called when the bubble is no longer active. */ public void cleanUpExpandedState() { - if (mBubbleTaskViewHelper != null) { - if (mTaskView != null) { - removeView(mTaskView); - } - mBubbleTaskViewHelper.cleanUpTaskView(); - } mMenuViewController.hideMenu(false /* animated */); } @@ -275,7 +278,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView if (mMenuViewController.isMenuVisible()) { mMenuViewController.hideMenu(/* animated = */ true); } else { - mController.collapseStack(); + mManager.collapseStack(); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt index 4ea18f78f5b2..5e634a23955a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt @@ -16,70 +16,70 @@ package com.android.wm.shell.bubbles.bar -import android.animation.Animator -import android.animation.AnimatorListenerAdapter -import android.graphics.PointF -import android.graphics.Rect +import android.annotation.SuppressLint import android.view.MotionEvent import android.view.View -import com.android.wm.shell.animation.Interpolators import com.android.wm.shell.common.bubbles.DismissView import com.android.wm.shell.common.bubbles.RelativeTouchListener +import com.android.wm.shell.common.magnetictarget.MagnetizedObject /** Controller for handling drag interactions with [BubbleBarExpandedView] */ +@SuppressLint("ClickableViewAccessibility") class BubbleBarExpandedViewDragController( private val expandedView: BubbleBarExpandedView, private val dismissView: DismissView, + private val animationHelper: BubbleBarAnimationHelper, private val onDismissed: () -> Unit ) { + var isStuckToDismiss: Boolean = false + private set + + private var expandedViewInitialTranslationX = 0f + private var expandedViewInitialTranslationY = 0f + private val magnetizedExpandedView: MagnetizedObject<BubbleBarExpandedView> = + MagnetizedObject.magnetizeView(expandedView) + private val magnetizedDismissTarget: MagnetizedObject.MagneticTarget + init { - expandedView.handleView.setOnTouchListener(HandleDragListener()) - } + magnetizedExpandedView.magnetListener = MagnetListener() + magnetizedExpandedView.animateStuckToTarget = + { + target: MagnetizedObject.MagneticTarget, + _: Float, + _: Float, + _: Boolean, + after: (() -> Unit)? -> + animationHelper.animateIntoTarget(target, after) + } - private fun finishDrag(x: Float, y: Float, viewInitialX: Float, viewInitialY: Float) { - val dismissCircleBounds = Rect().apply { dismissView.circle.getBoundsOnScreen(this) } - if (dismissCircleBounds.contains(x.toInt(), y.toInt())) { - onDismissed() - } else { - resetExpandedViewPosition(viewInitialX, viewInitialY) - } - dismissView.hide() - } + magnetizedDismissTarget = + MagnetizedObject.MagneticTarget(dismissView.circle, dismissView.circle.width) + magnetizedExpandedView.addTarget(magnetizedDismissTarget) - private fun resetExpandedViewPosition(initialX: Float, initialY: Float) { - val listener = - object : AnimatorListenerAdapter() { - override fun onAnimationStart(animation: Animator) { - expandedView.isAnimating = true - } + val dragMotionEventHandler = HandleDragListener() - override fun onAnimationEnd(animation: Animator) { - expandedView.isAnimating = false - } + expandedView.handleView.setOnTouchListener { view, event -> + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + expandedViewInitialTranslationX = expandedView.translationX + expandedViewInitialTranslationY = expandedView.translationY } - expandedView - .animate() - .translationX(initialX) - .translationY(initialY) - .setDuration(RESET_POSITION_ANIM_DURATION) - .setInterpolator(Interpolators.EMPHASIZED_DECELERATE) - .setListener(listener) - .start() + val magnetConsumed = magnetizedExpandedView.maybeConsumeMotionEvent(event) + // Move events can be consumed by the magnetized object + if (event.actionMasked == MotionEvent.ACTION_MOVE && magnetConsumed) { + return@setOnTouchListener true + } + return@setOnTouchListener dragMotionEventHandler.onTouch(view, event) || magnetConsumed + } } private inner class HandleDragListener : RelativeTouchListener() { - private val expandedViewRestPosition = PointF() + private var isMoving = false override fun onDown(v: View, ev: MotionEvent): Boolean { // While animating, don't allow new touch events - if (expandedView.isAnimating) { - return false - } - expandedViewRestPosition.x = expandedView.translationX - expandedViewRestPosition.y = expandedView.translationY - return true + return !expandedView.isAnimating } override fun onMove( @@ -90,8 +90,12 @@ class BubbleBarExpandedViewDragController( dx: Float, dy: Float ) { - expandedView.translationX = expandedViewRestPosition.x + dx - expandedView.translationY = expandedViewRestPosition.y + dy + if (!isMoving) { + isMoving = true + animationHelper.animateStartDrag() + } + expandedView.translationX = expandedViewInitialTranslationX + dx + expandedView.translationY = expandedViewInitialTranslationY + dy dismissView.show() } @@ -105,16 +109,41 @@ class BubbleBarExpandedViewDragController( velX: Float, velY: Float ) { - finishDrag(ev.rawX, ev.rawY, expandedViewRestPosition.x, expandedViewRestPosition.y) + finishDrag() } override fun onCancel(v: View, ev: MotionEvent, viewInitialX: Float, viewInitialY: Float) { - resetExpandedViewPosition(expandedViewRestPosition.x, expandedViewRestPosition.y) - dismissView.hide() + finishDrag() + } + + private fun finishDrag() { + if (!isStuckToDismiss) { + animationHelper.animateToRestPosition() + dismissView.hide() + } + isMoving = false } } - companion object { - const val RESET_POSITION_ANIM_DURATION = 300L + private inner class MagnetListener : MagnetizedObject.MagnetListener { + override fun onStuckToTarget(target: MagnetizedObject.MagneticTarget) { + isStuckToDismiss = true + } + + override fun onUnstuckFromTarget( + target: MagnetizedObject.MagneticTarget, + velX: Float, + velY: Float, + wasFlungOut: Boolean + ) { + isStuckToDismiss = false + animationHelper.animateUnstuckFromDismissView() + } + + override fun onReleasedInTarget(target: MagnetizedObject.MagneticTarget) { + onDismissed() + dismissView.hide() + } } } + diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java index bdb0e206e490..62f2726ad9bd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java @@ -18,6 +18,7 @@ package com.android.wm.shell.bubbles.bar; import static com.android.wm.shell.animation.Interpolators.ALPHA_IN; import static com.android.wm.shell.animation.Interpolators.ALPHA_OUT; +import static com.android.wm.shell.bubbles.Bubbles.DISMISS_USER_GESTURE; import android.annotation.Nullable; import android.content.Context; @@ -25,6 +26,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; import android.graphics.drawable.ColorDrawable; +import android.view.Gravity; import android.view.TouchDelegate; import android.view.View; import android.view.ViewTreeObserver; @@ -32,11 +34,12 @@ import android.view.WindowManager; import android.widget.FrameLayout; import com.android.wm.shell.R; +import com.android.wm.shell.bubbles.Bubble; import com.android.wm.shell.bubbles.BubbleController; +import com.android.wm.shell.bubbles.BubbleData; import com.android.wm.shell.bubbles.BubbleOverflow; import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubbleViewProvider; -import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.bubbles.DeviceConfig; import com.android.wm.shell.bubbles.DismissViewUtils; import com.android.wm.shell.common.bubbles.DismissView; @@ -60,6 +63,7 @@ public class BubbleBarLayerView extends FrameLayout private static final float SCRIM_ALPHA = 0.2f; private final BubbleController mBubbleController; + private final BubbleData mBubbleData; private final BubblePositioner mPositioner; private final BubbleBarAnimationHelper mAnimationHelper; private final BubbleEducationViewController mEducationViewController; @@ -74,10 +78,6 @@ public class BubbleBarLayerView extends FrameLayout private DismissView mDismissView; private @Nullable Consumer<String> mUnBubbleConversationCallback; - // TODO(b/273310265) - currently the view is always on the right, need to update for RTL. - /** Whether the expanded view is displaying on the left of the screen or not. */ - private boolean mOnLeft = false; - /** Whether a bubble is expanded. */ private boolean mIsExpanded = false; @@ -88,9 +88,10 @@ public class BubbleBarLayerView extends FrameLayout private TouchDelegate mHandleTouchDelegate; private final Rect mHandleTouchBounds = new Rect(); - public BubbleBarLayerView(Context context, BubbleController controller) { + public BubbleBarLayerView(Context context, BubbleController controller, BubbleData bubbleData) { super(context); mBubbleController = controller; + mBubbleData = bubbleData; mPositioner = mBubbleController.getPositioner(); mAnimationHelper = new BubbleBarAnimationHelper(context, @@ -154,10 +155,10 @@ public class BubbleBarLayerView extends FrameLayout return mIsExpanded; } - // (TODO: b/273310265): BubblePositioner should be source of truth when this work is done. + // TODO(b/313661121) - when dragging is implemented, check user setting first /** Whether the expanded view is positioned on the left or right side of the screen. */ public boolean isOnLeft() { - return mOnLeft; + return getLayoutDirection() == LAYOUT_DIRECTION_RTL; } /** Shows the expanded view of the provided bubble. */ @@ -206,14 +207,17 @@ public class BubbleBarLayerView extends FrameLayout } }); - mDragController = new BubbleBarExpandedViewDragController(mExpandedView, mDismissView, + mDragController = new BubbleBarExpandedViewDragController( + mExpandedView, + mDismissView, + mAnimationHelper, () -> { mBubbleController.dismissBubble(mExpandedBubble.getKey(), - Bubbles.DISMISS_USER_GESTURE); + DISMISS_USER_GESTURE); return Unit.INSTANCE; }); - addView(mExpandedView, new FrameLayout.LayoutParams(width, height)); + addView(mExpandedView, new LayoutParams(width, height, Gravity.LEFT)); } if (mEducationViewController.isEducationVisible()) { @@ -236,12 +240,48 @@ public class BubbleBarLayerView extends FrameLayout showScrim(true); } + /** Removes the given {@code bubble}. */ + public void removeBubble(Bubble bubble) { + if (mBubbleData.getBubbles().isEmpty()) { + // we're removing the last bubble. collapse the expanded view and cleanup bubble views + // at the end. + collapse(bubble::cleanupViews); + } else { + bubble.cleanupViews(); + } + } + /** Collapses any showing expanded view */ public void collapse() { + collapse(/* endAction= */ null); + } + + /** + * Collapses any showing expanded view. + * + * @param endAction an action to run and the end of the collapse animation. + */ + public void collapse(@Nullable Runnable endAction) { + if (!mIsExpanded) { + return; + } mIsExpanded = false; final BubbleBarExpandedView viewToRemove = mExpandedView; mEducationViewController.hideEducation(/* animated = */ true); - mAnimationHelper.animateCollapse(() -> removeView(viewToRemove)); + Runnable runnable = () -> { + removeView(viewToRemove); + if (endAction != null) { + endAction.run(); + } + if (mBubbleData.getBubbles().isEmpty()) { + mBubbleController.onAllBubblesAnimatedOut(); + } + }; + if (mDragController != null && mDragController.isStuckToDismiss()) { + mAnimationHelper.animateDismiss(runnable); + } else { + mAnimationHelper.animateCollapse(runnable); + } mBubbleController.getSysuiProxy().onStackExpandChanged(false); mExpandedView = null; mDragController = null; @@ -304,7 +344,7 @@ public class BubbleBarLayerView extends FrameLayout lp.width = width; lp.height = height; mExpandedView.setLayoutParams(lp); - if (mOnLeft) { + if (isOnLeft()) { mExpandedView.setX(mPositioner.getInsets().left + padding); } else { mExpandedView.setX(mPositioner.getAvailableRect().width() - width - padding); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/properties/ProdBubbleProperties.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/properties/ProdBubbleProperties.kt index e1dea3babbc2..33b61b164988 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/properties/ProdBubbleProperties.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/properties/ProdBubbleProperties.kt @@ -17,18 +17,19 @@ package com.android.wm.shell.bubbles.properties import android.os.SystemProperties +import com.android.wm.shell.Flags /** Provides bubble properties in production. */ object ProdBubbleProperties : BubbleProperties { - // TODO(b/256873975) Should use proper flag when available to shell/launcher - private var _isBubbleBarEnabled = + private var _isBubbleBarEnabled = Flags.enableBubbleBar() || SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false) override val isBubbleBarEnabled get() = _isBubbleBarEnabled override fun refresh() { - _isBubbleBarEnabled = SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false) + _isBubbleBarEnabled = Flags.enableBubbleBar() || + SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false) } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/SystemWindows.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/SystemWindows.java index 1c74f415ec90..e4cf6d13cb1f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/SystemWindows.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/SystemWindows.java @@ -49,6 +49,7 @@ import android.view.WindowManager; import android.view.WindowlessWindowManager; import android.view.inputmethod.ImeTracker; import android.window.ClientWindowFrames; +import android.window.InputTransferToken; import com.android.internal.os.IResultReceiver; @@ -196,7 +197,7 @@ public class SystemWindows { /** * Gets a token associated with the view that can be used to grant the view focus. */ - public IBinder getFocusGrantToken(View view) { + public InputTransferToken getFocusGrantToken(View view) { SurfaceControlViewHost root = mViewRoots.get(view); if (root == null) { Slog.e(TAG, "Couldn't get focus grant token since view does not exist in " diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt index aac1d0626d30..7c931df35d7b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt @@ -352,8 +352,8 @@ abstract class MagnetizedObject<T : Any>( val targetObjectIsInMagneticFieldOf = associatedTargets.firstOrNull { target -> val distanceFromTargetCenter = hypot( - ev.rawX - target.centerOnScreen.x, - ev.rawY - target.centerOnScreen.y) + ev.rawX - target.centerOnDisplayX(), + ev.rawY - target.centerOnDisplayY()) distanceFromTargetCenter < target.magneticFieldRadiusPx } @@ -406,7 +406,6 @@ abstract class MagnetizedObject<T : Any>( // First, check for relevant gestures concluding with an ACTION_UP. if (ev.action == MotionEvent.ACTION_UP) { - velocityTracker.computeCurrentVelocity(1000 /* units */) val velX = velocityTracker.xVelocity val velY = velocityTracker.yVelocity @@ -542,7 +541,7 @@ abstract class MagnetizedObject<T : Any>( // Whether velocity is sufficient, depending on whether we're flinging into a target at the // top or the bottom of the screen. val velocitySufficient = - if (rawY < target.centerOnScreen.y) velY > flingToTargetMinVelocity + if (rawY < target.centerOnDisplayY()) velY > flingToTargetMinVelocity else velY < flingToTargetMinVelocity if (!velocitySufficient) { @@ -560,15 +559,15 @@ abstract class MagnetizedObject<T : Any>( val yIntercept = rawY - slope * rawX // ...calculate the x value when y = the target's y-coordinate. - targetCenterXIntercept = (target.centerOnScreen.y - yIntercept) / slope + targetCenterXIntercept = (target.centerOnDisplayY() - yIntercept) / slope } // The width of the area we're looking for a fling towards. val targetAreaWidth = target.targetView.width * flingToTargetWidthPercent // Velocity was sufficient, so return true if the intercept is within the target area. - return targetCenterXIntercept > target.centerOnScreen.x - targetAreaWidth / 2 && - targetCenterXIntercept < target.centerOnScreen.x + targetAreaWidth / 2 + return targetCenterXIntercept > target.centerOnDisplayX() - targetAreaWidth / 2 && + targetCenterXIntercept < target.centerOnDisplayX() + targetAreaWidth / 2 } /** Cancel animations on this object's x/y properties. */ @@ -601,6 +600,22 @@ abstract class MagnetizedObject<T : Any>( ) { val centerOnScreen = PointF() + /** + * Set screen vertical offset amount. + * + * Screen surface may be vertically shifted in some cases, for example when one-handed mode + * is enabled. [MagneticTarget] and [MagnetizedObject] set their location in screen + * coordinates (see [MagneticTarget.centerOnScreen] and + * [MagnetizedObject.getLocationOnScreen] respectively). + * + * When a [MagnetizedObject] is dragged, the touch location is determined by + * [MotionEvent.getRawX] and [MotionEvent.getRawY]. These work in display coordinates. When + * screen is shifted due to one-handed mode, display coordinates and screen coordinates do + * not match. To determine if a [MagnetizedObject] is dragged into a [MagneticTarget], view + * location on screen is translated to display coordinates using this offset value. + */ + var screenVerticalOffset: Int = 0 + private val tempLoc = IntArray(2) fun updateLocationOnScreen() { @@ -614,6 +629,23 @@ abstract class MagnetizedObject<T : Any>( tempLoc[1] + targetView.height / 2f - targetView.translationY) } } + + /** + * Get target center coordinate on x-axis on display. [centerOnScreen] has to be up to date + * by calling [updateLocationOnScreen] first. + */ + fun centerOnDisplayX(): Float { + return centerOnScreen.x + } + + /** + * Get target center coordinate on y-axis on display. [centerOnScreen] has to be up to date + * by calling [updateLocationOnScreen] first. Use [screenVerticalOffset] to update the + * screen offset compared to the display. + */ + fun centerOnDisplayY(): Float { + return centerOnScreen.y + screenVerticalOffset + } } companion object { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipBoundsState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipBoundsState.java index 8b6c7b663f82..68d26da2002f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipBoundsState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipBoundsState.java @@ -140,7 +140,7 @@ public class PipBoundsState { // spec takes the aspect ratio of the bounds into account, so both width and height // scale by the same factor. addPipExclusionBoundsChangeCallback((bounds) -> { - mBoundsScale = Math.min((float) bounds.width() / mMaxSize.x, 1.0f); + updateBoundsScale(); }); } @@ -152,6 +152,11 @@ public class PipBoundsState { mSizeSpecSource.onConfigurationChanged(); } + /** Update the bounds scale percentage value. */ + public void updateBoundsScale() { + mBoundsScale = Math.min((float) mBounds.width() / mMaxSize.x, 1.0f); + } + private void reloadResources() { mStashOffset = mContext.getResources().getDimensionPixelSize(R.dimen.pip_stash_offset); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDoubleTapHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java index 1b1ebc39b558..4cbb78f2dae2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDoubleTapHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2024 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. @@ -14,14 +14,12 @@ * limitations under the License. */ -package com.android.wm.shell.pip.phone; +package com.android.wm.shell.common.pip; import android.annotation.IntDef; import android.annotation.NonNull; import android.graphics.Rect; -import com.android.wm.shell.common.pip.PipBoundsState; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -50,9 +48,9 @@ public class PipDoubleTapHelper { @Retention(RetentionPolicy.SOURCE) @interface PipSizeSpec {} - static final int SIZE_SPEC_DEFAULT = 0; - static final int SIZE_SPEC_MAX = 1; - static final int SIZE_SPEC_CUSTOM = 2; + public static final int SIZE_SPEC_DEFAULT = 0; + public static final int SIZE_SPEC_MAX = 1; + public static final int SIZE_SPEC_CUSTOM = 2; /** * Returns MAX or DEFAULT {@link PipSizeSpec} to toggle to/from. @@ -84,7 +82,7 @@ public class PipDoubleTapHelper { * @return pip screen size to switch to */ @PipSizeSpec - static int nextSizeSpec(@NonNull PipBoundsState mPipBoundsState, + public static int nextSizeSpec(@NonNull PipBoundsState mPipBoundsState, @NonNull Rect userResizeBounds) { // is pip screen at its maximum boolean isScreenMax = mPipBoundsState.getBounds().width() diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipMenuController.java index 0775f5279e31..2f1189a8a984 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipMenuController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2024 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.pip; +package com.android.wm.shell.common.pip; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; @@ -33,12 +33,13 @@ import android.view.SurfaceControl; import android.view.WindowManager; import com.android.wm.shell.R; +import com.android.wm.shell.ShellTaskOrganizer; import java.util.List; /** - * Interface to allow {@link com.android.wm.shell.pip.PipTaskOrganizer} to call into - * PiP menu when certain events happen (task appear/vanish, PiP move, etc.) + * Interface to interact with PiP menu when certain events happen + * (task appear/vanish, PiP move, etc.). */ public interface PipMenuController { @@ -52,15 +53,15 @@ public interface PipMenuController { float ALPHA_NO_CHANGE = -1f; /** - * Called when - * {@link PipTaskOrganizer#onTaskAppeared(RunningTaskInfo, SurfaceControl)} + * Called when out implementation of + * {@link ShellTaskOrganizer.TaskListener#onTaskAppeared(RunningTaskInfo, SurfaceControl)} * is called. */ void attach(SurfaceControl leash); /** - * Called when - * {@link PipTaskOrganizer#onTaskVanished(RunningTaskInfo)} is called. + * Called when our implementation of + * {@link ShellTaskOrganizer.TaskListener#onTaskVanished(RunningTaskInfo)} is called. */ void detach(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenConstants.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenConstants.java index 49db8d9c54a6..e8c809e5db4a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenConstants.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenConstants.java @@ -20,10 +20,11 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; -import static android.window.TransitionInfo.FLAG_FIRST_CUSTOM; import android.annotation.IntDef; +import com.android.wm.shell.shared.TransitionUtil; + /** Helper utility class of methods and constants that are available to be imported in Launcher. */ public class SplitScreenConstants { /** Duration used for every split fade-in or fade-out. */ @@ -126,7 +127,7 @@ public class SplitScreenConstants { WINDOWING_MODE_FREEFORM}; /** Flag applied to a transition change to identify it as a divider bar for animation. */ - public static final int FLAG_IS_DIVIDER_BAR = FLAG_FIRST_CUSTOM; + public static final int FLAG_IS_DIVIDER_BAR = TransitionUtil.FLAG_IS_DIVIDER_BAR; public static final String splitPositionToString(@SplitPosition int pos) { switch (pos) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java index 0693543515b4..662f325be38c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java @@ -16,7 +16,7 @@ package com.android.wm.shell.common.split; -import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_ALL_KINDS_WITH_ALL_PINNED; import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_ACTIVITY_TYPES; import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_WINDOWING_MODES; @@ -24,19 +24,27 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; -import android.annotation.Nullable; import android.app.ActivityManager; import android.app.PendingIntent; -import android.content.Context; +import android.content.ComponentName; import android.content.Intent; +import android.content.pm.LauncherApps; +import android.content.pm.ShortcutInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Rect; +import android.os.UserHandle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.internal.util.ArrayUtils; import com.android.wm.shell.Flags; import com.android.wm.shell.ShellTaskOrganizer; +import java.util.Arrays; +import java.util.List; + /** Helper utility class for split screen components to use. */ public class SplitScreenUtils { /** Reverse the split position. */ @@ -135,4 +143,28 @@ public class SplitScreenUtils { return isLandscape; } } + + /** Returns the component from a PendingIntent */ + @Nullable + public static ComponentName getComponent(@Nullable PendingIntent pendingIntent) { + if (pendingIntent == null || pendingIntent.getIntent() == null) { + return null; + } + return pendingIntent.getIntent().getComponent(); + } + + /** Returns the component from a shortcut */ + @Nullable + public static ComponentName getShortcutComponent(@NonNull String packageName, String shortcutId, + @NonNull UserHandle user, @NonNull LauncherApps launcherApps) { + LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery(); + query.setPackage(packageName); + query.setShortcutIds(Arrays.asList(shortcutId)); + query.setQueryFlags(FLAG_MATCH_ALL_KINDS_WITH_ALL_PINNED); + List<ShortcutInfo> shortcuts = launcherApps.getShortcuts(query, user); + ShortcutInfo info = shortcuts != null && shortcuts.size() > 0 + ? shortcuts.get(0) + : null; + return info != null ? info.getActivity() : null; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java index 09d99b204bdb..fa2e23647a39 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIConfiguration.java @@ -71,6 +71,8 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi private static final String HAS_SEEN_VERTICAL_REACHABILITY_EDUCATION_KEY_PREFIX = "has_seen_vertical_reachability_education"; + private static final int MAX_PERCENTAGE_VAL = 100; + /** * The {@link SharedPreferences} instance for the restart dialog and the reachability * education. @@ -82,6 +84,12 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi */ private final SharedPreferences mLetterboxEduSharedPreferences; + /** + * The minimum tolerance of the percentage of activity bounds within its task to hide + * size compat restart button. + */ + private final int mHideSizeCompatRestartButtonTolerance; + // Whether the extended restart dialog is enabled private boolean mIsRestartDialogEnabled; @@ -106,6 +114,9 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi R.bool.config_letterboxIsRestartDialogEnabled); mIsReachabilityEducationEnabled = context.getResources().getBoolean( R.bool.config_letterboxIsReachabilityEducationEnabled); + final int tolerance = context.getResources().getInteger( + R.integer.config_letterboxRestartButtonHideTolerance); + mHideSizeCompatRestartButtonTolerance = getHideSizeCompatRestartButtonTolerance(tolerance); mIsLetterboxRestartDialogAllowed = DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_WINDOW_MANAGER, KEY_ENABLE_LETTERBOX_RESTART_DIALOG, DEFAULT_VALUE_ENABLE_LETTERBOX_RESTART_DIALOG); @@ -179,6 +190,10 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi || !hasSeenVerticalReachabilityEducation(taskInfo)); } + int getHideSizeCompatRestartButtonTolerance() { + return mHideSizeCompatRestartButtonTolerance; + } + boolean getHasSeenLetterboxEducation(int userId) { return mLetterboxEduSharedPreferences .getBoolean(dontShowLetterboxEduKey(userId), /* default= */ false); @@ -218,6 +233,15 @@ public class CompatUIConfiguration implements DeviceConfig.OnPropertiesChangedLi } } + // Returns the minimum tolerance of the percentage of activity bounds within its task to hide + // size compat restart button. Value lower than 0 or higher than 100 will be ignored. + // 100 is the default value where the activity has to fit exactly within the task to allow + // size compat restart button to be hidden. 0 means size compat restart button will always + // be hidden. + private int getHideSizeCompatRestartButtonTolerance(int tolerance) { + return tolerance < 0 || tolerance > MAX_PERCENTAGE_VAL ? MAX_PERCENTAGE_VAL : tolerance; + } + private boolean isReachabilityEducationEnabled() { return mIsReachabilityEducationOverrideEnabled || (mIsReachabilityEducationEnabled && mIsLetterboxReachabilityEducationAllowed); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java index 00e0cdb034b6..dbf7186def8a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java @@ -22,7 +22,9 @@ import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_APPL import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_SUGGESTED; import static android.window.TaskConstants.TASK_CHILD_LAYER_COMPAT_UI; +import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.AppCompatTaskInfo; import android.app.AppCompatTaskInfo.CameraCompatControlState; import android.app.TaskInfo; import android.content.Context; @@ -33,6 +35,7 @@ import android.view.LayoutInflater; import android.view.View; import com.android.internal.annotations.VisibleForTesting; +import com.android.window.flags.Flags; import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayLayout; @@ -68,6 +71,8 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { @VisibleForTesting CompatUILayout mLayout; + private final float mHideScmTolerance; + CompatUIWindowManager(Context context, TaskInfo taskInfo, SyncTransactionQueue syncQueue, CompatUICallback callback, ShellTaskOrganizer.TaskListener taskListener, DisplayLayout displayLayout, @@ -80,6 +85,7 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { mCompatUIHintsState = compatUIHintsState; mCompatUIConfiguration = compatUIConfiguration; mOnRestartButtonClicked = onRestartButtonClicked; + mHideScmTolerance = mCompatUIConfiguration.getHideSizeCompatRestartButtonTolerance(); } @Override @@ -99,7 +105,8 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { @Override protected boolean eligibleToShowLayout() { - return mHasSizeCompat || shouldShowCameraControl(); + return (mHasSizeCompat && shouldShowSizeCompatRestartButton(getLastTaskInfo())) + || shouldShowCameraControl(); } @Override @@ -208,6 +215,30 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { updateSurfacePosition(positionX, positionY); } + @VisibleForTesting + boolean shouldShowSizeCompatRestartButton(@NonNull TaskInfo taskInfo) { + if (!Flags.allowHideScmButton()) { + return true; + } + final AppCompatTaskInfo appCompatTaskInfo = taskInfo.appCompatTaskInfo; + final Rect taskBounds = taskInfo.configuration.windowConfiguration.getBounds(); + final int letterboxArea = computeArea(appCompatTaskInfo.topActivityLetterboxWidth, + appCompatTaskInfo.topActivityLetterboxHeight); + final int taskArea = computeArea(taskBounds.width(), taskBounds.height()); + if (letterboxArea == 0 || taskArea == 0) { + return false; + } + final float percentageAreaOfLetterboxInTask = (float) letterboxArea / taskArea * 100; + return percentageAreaOfLetterboxInTask < mHideScmTolerance; + } + + private int computeArea(int width, int height) { + if (width == 0 || height == 0) { + return 0; + } + return width * height; + } + private void updateVisibilityOfViews() { if (mLayout == null) { return; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java index 180498c50c78..0564c95aef5c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java @@ -332,7 +332,7 @@ public abstract class CompatUIWindowManagerAbstract extends WindowlessWindowMana updateSurfacePosition(); } - @Nullable + @NonNull protected TaskInfo getLastTaskInfo() { return mTaskInfo; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManager.java index afd3b14e8b1d..81d13999e73c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsWindowManager.java @@ -232,6 +232,7 @@ class UserAspectRatioSettingsWindowManager extends CompatUIWindowManagerAbstract return taskInfo.appCompatTaskInfo.topActivityEligibleForUserAspectRatioButton && (taskInfo.appCompatTaskInfo.topActivityBoundsLetterboxed || taskInfo.appCompatTaskInfo.isUserFullscreenOverrideEnabled) + && !taskInfo.appCompatTaskInfo.isSystemFullscreenOverrideEnabled && Intent.ACTION_MAIN.equals(intent.getAction()) && intent.hasCategory(Intent.CATEGORY_LAUNCHER) && (!mUserAspectRatioButtonShownChecker.get() || isShowingButton()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java index b52a118c7f1e..d4ed0170dca8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java @@ -83,7 +83,6 @@ public class TvWMShellModule { DisplayController displayController, DisplayImeController displayImeController, DisplayInsetsController displayInsetsController, - Optional<DragAndDropController> dragAndDropController, Transitions transitions, TransactionPool transactionPool, IconProvider iconProvider, @@ -94,8 +93,8 @@ public class TvWMShellModule { SystemWindows systemWindows) { return new TvSplitScreenController(context, shellInit, shellCommandHandler, shellController, shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController, - displayImeController, displayInsetsController, dragAndDropController, transitions, - transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor, - mainHandler, systemWindows); + displayImeController, displayInsetsController, transitions, transactionPool, + iconProvider, recentTasks, launchAdjacentController, mainExecutor, mainHandler, + systemWindows); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java index 3c6bc1754c5c..0d6a85271fd1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java @@ -78,7 +78,6 @@ import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.displayareahelper.DisplayAreaHelper; import com.android.wm.shell.displayareahelper.DisplayAreaHelperController; -import com.android.wm.shell.draganddrop.DragAndDropController; import com.android.wm.shell.freeform.FreeformComponents; import com.android.wm.shell.fullscreen.FullscreenTaskListener; import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController; @@ -203,20 +202,6 @@ public abstract class WMShellBaseModule { @WMSingleton @Provides - static Optional<DragAndDropController> provideDragAndDropController(Context context, - ShellInit shellInit, - ShellController shellController, - ShellCommandHandler shellCommandHandler, - DisplayController displayController, - UiEventLogger uiEventLogger, - IconProvider iconProvider, - @ShellMainThread ShellExecutor mainExecutor) { - return Optional.ofNullable(DragAndDropController.create(context, shellInit, shellController, - shellCommandHandler, displayController, uiEventLogger, iconProvider, mainExecutor)); - } - - @WMSingleton - @Provides static ShellTaskOrganizer provideShellTaskOrganizer( Context context, ShellInit shellInit, @@ -363,7 +348,8 @@ public abstract class WMShellBaseModule { @ShellMainThread ShellExecutor shellExecutor, @ShellBackgroundThread Handler backgroundHandler, BackAnimationBackground backAnimationBackground, - Optional<ShellBackAnimationRegistry> shellBackAnimationRegistry) { + Optional<ShellBackAnimationRegistry> shellBackAnimationRegistry, + ShellCommandHandler shellCommandHandler) { if (BackAnimationController.IS_ENABLED) { return shellBackAnimationRegistry.map( (animations) -> @@ -374,7 +360,8 @@ public abstract class WMShellBaseModule { backgroundHandler, context, backAnimationBackground, - animations)); + animations, + shellCommandHandler)); } return Optional.empty(); } @@ -909,7 +896,6 @@ public abstract class WMShellBaseModule { DisplayController displayController, DisplayImeController displayImeController, DisplayInsetsController displayInsetsController, - Optional<DragAndDropController> dragAndDropControllerOptional, ShellTaskOrganizer shellTaskOrganizer, Optional<BubbleController> bubblesOptional, Optional<SplitScreenController> splitScreenOptional, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index 71bf487249fb..bd9d89c9892e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -64,6 +64,7 @@ import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler; import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler; import com.android.wm.shell.desktopmode.ToggleResizeDesktopTaskTransitionHandler; import com.android.wm.shell.draganddrop.DragAndDropController; +import com.android.wm.shell.draganddrop.UnhandledDragController; import com.android.wm.shell.freeform.FreeformComponents; import com.android.wm.shell.freeform.FreeformTaskListener; import com.android.wm.shell.freeform.FreeformTaskTransitionHandler; @@ -172,7 +173,7 @@ public abstract class WMShellModule { BubblePositioner positioner, DisplayController displayController, @DynamicOverride Optional<OneHandedController> oneHandedOptional, - Optional<DragAndDropController> dragAndDropController, + DragAndDropController dragAndDropController, @ShellMainThread ShellExecutor mainExecutor, @ShellMainThread Handler mainHandler, @ShellBackgroundThread ShellExecutor bgExecutor, @@ -210,7 +211,6 @@ public abstract class WMShellModule { SyncTransactionQueue syncQueue, Transitions transitions, Optional<DesktopTasksController> desktopTasksController, - RecentsTransitionHandler recentsTransitionHandler, RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) { if (DesktopModeStatus.isEnabled()) { return new DesktopModeWindowDecorViewModel( @@ -226,7 +226,6 @@ public abstract class WMShellModule { syncQueue, transitions, desktopTasksController, - recentsTransitionHandler, rootTaskDisplayAreaOrganizer); } return new CaptionWindowDecorViewModel( @@ -235,7 +234,8 @@ public abstract class WMShellModule { mainChoreographer, taskOrganizer, displayController, - syncQueue); + syncQueue, + transitions); } // @@ -339,7 +339,7 @@ public abstract class WMShellModule { DisplayController displayController, DisplayImeController displayImeController, DisplayInsetsController displayInsetsController, - Optional<DragAndDropController> dragAndDropController, + DragAndDropController dragAndDropController, Transitions transitions, TransactionPool transactionPool, IconProvider iconProvider, @@ -554,6 +554,32 @@ public abstract class WMShellModule { } // + // Drag and drop + // + + @WMSingleton + @Provides + static UnhandledDragController provideUnhandledDragController( + IWindowManager wmService, + @ShellMainThread ShellExecutor mainExecutor) { + return new UnhandledDragController(wmService, mainExecutor); + } + + @WMSingleton + @Provides + static DragAndDropController provideDragAndDropController(Context context, + ShellInit shellInit, + ShellController shellController, + ShellCommandHandler shellCommandHandler, + DisplayController displayController, + UiEventLogger uiEventLogger, + IconProvider iconProvider, + @ShellMainThread ShellExecutor mainExecutor) { + return new DragAndDropController(context, shellInit, shellController, + shellCommandHandler, displayController, uiEventLogger, iconProvider, mainExecutor); + } + + // // Misc // @@ -563,6 +589,7 @@ public abstract class WMShellModule { @ShellCreateTriggerOverride @Provides static Object provideIndependentShellComponentsToCreate( + DragAndDropController dragAndDropController, DefaultMixedHandler defaultMixedHandler) { return new Object(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java index 3b48c67a5bbd..8eecf1c58db0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java @@ -18,18 +18,23 @@ package com.android.wm.shell.dagger.pip; import android.annotation.NonNull; import android.content.Context; +import android.os.Handler; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.common.SystemWindows; import com.android.wm.shell.common.annotations.ShellMainThread; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipDisplayLayoutState; +import com.android.wm.shell.common.pip.PipMediaController; +import com.android.wm.shell.common.pip.PipUiEventLogger; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.dagger.WMShellBaseModule; import com.android.wm.shell.dagger.WMSingleton; +import com.android.wm.shell.pip2.phone.PhonePipMenuController; import com.android.wm.shell.pip2.phone.PipController; import com.android.wm.shell.pip2.phone.PipScheduler; import com.android.wm.shell.pip2.phone.PipTransition; @@ -50,15 +55,16 @@ import java.util.Optional; public abstract class Pip2Module { @WMSingleton @Provides - static PipTransition providePipTransition(@NonNull ShellInit shellInit, + static PipTransition providePipTransition(Context context, + @NonNull ShellInit shellInit, @NonNull ShellTaskOrganizer shellTaskOrganizer, @NonNull Transitions transitions, PipBoundsState pipBoundsState, PipBoundsAlgorithm pipBoundsAlgorithm, Optional<PipController> pipController, @NonNull PipScheduler pipScheduler) { - return new PipTransition(shellInit, shellTaskOrganizer, transitions, pipBoundsState, null, - pipBoundsAlgorithm, pipScheduler); + return new PipTransition(context, shellInit, shellTaskOrganizer, transitions, + pipBoundsState, null, pipBoundsAlgorithm, pipScheduler); } @WMSingleton @@ -85,4 +91,16 @@ public abstract class Pip2Module { @ShellMainThread ShellExecutor mainExecutor) { return new PipScheduler(context, pipBoundsState, mainExecutor); } + + @WMSingleton + @Provides + static PhonePipMenuController providePipPhoneMenuController(Context context, + PipBoundsState pipBoundsState, PipMediaController pipMediaController, + SystemWindows systemWindows, + PipUiEventLogger pipUiEventLogger, + @ShellMainThread ShellExecutor mainExecutor, + @ShellMainThread Handler mainHandler) { + return new PhonePipMenuController(context, pipBoundsState, pipMediaController, + systemWindows, pipUiEventLogger, mainExecutor, mainHandler); + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt new file mode 100644 index 000000000000..fd91ac0affc5 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeShellCommandHandler.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2022 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.desktopmode + +import android.window.WindowContainerTransaction +import com.android.wm.shell.sysui.ShellCommandHandler +import java.io.PrintWriter + +/** + * Handles the shell commands for the DesktopTasksController. + */ +class DesktopModeShellCommandHandler(private val controller: DesktopTasksController) : + ShellCommandHandler.ShellCommandActionHandler { + + override fun onShellCommand(args: Array<String>, pw: PrintWriter): Boolean { + return when (args[0]) { + "moveToDesktop" -> { + if (!runMoveToDesktop(args, pw)) { + pw.println("Task not found. Please enter a valid taskId.") + false + } else { + true + } + } + + else -> { + pw.println("Invalid command: ${args[0]}") + false + } + } + } + + private fun runMoveToDesktop(args: Array<String>, pw: PrintWriter): Boolean { + if (args.size < 2) { + // First argument is the action name. + pw.println("Error: task id should be provided as arguments") + return false + } + + val taskId = try { + args[1].toInt() + } catch (e: NumberFormatException) { + pw.println("Error: task id should be an integer") + return false + } + + return controller.moveToDesktopWithoutDecor(taskId, WindowContainerTransaction()) + } + + override fun printShellCommandHelp(pw: PrintWriter, prefix: String) { + pw.println("$prefix moveToDesktop <taskId> ") + pw.println("$prefix Move a task with given id to desktop mode.") + } +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java index dc82fc1b35dd..88949b2a5acd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java @@ -55,6 +55,26 @@ public class DesktopModeStatus { "persist.wm.debug.desktop_stashing", false); /** + * Flag to indicate whether to apply shadows to windows in desktop mode. + */ + private static final boolean USE_WINDOW_SHADOWS = SystemProperties.getBoolean( + "persist.wm.debug.desktop_use_window_shadows", true); + + /** + * Flag to indicate whether to apply shadows to the focused window in desktop mode. + * + * Note: this flag is only relevant if USE_WINDOW_SHADOWS is false. + */ + private static final boolean USE_WINDOW_SHADOWS_FOCUSED_WINDOW = SystemProperties.getBoolean( + "persist.wm.debug.desktop_use_window_shadows_focused_window", false); + + /** + * Flag to indicate whether to apply shadows to windows in desktop mode. + */ + private static final boolean USE_ROUNDED_CORNERS = SystemProperties.getBoolean( + "persist.wm.debug.desktop_use_rounded_corners", true); + + /** * Return {@code true} is desktop windowing proto 2 is enabled */ public static boolean isEnabled() { @@ -81,4 +101,21 @@ public class DesktopModeStatus { public static boolean isStashingEnabled() { return IS_STASHING_ENABLED; } + + /** + * Return whether to use window shadows. + * + * @param isFocusedWindow whether the window to apply shadows to is focused + */ + public static boolean useWindowShadow(boolean isFocusedWindow) { + return USE_WINDOW_SHADOWS + || (USE_WINDOW_SHADOWS_FOCUSED_WINDOW && isFocusedWindow); + } + + /** + * Return whether to use rounded corners for windows. + */ + public static boolean useRoundedCorners() { + return USE_ROUNDED_CORNERS; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt index c0fc02fadd4d..7c8fcbb16711 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt @@ -86,10 +86,10 @@ class DesktopModeTaskRepository { ) { visibleTasksListeners[visibleTasksListener] = executor displayData.keyIterator().forEach { displayId -> - val visibleTasks = getVisibleTaskCount(displayId) + val visibleTasksCount = getVisibleTaskCount(displayId) val stashed = isStashed(displayId) executor.execute { - visibleTasksListener.onVisibilityChanged(displayId, visibleTasks > 0) + visibleTasksListener.onTasksVisibilityChanged(displayId, visibleTasksCount) visibleTasksListener.onStashedChanged(displayId, stashed) } } @@ -222,10 +222,8 @@ class DesktopModeTaskRepository { val otherDisplays = displayData.keyIterator().asSequence().filter { it != displayId } for (otherDisplayId in otherDisplays) { if (displayData[otherDisplayId].visibleTasks.remove(taskId)) { - // Task removed from other display, check if we should notify listeners - if (displayData[otherDisplayId].visibleTasks.isEmpty()) { - notifyVisibleTaskListeners(otherDisplayId, hasVisibleFreeformTasks = false) - } + notifyVisibleTaskListeners(otherDisplayId, + displayData[otherDisplayId].visibleTasks.size) } } } @@ -248,15 +246,21 @@ class DesktopModeTaskRepository { ) } - // Check if count changed and if there was no tasks or this is the first task - if (prevCount != newCount && (prevCount == 0 || newCount == 0)) { - notifyVisibleTaskListeners(displayId, newCount > 0) + // Check if count changed + if (prevCount != newCount) { + KtProtoLog.d( + WM_SHELL_DESKTOP_MODE, + "DesktopTaskRepo: visibleTaskCount has changed from %d to %d", + prevCount, + newCount + ) + notifyVisibleTaskListeners(displayId, newCount) } } - private fun notifyVisibleTaskListeners(displayId: Int, hasVisibleFreeformTasks: Boolean) { + private fun notifyVisibleTaskListeners(displayId: Int, visibleTasksCount: Int) { visibleTasksListeners.forEach { (listener, executor) -> - executor.execute { listener.onVisibilityChanged(displayId, hasVisibleFreeformTasks) } + executor.execute { listener.onTasksVisibilityChanged(displayId, visibleTasksCount) } } } @@ -264,6 +268,11 @@ class DesktopModeTaskRepository { * Get number of tasks that are marked as visible on given [displayId] */ fun getVisibleTaskCount(displayId: Int): Int { + KtProtoLog.d( + WM_SHELL_DESKTOP_MODE, + "DesktopTaskRepo: visibleTaskCount= %d", + displayData[displayId]?.visibleTasks?.size ?: 0 + ) return displayData[displayId]?.visibleTasks?.size ?: 0 } @@ -292,6 +301,10 @@ class DesktopModeTaskRepository { taskId ) freeformTasksInZOrder.remove(taskId) + KtProtoLog.d( + WM_SHELL_DESKTOP_MODE, + "DesktopTaskRepo: remaining freeform tasks: " + freeformTasksInZOrder.toDumpString() + ) } /** @@ -379,9 +392,9 @@ class DesktopModeTaskRepository { */ interface VisibleTasksListener { /** - * Called when the desktop starts or stops showing freeform tasks. + * Called when the desktop changes the number of visible freeform tasks. */ - fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {} + fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) {} /** * Called when the desktop stashed status changes. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java index a587bed3fef0..6250fc5820aa 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java @@ -16,6 +16,10 @@ package com.android.wm.shell.desktopmode; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; + import static com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler.FINAL_FREEFORM_SCALE; import android.animation.Animator; @@ -39,7 +43,6 @@ import android.view.animation.DecelerateInterpolator; import com.android.wm.shell.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; -import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; @@ -48,100 +51,70 @@ import com.android.wm.shell.common.SyncTransactionQueue; * Animated visual indicator for Desktop Mode windowing transitions. */ public class DesktopModeVisualIndicator { - public static final int INVALID_INDICATOR = -1; - /** Indicates impending transition into desktop mode */ - public static final int TO_DESKTOP_INDICATOR = 1; - /** Indicates impending transition into fullscreen */ - public static final int TO_FULLSCREEN_INDICATOR = 2; - /** Indicates impending transition into split select on the left side */ - public static final int TO_SPLIT_LEFT_INDICATOR = 3; - /** Indicates impending transition into split select on the right side */ - public static final int TO_SPLIT_RIGHT_INDICATOR = 4; + public enum IndicatorType { + /** To be used when we don't want to indicate any transition */ + NO_INDICATOR, + /** Indicates impending transition into desktop mode */ + TO_DESKTOP_INDICATOR, + /** Indicates impending transition into fullscreen */ + TO_FULLSCREEN_INDICATOR, + /** Indicates impending transition into split select on the left side */ + TO_SPLIT_LEFT_INDICATOR, + /** Indicates impending transition into split select on the right side */ + TO_SPLIT_RIGHT_INDICATOR + } private final Context mContext; private final DisplayController mDisplayController; - private final ShellTaskOrganizer mTaskOrganizer; private final RootTaskDisplayAreaOrganizer mRootTdaOrganizer; private final ActivityManager.RunningTaskInfo mTaskInfo; private final SurfaceControl mTaskSurface; - private final Rect mIndicatorRange = new Rect(); private SurfaceControl mLeash; private final SyncTransactionQueue mSyncQueue; private SurfaceControlViewHost mViewHost; private View mView; - private boolean mIsFullscreen; - private int mType; + private IndicatorType mCurrentType; public DesktopModeVisualIndicator(SyncTransactionQueue syncQueue, ActivityManager.RunningTaskInfo taskInfo, DisplayController displayController, - Context context, SurfaceControl taskSurface, ShellTaskOrganizer taskOrganizer, - RootTaskDisplayAreaOrganizer taskDisplayAreaOrganizer, int type) { + Context context, SurfaceControl taskSurface, + RootTaskDisplayAreaOrganizer taskDisplayAreaOrganizer) { mSyncQueue = syncQueue; mTaskInfo = taskInfo; mDisplayController = displayController; mContext = context; mTaskSurface = taskSurface; - mTaskOrganizer = taskOrganizer; mRootTdaOrganizer = taskDisplayAreaOrganizer; - mType = type; - defineIndicatorRange(); - createView(); - } - - /** - * If an indicator is warranted based on the input and task bounds, return the type of - * indicator that should be created. - */ - public static int determineIndicatorType(PointF inputCoordinates, Rect taskBounds, - DisplayLayout layout, Context context) { - int transitionAreaHeight = context.getResources().getDimensionPixelSize( - com.android.wm.shell.R.dimen.desktop_mode_transition_area_height); - int transitionAreaWidth = context.getResources().getDimensionPixelSize( - com.android.wm.shell.R.dimen.desktop_mode_transition_area_width); - if (taskBounds.top <= transitionAreaHeight) return TO_FULLSCREEN_INDICATOR; - if (inputCoordinates.x <= transitionAreaWidth) return TO_SPLIT_LEFT_INDICATOR; - if (inputCoordinates.x >= layout.width() - transitionAreaWidth) { - return TO_SPLIT_RIGHT_INDICATOR; - } - return INVALID_INDICATOR; + mCurrentType = IndicatorType.NO_INDICATOR; } /** - * Determine range of inputs that will keep this indicator displaying. + * Based on the coordinates of the current drag event, determine which indicator type we should + * display, including no visible indicator. + * TODO(b/280828642): Update drag zones per starting windowing mode. */ - private void defineIndicatorRange() { - DisplayLayout layout = mDisplayController.getDisplayLayout(mTaskInfo.displayId); - int captionHeight = mContext.getResources().getDimensionPixelSize( - com.android.wm.shell.R.dimen.freeform_decor_caption_height); + IndicatorType updateIndicatorType(PointF inputCoordinates) { + final DisplayLayout layout = mDisplayController.getDisplayLayout(mTaskInfo.displayId); + // If we are in freeform, we don't want a visible indicator in the "freeform" drag zone. + IndicatorType result = mTaskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM + ? IndicatorType.NO_INDICATOR : IndicatorType.TO_DESKTOP_INDICATOR; int transitionAreaHeight = mContext.getResources().getDimensionPixelSize( com.android.wm.shell.R.dimen.desktop_mode_transition_area_height); int transitionAreaWidth = mContext.getResources().getDimensionPixelSize( com.android.wm.shell.R.dimen.desktop_mode_transition_area_width); - switch (mType) { - case TO_DESKTOP_INDICATOR: - // TO_DESKTOP indicator is only dismissed on release; entire display is valid. - mIndicatorRange.set(0, 0, layout.width(), layout.height()); - break; - case TO_FULLSCREEN_INDICATOR: - // If drag results in caption going above the top edge of the display, we still - // want to transition to fullscreen. - mIndicatorRange.set(0, -captionHeight, layout.width(), transitionAreaHeight); - break; - case TO_SPLIT_LEFT_INDICATOR: - mIndicatorRange.set(0, transitionAreaHeight, transitionAreaWidth, layout.height()); - break; - case TO_SPLIT_RIGHT_INDICATOR: - mIndicatorRange.set(layout.width() - transitionAreaWidth, transitionAreaHeight, - layout.width(), layout.height()); - break; - default: - break; + if (inputCoordinates.y <= transitionAreaHeight) { + result = IndicatorType.TO_FULLSCREEN_INDICATOR; + } else if (inputCoordinates.x <= transitionAreaWidth) { + result = IndicatorType.TO_SPLIT_LEFT_INDICATOR; + } else if (inputCoordinates.x >= layout.width() - transitionAreaWidth) { + result = IndicatorType.TO_SPLIT_RIGHT_INDICATOR; } + transitionIndicator(result); + return result; } - /** * Create a fullscreen indicator with no animation */ @@ -155,34 +128,15 @@ public class DesktopModeVisualIndicator { mView = new View(mContext); final SurfaceControl.Builder builder = new SurfaceControl.Builder(); mRootTdaOrganizer.attachToDisplayArea(mTaskInfo.displayId, builder); - String description; - switch (mType) { - case TO_DESKTOP_INDICATOR: - description = "Desktop indicator"; - break; - case TO_FULLSCREEN_INDICATOR: - description = "Fullscreen indicator"; - break; - case TO_SPLIT_LEFT_INDICATOR: - description = "Split Left indicator"; - break; - case TO_SPLIT_RIGHT_INDICATOR: - description = "Split Right indicator"; - break; - default: - description = "Invalid indicator"; - break; - } mLeash = builder - .setName(description) + .setName("Desktop Mode Visual Indicator") .setContainerLayer() .build(); t.show(mLeash); final WindowManager.LayoutParams lp = - new WindowManager.LayoutParams(screenWidth, screenHeight, - WindowManager.LayoutParams.TYPE_APPLICATION, - WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSPARENT); - lp.setTitle(description + " for Task=" + mTaskInfo.taskId); + new WindowManager.LayoutParams(screenWidth, screenHeight, TYPE_APPLICATION, + FLAG_NOT_FOCUSABLE, PixelFormat.TRANSPARENT); + lp.setTitle("Desktop Mode Visual Indicator"); lp.setTrustedOverlay(); final WindowlessWindowManager windowManager = new WindowlessWindowManager( mTaskInfo.configuration, mLeash, @@ -201,46 +155,48 @@ public class DesktopModeVisualIndicator { } /** - * Create an indicator. Animator fades it in while expanding the bounds outwards. + * Fade indicator in as provided type. Animator fades it in while expanding the bounds outwards. */ - public void createIndicatorWithAnimatedBounds() { - mIsFullscreen = mType == TO_FULLSCREEN_INDICATOR; + private void fadeInIndicator(IndicatorType type) { mView.setBackgroundResource(R.drawable.desktop_windowing_transition_background); final VisualIndicatorAnimator animator = VisualIndicatorAnimator - .animateBounds(mView, mType, + .fadeBoundsIn(mView, type, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); animator.start(); + mCurrentType = type; } /** - * Takes existing fullscreen indicator and animates it to freeform bounds + * Fade out indicator without fully releasing it. Animator fades it out while shrinking bounds. */ - public void transitionFullscreenIndicatorToFreeform() { - mIsFullscreen = false; - mType = TO_DESKTOP_INDICATOR; - final VisualIndicatorAnimator animator = VisualIndicatorAnimator.toFreeformAnimator( - mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); + private void fadeOutIndicator() { + final VisualIndicatorAnimator animator = VisualIndicatorAnimator + .fadeBoundsOut(mView, mCurrentType, + mDisplayController.getDisplayLayout(mTaskInfo.displayId)); animator.start(); - } + mCurrentType = IndicatorType.NO_INDICATOR; - /** - * Takes the existing freeform indicator and animates it to fullscreen - */ - public void transitionFreeformIndicatorToFullscreen() { - mIsFullscreen = true; - mType = TO_FULLSCREEN_INDICATOR; - final VisualIndicatorAnimator animator = - VisualIndicatorAnimator.toFullscreenAnimatorWithAnimatedBounds( - mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId)); - animator.start(); } /** - * Determine if a MotionEvent is in the same range that enabled the indicator. - * Used to dismiss the indicator when a transition will no longer result from releasing. + * Takes existing indicator and animates it to bounds reflecting a new indicator type. */ - public boolean eventOutsideRange(float x, float y) { - return !mIndicatorRange.contains((int) x, (int) y); + private void transitionIndicator(IndicatorType newType) { + if (mCurrentType == newType) return; + if (mView == null) { + createView(); + } + if (mCurrentType == IndicatorType.NO_INDICATOR) { + fadeInIndicator(newType); + } else if (newType == IndicatorType.NO_INDICATOR) { + fadeOutIndicator(); + } else { + final VisualIndicatorAnimator animator = VisualIndicatorAnimator.animateIndicatorType( + mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId), mCurrentType, + newType); + mCurrentType = newType; + animator.start(); + } } /** @@ -260,13 +216,6 @@ public class DesktopModeVisualIndicator { } /** - * Returns true if visual indicator is fullscreen - */ - public boolean isFullscreen() { - return mIsFullscreen; - } - - /** * Animator for Desktop Mode transitions which supports bounds and alpha animation. */ private static class VisualIndicatorAnimator extends ValueAnimator { @@ -274,6 +223,13 @@ public class DesktopModeVisualIndicator { private static final float FULLSCREEN_SCALE_ADJUSTMENT_PERCENT = 0.015f; private static final float INDICATOR_FINAL_OPACITY = 0.7f; + /** Determines how this animator will interact with the view's alpha: + * Fade in, fade out, or no change to alpha + */ + private enum AlphaAnimType{ + ALPHA_FADE_IN_ANIM, ALPHA_FADE_OUT_ANIM, ALPHA_NO_CHANGE_ANIM + } + private final View mView; private final Rect mStartBounds; private final Rect mEndBounds; @@ -288,87 +244,91 @@ public class DesktopModeVisualIndicator { mRectEvaluator = new RectEvaluator(new Rect()); } - /** - * Create animator for visual indicator of fullscreen transition - * - * @param view the view for this indicator - * @param displayLayout information about the display the transitioning task is currently on - */ - public static VisualIndicatorAnimator toFullscreenAnimatorWithAnimatedBounds( - @NonNull View view, @NonNull DisplayLayout displayLayout) { - final int padding = displayLayout.stableInsets().top; - Rect startBounds = new Rect(padding, padding, - displayLayout.width() - padding, displayLayout.height() - padding); + private static VisualIndicatorAnimator fadeBoundsIn( + @NonNull View view, IndicatorType type, @NonNull DisplayLayout displayLayout) { + final Rect startBounds = getIndicatorBounds(displayLayout, type); view.getBackground().setBounds(startBounds); final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( view, startBounds, getMaxBounds(startBounds)); animator.setInterpolator(new DecelerateInterpolator()); - setupIndicatorAnimation(animator); + setupIndicatorAnimation(animator, AlphaAnimType.ALPHA_FADE_IN_ANIM); return animator; } - public static VisualIndicatorAnimator animateBounds( - @NonNull View view, int type, @NonNull DisplayLayout displayLayout) { - final int padding = displayLayout.stableInsets().top; - Rect startBounds = new Rect(); - switch (type) { - case TO_FULLSCREEN_INDICATOR: - startBounds.set(padding, padding, - displayLayout.width() - padding, - displayLayout.height() - padding); - break; - case TO_SPLIT_LEFT_INDICATOR: - startBounds.set(padding, padding, - displayLayout.width() / 2 - padding, - displayLayout.height() - padding); - break; - case TO_SPLIT_RIGHT_INDICATOR: - startBounds.set(displayLayout.width() / 2 + padding, padding, - displayLayout.width() - padding, - displayLayout.height() - padding); - break; - } + private static VisualIndicatorAnimator fadeBoundsOut( + @NonNull View view, IndicatorType type, @NonNull DisplayLayout displayLayout) { + final Rect endBounds = getIndicatorBounds(displayLayout, type); + final Rect startBounds = getMaxBounds(endBounds); view.getBackground().setBounds(startBounds); final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( - view, startBounds, getMaxBounds(startBounds)); + view, startBounds, endBounds); animator.setInterpolator(new DecelerateInterpolator()); - setupIndicatorAnimation(animator); + setupIndicatorAnimation(animator, AlphaAnimType.ALPHA_FADE_OUT_ANIM); return animator; } /** - * Create animator for visual indicator of freeform transition + * Create animator for visual indicator changing type (i.e., fullscreen to freeform, + * freeform to split, etc.) * * @param view the view for this indicator * @param displayLayout information about the display the transitioning task is currently on + * @param origType the original indicator type + * @param newType the new indicator type */ - public static VisualIndicatorAnimator toFreeformAnimator(@NonNull View view, - @NonNull DisplayLayout displayLayout) { - final float adjustmentPercentage = 1f - FINAL_FREEFORM_SCALE; - final int width = displayLayout.width(); - final int height = displayLayout.height(); - Rect startBounds = new Rect(0, 0, width, height); - Rect endBounds = new Rect((int) (adjustmentPercentage * width / 2), - (int) (adjustmentPercentage * height / 2), - (int) (displayLayout.width() - (adjustmentPercentage * width / 2)), - (int) (displayLayout.height() - (adjustmentPercentage * height / 2))); + private static VisualIndicatorAnimator animateIndicatorType(@NonNull View view, + @NonNull DisplayLayout displayLayout, IndicatorType origType, + IndicatorType newType) { + final Rect startBounds = getIndicatorBounds(displayLayout, origType); + final Rect endBounds = getIndicatorBounds(displayLayout, newType); final VisualIndicatorAnimator animator = new VisualIndicatorAnimator( view, startBounds, endBounds); animator.setInterpolator(new DecelerateInterpolator()); - setupIndicatorAnimation(animator); + setupIndicatorAnimation(animator, AlphaAnimType.ALPHA_NO_CHANGE_ANIM); return animator; } + private static Rect getIndicatorBounds(DisplayLayout layout, IndicatorType type) { + final int padding = layout.stableInsets().top; + switch (type) { + case TO_FULLSCREEN_INDICATOR: + return new Rect(padding, padding, + layout.width() - padding, + layout.height() - padding); + case TO_DESKTOP_INDICATOR: + final float adjustmentPercentage = 1f - FINAL_FREEFORM_SCALE; + return new Rect((int) (adjustmentPercentage * layout.width() / 2), + (int) (adjustmentPercentage * layout.height() / 2), + (int) (layout.width() - (adjustmentPercentage * layout.width() / 2)), + (int) (layout.height() - (adjustmentPercentage * layout.height() / 2))); + case TO_SPLIT_LEFT_INDICATOR: + return new Rect(padding, padding, + layout.width() / 2 - padding, + layout.height() - padding); + case TO_SPLIT_RIGHT_INDICATOR: + return new Rect(layout.width() / 2 + padding, padding, + layout.width() - padding, + layout.height() - padding); + default: + throw new IllegalArgumentException("Invalid indicator type provided."); + } + } + /** * Add necessary listener for animation of indicator */ - private static void setupIndicatorAnimation(@NonNull VisualIndicatorAnimator animator) { + private static void setupIndicatorAnimation(@NonNull VisualIndicatorAnimator animator, + AlphaAnimType animType) { animator.addUpdateListener(a -> { if (animator.mView != null) { animator.updateBounds(a.getAnimatedFraction(), animator.mView); - animator.updateIndicatorAlpha(a.getAnimatedFraction(), animator.mView); + if (animType == AlphaAnimType.ALPHA_FADE_IN_ANIM) { + animator.updateIndicatorAlpha(a.getAnimatedFraction(), animator.mView); + } else if (animType == AlphaAnimType.ALPHA_FADE_OUT_ANIM) { + animator.updateIndicatorAlpha(1 - a.getAnimatedFraction(), animator.mView); + } } else { animator.cancel(); } @@ -394,7 +354,7 @@ public class DesktopModeVisualIndicator { if (mStartBounds.equals(mEndBounds)) { return; } - Rect currentBounds = mRectEvaluator.evaluate(fraction, mStartBounds, mEndBounds); + final Rect currentBounds = mRectEvaluator.evaluate(fraction, mStartBounds, mEndBounds); view.getBackground().setBounds(currentBounds); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index 144555dd70c3..42c8d7417611 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -57,7 +57,6 @@ import com.android.wm.shell.common.annotations.ShellMainThread import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT import com.android.wm.shell.desktopmode.DesktopModeTaskRepository.VisibleTasksListener -import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.TO_DESKTOP_INDICATOR import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler.DragToDesktopStateListener import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE import com.android.wm.shell.recents.RecentsTransitionHandler @@ -71,8 +70,8 @@ import com.android.wm.shell.sysui.ShellSharedConstants import com.android.wm.shell.transition.OneShotRemoteHandler import com.android.wm.shell.transition.Transitions import com.android.wm.shell.util.KtProtoLog -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration import com.android.wm.shell.windowdecor.MoveToDesktopAnimator +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.io.PrintWriter import java.util.concurrent.Executor import java.util.function.Consumer @@ -101,14 +100,17 @@ class DesktopTasksController( private val desktopMode: DesktopModeImpl private var visualIndicator: DesktopModeVisualIndicator? = null + private val desktopModeShellCommandHandler: DesktopModeShellCommandHandler = + DesktopModeShellCommandHandler(this) + private val mOnAnimationFinishedCallback = Consumer<SurfaceControl.Transaction> { t: SurfaceControl.Transaction -> visualIndicator?.releaseVisualIndicator(t) visualIndicator = null } private val taskVisibilityListener = object : VisibleTasksListener { - override fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) { - launchAdjacentController.launchAdjacentEnabled = !hasVisibleFreeformTasks + override fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) { + launchAdjacentController.launchAdjacentEnabled = visibleTasksCount == 0 } } private val dragToDesktopStateListener = object : DragToDesktopStateListener { @@ -149,6 +151,8 @@ class DesktopTasksController( private fun onInit() { KtProtoLog.d(WM_SHELL_DESKTOP_MODE, "Initialize DesktopTasksController") shellCommandHandler.addDumpCallback(this::dump, this) + shellCommandHandler.addCommandCallback("desktopmode", desktopModeShellCommandHandler, + this) shellController.addExternalInterface( ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE, { createExternalInterface() }, @@ -171,6 +175,12 @@ class DesktopTasksController( ) } + fun setOnTaskResizeAnimationListener(listener: OnTaskResizeAnimationListener) { + toggleResizeDesktopTaskTransitionHandler.setOnTaskResizeAnimationListener(listener) + enterDesktopTaskTransitionHandler.setOnTaskResizeAnimationListener(listener) + dragToDesktopTransitionHandler.setOnTaskResizeAnimatorListener(listener) + } + /** Setter needed to avoid cyclic dependency. */ fun setSplitScreenController(controller: SplitScreenController) { splitScreenController = controller @@ -232,12 +242,45 @@ class DesktopTasksController( /** Move a task with given `taskId` to desktop */ fun moveToDesktop( - decor: DesktopModeWindowDecoration, taskId: Int, wct: WindowContainerTransaction = WindowContainerTransaction() ) { shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { - task -> moveToDesktop(decor, task, wct) + task -> moveToDesktop(task, wct) + } + } + + /** Move a task with given `taskId` to desktop without decor */ + fun moveToDesktopWithoutDecor( + taskId: Int, + wct: WindowContainerTransaction + ): Boolean { + val task = shellTaskOrganizer.getRunningTaskInfo(taskId) ?: return false + moveToDesktopWithoutDecor(task, wct) + return true + } + + /** + * Move a task to desktop without decor + */ + private fun moveToDesktopWithoutDecor( + task: RunningTaskInfo, + wct: WindowContainerTransaction + ) { + KtProtoLog.v( + WM_SHELL_DESKTOP_MODE, + "DesktopTasksController: moveToDesktopWithoutDecor taskId=%d", + task.taskId + ) + exitSplitIfApplicable(wct, task) + // Bring other apps to front first + bringDesktopAppsToFront(task.displayId, wct) + addMoveToDesktopChanges(wct, task) + + if (Transitions.ENABLE_SHELL_TRANSITIONS) { + transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */) + } else { + shellTaskOrganizer.applyTransaction(wct) } } @@ -245,7 +288,6 @@ class DesktopTasksController( * Move a task to desktop */ fun moveToDesktop( - decor: DesktopModeWindowDecoration, task: RunningTaskInfo, wct: WindowContainerTransaction = WindowContainerTransaction() ) { @@ -260,7 +302,7 @@ class DesktopTasksController( addMoveToDesktopChanges(wct, task) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - enterDesktopTaskTransitionHandler.moveToDesktop(wct, decor) + enterDesktopTaskTransitionHandler.moveToDesktop(wct) } else { shellTaskOrganizer.applyTransaction(wct) } @@ -273,7 +315,6 @@ class DesktopTasksController( fun startDragToDesktop( taskInfo: RunningTaskInfo, dragToDesktopValueAnimator: MoveToDesktopAnimator, - windowDecor: DesktopModeWindowDecoration ) { KtProtoLog.v( WM_SHELL_DESKTOP_MODE, @@ -282,8 +323,7 @@ class DesktopTasksController( ) dragToDesktopTransitionHandler.startDragToDesktopTransition( taskInfo.taskId, - dragToDesktopValueAnimator, - windowDecor + dragToDesktopValueAnimator ) } @@ -320,9 +360,8 @@ class DesktopTasksController( } /** Move a task with given `taskId` to fullscreen */ - fun moveToFullscreen(taskId: Int, windowDecor: DesktopModeWindowDecoration) { + fun moveToFullscreen(taskId: Int) { shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task -> - windowDecor.incrementRelayoutBlock() moveToFullscreenWithAnimation(task, task.positionInParent) } } @@ -485,7 +524,7 @@ class DesktopTasksController( } /** Quick-resizes a desktop task, toggling between the stable bounds and the default bounds. */ - fun toggleDesktopTaskSize(taskInfo: RunningTaskInfo, windowDecor: DesktopModeWindowDecoration) { + fun toggleDesktopTaskSize(taskInfo: RunningTaskInfo) { val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return val stableBounds = Rect() @@ -506,11 +545,7 @@ class DesktopTasksController( val wct = WindowContainerTransaction().setBounds(taskInfo.token, destinationBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - toggleResizeDesktopTaskTransitionHandler.startTransition( - wct, - taskInfo.taskId, - windowDecor - ) + toggleResizeDesktopTaskTransitionHandler.startTransition(wct) } else { shellTaskOrganizer.applyTransaction(wct) } @@ -521,11 +556,7 @@ class DesktopTasksController( * * @param position the portion of the screen (RIGHT or LEFT) we want to snap the task to. */ - fun snapToHalfScreen( - taskInfo: RunningTaskInfo, - windowDecor: DesktopModeWindowDecoration, - position: SnapPosition - ) { + fun snapToHalfScreen(taskInfo: RunningTaskInfo, position: SnapPosition) { val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return val stableBounds = Rect() @@ -555,11 +586,7 @@ class DesktopTasksController( val wct = WindowContainerTransaction().setBounds(taskInfo.token, destinationBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - toggleResizeDesktopTaskTransitionHandler.startTransition( - wct, - taskInfo.taskId, - windowDecor - ) + toggleResizeDesktopTaskTransitionHandler.startTransition(wct) } else { shellTaskOrganizer.applyTransaction(wct) } @@ -721,6 +748,9 @@ class DesktopTasksController( finishTransaction: SurfaceControl.Transaction ) { // Add rounded corners to freeform windows + if (!DesktopModeStatus.useRoundedCorners()) { + return + } val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context) info.changes .filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM } @@ -869,31 +899,34 @@ class DesktopTasksController( * * @param taskInfo the task being dragged. * @param taskSurface SurfaceControl of dragged task. - * @param inputCoordinate coordinates of input. Used for checks against left/right edge of screen. + * @param inputX x coordinate of input. Used for checks against left/right edge of screen. * @param taskBounds bounds of dragged task. Used for checks against status bar height. */ fun onDragPositioningMove( taskInfo: RunningTaskInfo, taskSurface: SurfaceControl, - inputCoordinate: PointF, + inputX: Float, taskBounds: Rect ) { - val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return if (taskInfo.windowingMode != WINDOWING_MODE_FREEFORM) return - var type = DesktopModeVisualIndicator.determineIndicatorType(inputCoordinate, - taskBounds, displayLayout, context) - if (type != DesktopModeVisualIndicator.INVALID_INDICATOR && visualIndicator == null) { + updateVisualIndicator(taskInfo, taskSurface, inputX, taskBounds.top.toFloat()) + } + + fun updateVisualIndicator( + taskInfo: RunningTaskInfo, + taskSurface: SurfaceControl, + inputX: Float, + taskTop: Float + ) { + // If the visual indicator does not exist, create it. + if (visualIndicator == null) { visualIndicator = DesktopModeVisualIndicator( - syncQueue, taskInfo, - displayController, context, taskSurface, shellTaskOrganizer, - rootTaskDisplayAreaOrganizer, type) - visualIndicator?.createIndicatorWithAnimatedBounds() - return - } - if (visualIndicator?.eventOutsideRange(inputCoordinate.x, - taskBounds.top.toFloat()) == true) { - releaseVisualIndicator() + syncQueue, taskInfo, displayController, context, taskSurface, + rootTaskDisplayAreaOrganizer) } + // Then, update the indicator type. + val indicator = visualIndicator ?: return + indicator.updateIndicatorType(PointF(inputX, taskTop)) } /** @@ -903,76 +936,39 @@ class DesktopTasksController( * @param position position of surface when drag ends. * @param inputCoordinate the coordinates of the motion event * @param taskBounds the updated bounds of the task being dragged. - * @param windowDecor the window decoration for the task being dragged */ fun onDragPositioningEnd( taskInfo: RunningTaskInfo, position: Point, inputCoordinate: PointF, - taskBounds: Rect, - windowDecor: DesktopModeWindowDecoration + taskBounds: Rect ) { if (taskInfo.configuration.windowConfiguration.windowingMode != WINDOWING_MODE_FREEFORM) { return } if (taskBounds.top <= transitionAreaHeight) { - windowDecor.incrementRelayoutBlock() moveToFullscreenWithAnimation(taskInfo, position) + return } if (inputCoordinate.x <= transitionAreaWidth) { releaseVisualIndicator() - var wct = WindowContainerTransaction() + val wct = WindowContainerTransaction() addMoveToSplitChanges(wct, taskInfo) splitScreenController.requestEnterSplitSelect(taskInfo, wct, SPLIT_POSITION_TOP_OR_LEFT, taskBounds) + return } if (inputCoordinate.x >= (displayController.getDisplayLayout(taskInfo.displayId)?.width() ?.minus(transitionAreaWidth) ?: return)) { releaseVisualIndicator() - var wct = WindowContainerTransaction() + val wct = WindowContainerTransaction() addMoveToSplitChanges(wct, taskInfo) splitScreenController.requestEnterSplitSelect(taskInfo, wct, SPLIT_POSITION_BOTTOM_OR_RIGHT, taskBounds) - } - } - - /** - * Perform checks required on drag move. Create/release fullscreen indicator and transitions - * indicator to freeform or fullscreen dimensions as needed. - * - * @param taskInfo the task being dragged. - * @param taskSurface SurfaceControl of dragged task. - * @param y coordinate of dragged task. Used for checks against status bar height. - */ - fun onDragPositioningMoveThroughStatusBar( - taskInfo: RunningTaskInfo, - taskSurface: SurfaceControl, - y: Float - ) { - // If the motion event is above the status bar and the visual indicator is not yet visible, - // return since we do not need to show the visual indicator at this point. - if (y < getStatusBarHeight(taskInfo) && visualIndicator == null) { return } - if (visualIndicator == null) { - visualIndicator = DesktopModeVisualIndicator(syncQueue, taskInfo, - displayController, context, taskSurface, shellTaskOrganizer, - rootTaskDisplayAreaOrganizer, TO_DESKTOP_INDICATOR) - // TODO(b/301106941): don't show the indicator until the drag-to-desktop animation has - // started, or it'll be visible too early on top of the task surface, especially in - // the cancel-early case. Also because it shouldn't even be shown in the cancel-early - // case since its dismissal is tied to the cancel animation end, which doesn't even run - // in cancel-early. - visualIndicator?.createIndicatorWithAnimatedBounds() - } - val indicator = visualIndicator ?: return - if (y >= getFreeformTransitionStatusBarDragThreshold(taskInfo)) { - if (indicator.isFullscreen) { - indicator.transitionFullscreenIndicatorToFreeform() - } - } else if (!indicator.isFullscreen) { - indicator.transitionFreeformIndicatorToFullscreen() - } + // A freeform drag-move ended, remove the indicator immediately. + releaseVisualIndicator() } /** @@ -993,14 +989,6 @@ class DesktopTasksController( } /** - * Returns the threshold at which we transition a task into freeform when dragging a - * fullscreen task down from the status bar - */ - private fun getFreeformTransitionStatusBarDragThreshold(taskInfo: RunningTaskInfo): Int { - return 2 * getStatusBarHeight(taskInfo) - } - - /** * Update the exclusion region for a specified task */ fun onExclusionRegionChanged(taskId: Int, exclusionRegion: Region) { @@ -1074,14 +1062,16 @@ class DesktopTasksController( SingleInstanceRemoteListener<DesktopTasksController, IDesktopTaskListener> private val listener: VisibleTasksListener = object : VisibleTasksListener { - override fun onVisibilityChanged(displayId: Int, visible: Boolean) { + override fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) { KtProtoLog.v( WM_SHELL_DESKTOP_MODE, - "IDesktopModeImpl: onVisibilityChanged display=%d visible=%b", + "IDesktopModeImpl: onVisibilityChanged display=%d visible=%d", displayId, - visible + visibleTasksCount ) - remoteListener.call { l -> l.onVisibilityChanged(displayId, visible) } + remoteListener.call { + l -> l.onTasksVisibilityChanged(displayId, visibleTasksCount) + } } override fun onStashedChanged(displayId: Int, stashed: Boolean) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt index 95d7ad5c416f..af26e2980afe 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt @@ -26,6 +26,7 @@ import android.window.WindowContainerToken import android.window.WindowContainerTransaction import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.protolog.ShellProtoLogGroup +import com.android.wm.shell.shared.TransitionUtil import com.android.wm.shell.splitscreen.SplitScreenController import com.android.wm.shell.transition.Transitions import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP @@ -33,10 +34,9 @@ import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_END_DRAG import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP import com.android.wm.shell.transition.Transitions.TransitionHandler import com.android.wm.shell.util.KtProtoLog -import com.android.wm.shell.util.TransitionUtil -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration import com.android.wm.shell.windowdecor.MoveToDesktopAnimator import com.android.wm.shell.windowdecor.MoveToDesktopAnimator.Companion.DRAG_FREEFORM_SCALE +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.util.function.Supplier /** @@ -69,6 +69,7 @@ class DragToDesktopTransitionHandler( private var dragToDesktopStateListener: DragToDesktopStateListener? = null private var splitScreenController: SplitScreenController? = null private var transitionState: TransitionState? = null + private lateinit var onTaskResizeAnimationListener: OnTaskResizeAnimationListener /** Whether a drag-to-desktop transition is in progress. */ val inProgress: Boolean @@ -84,6 +85,10 @@ class DragToDesktopTransitionHandler( splitScreenController = controller } + fun setOnTaskResizeAnimatorListener(listener: OnTaskResizeAnimationListener) { + onTaskResizeAnimationListener = listener + } + /** * Starts a transition that performs a transient launch of Home so that Home is brought to the * front while still keeping the currently focused task that is being dragged resumed. This @@ -96,10 +101,13 @@ class DragToDesktopTransitionHandler( fun startDragToDesktopTransition( taskId: Int, dragToDesktopAnimator: MoveToDesktopAnimator, - windowDecoration: DesktopModeWindowDecoration ) { if (inProgress) { - error("A drag to desktop is already in progress") + KtProtoLog.v( + ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE, + "DragToDesktop: Drag to desktop transition already in progress." + ) + return } val options = ActivityOptions.makeBasic().apply { @@ -124,14 +132,12 @@ class DragToDesktopTransitionHandler( TransitionState.FromSplit( draggedTaskId = taskId, dragAnimator = dragToDesktopAnimator, - windowDecoration = windowDecoration, startTransitionToken = startTransitionToken ) } else { TransitionState.FromFullscreen( draggedTaskId = taskId, dragAnimator = dragToDesktopAnimator, - windowDecoration = windowDecoration, startTransitionToken = startTransitionToken ) } @@ -144,6 +150,12 @@ class DragToDesktopTransitionHandler( * inside the desktop drop zone. */ fun finishDragToDesktopTransition(wct: WindowContainerTransaction) { + if (!inProgress) { + // Don't attempt to finish a drag to desktop transition since there is no transition in + // progress which means that the drag to desktop transition was never successfully + // started. + return + } if (requireTransitionState().startAborted) { // Don't attempt to complete the drag-to-desktop since the start transition didn't // succeed as expected. Just reset the state as if nothing happened. @@ -161,6 +173,12 @@ class DragToDesktopTransitionHandler( * means the user wants to remain in their current windowing mode. */ fun cancelDragToDesktopTransition() { + if (!inProgress) { + // Don't attempt to cancel a drag to desktop transition since there is no transition in + // progress which means that the drag to desktop transition was never successfully + // started. + return + } val state = requireTransitionState() if (state.startAborted) { // Don't attempt to cancel the drag-to-desktop since the start transition didn't @@ -223,7 +241,7 @@ class DragToDesktopTransitionHandler( show(change.leash) } } else if (TransitionInfo.isIndependent(change, info)) { - // Root. + // Root(s). when (state) { is TransitionState.FromSplit -> { state.splitRootChange = change @@ -240,6 +258,9 @@ class DragToDesktopTransitionHandler( } } is TransitionState.FromFullscreen -> { + // Most of the time we expect one change/task here, which should be the + // same that initiated the drag and that should be layered on top of + // everything. if (change.taskInfo?.taskId == state.draggedTaskId) { state.draggedTaskChange = change val bounds = change.endAbsBounds @@ -249,7 +270,18 @@ class DragToDesktopTransitionHandler( show(change.leash) } } else { - throw IllegalStateException("Expected root to be dragged task") + // It's possible to see an additional change that isn't the dragged + // task when the dragged task is translucent and so the task behind it + // is included in the transition since it was visible and is now being + // occluded by the Home task. Just layer it at the bottom and save it + // in case we need to restore order if the drag is cancelled. + state.otherRootChanges.add(change) + val bounds = change.endAbsBounds + startTransaction.apply { + setLayer(change.leash, appLayers - i) + setWindowCrop(change.leash, bounds.width(), bounds.height()) + show(change.leash) + } } } } @@ -375,7 +407,7 @@ class DragToDesktopTransitionHandler( // Accept the merge by applying the merging transaction (applied by #showResizeVeil) // and finish callback. Show the veil and position the task at the first frame before // starting the final animation. - state.windowDecoration.showResizeVeil(t, animStartBounds) + onTaskResizeAnimationListener.onAnimationStart(state.draggedTaskId, t, animStartBounds) finishCallback.onTransitionFinished(null /* wct */) // Because the task surface was scaled down during the drag, we must use the animated @@ -399,11 +431,15 @@ class DragToDesktopTransitionHandler( animBounds.height() ) } - state.windowDecoration.updateResizeVeil(tx, animBounds) + onTaskResizeAnimationListener.onBoundsChange( + state.draggedTaskId, + tx, + animBounds + ) } addListener(object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { - state.windowDecoration.hideResizeVeil() + onTaskResizeAnimationListener.onAnimationEnd(state.draggedTaskId) startTransitionFinishCb.onTransitionFinished(null /* null */) clearState() } @@ -499,8 +535,18 @@ class DragToDesktopTransitionHandler( val wct = WindowContainerTransaction() when (state) { is TransitionState.FromFullscreen -> { + // There may have been tasks sent behind home that are not the dragged task (like + // when the dragged task is translucent and that makes the task behind it visible). + // Restore the order of those first. + state.otherRootChanges.mapNotNull { it.container }.forEach { wc -> + // TODO(b/322852244): investigate why even though these "other" tasks are + // reordered in front of home and behind the translucent dragged task, its + // surface is not visible on screen. + wct.reorder(wc, true /* toTop */) + } val wc = state.draggedTaskChange?.container ?: error("Dragged task should be non-null before cancelling") + // Then the dragged task a the very top. wct.reorder(wc, true /* toTop */) } is TransitionState.FromSplit -> { @@ -536,7 +582,6 @@ class DragToDesktopTransitionHandler( sealed class TransitionState { abstract val draggedTaskId: Int abstract val dragAnimator: MoveToDesktopAnimator - abstract val windowDecoration: DesktopModeWindowDecoration abstract val startTransitionToken: IBinder abstract var startTransitionFinishCb: Transitions.TransitionFinishCallback? abstract var startTransitionFinishTransaction: SurfaceControl.Transaction? @@ -549,7 +594,6 @@ class DragToDesktopTransitionHandler( data class FromFullscreen( override val draggedTaskId: Int, override val dragAnimator: MoveToDesktopAnimator, - override val windowDecoration: DesktopModeWindowDecoration, override val startTransitionToken: IBinder, override var startTransitionFinishCb: Transitions.TransitionFinishCallback? = null, override var startTransitionFinishTransaction: SurfaceControl.Transaction? = null, @@ -558,11 +602,11 @@ class DragToDesktopTransitionHandler( override var draggedTaskChange: Change? = null, override var cancelled: Boolean = false, override var startAborted: Boolean = false, + var otherRootChanges: MutableList<Change> = mutableListOf() ) : TransitionState() data class FromSplit( override val draggedTaskId: Int, override val dragAnimator: MoveToDesktopAnimator, - override val windowDecoration: DesktopModeWindowDecoration, override val startTransitionToken: IBinder, override var startTransitionFinishCb: Transitions.TransitionFinishCallback? = null, override var startTransitionFinishTransaction: SurfaceControl.Transaction? = null, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java index 605600f54823..07cf202ddfac 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java @@ -38,7 +38,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration; +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener; import java.util.ArrayList; import java.util.List; @@ -59,8 +59,8 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition public static final int FREEFORM_ANIMATION_DURATION = 336; private final List<IBinder> mPendingTransitionTokens = new ArrayList<>(); - private DesktopModeWindowDecoration mDesktopModeWindowDecoration; + private OnTaskResizeAnimationListener mOnTaskResizeAnimationListener; public EnterDesktopTaskTransitionHandler( Transitions transitions) { this(transitions, SurfaceControl.Transaction::new); @@ -73,14 +73,15 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition mTransactionSupplier = supplier; } + void setOnTaskResizeAnimationListener(OnTaskResizeAnimationListener listener) { + mOnTaskResizeAnimationListener = listener; + } + /** * Starts Transition of type TRANSIT_MOVE_TO_DESKTOP * @param wct WindowContainerTransaction for transition - * @param decor {@link DesktopModeWindowDecoration} of task being animated */ - public void moveToDesktop(@NonNull WindowContainerTransaction wct, - DesktopModeWindowDecoration decor) { - mDesktopModeWindowDecoration = decor; + public void moveToDesktop(@NonNull WindowContainerTransaction wct) { final IBinder token = mTransitions.startTransition(TRANSIT_MOVE_TO_DESKTOP, wct, this); mPendingTransitionTokens.add(token); } @@ -136,33 +137,33 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition @NonNull TransitionInfo.Change change, @NonNull SurfaceControl.Transaction startT, @NonNull Transitions.TransitionFinishCallback finishCallback) { - if (mDesktopModeWindowDecoration == null) { - Slog.e(TAG, "Window Decoration is not available for this transition"); + final SurfaceControl leash = change.getLeash(); + final Rect startBounds = change.getStartAbsBounds(); + final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); + if (mOnTaskResizeAnimationListener == null) { + Slog.e(TAG, "onTaskResizeAnimationListener is not available for this transition"); return false; } - final SurfaceControl leash = change.getLeash(); - final Rect startBounds = change.getStartAbsBounds(); - startT.setPosition(leash, startBounds.left, startBounds.right) + startT.setPosition(leash, startBounds.left, startBounds.top) .setWindowCrop(leash, startBounds.width(), startBounds.height()) .show(leash); - mDesktopModeWindowDecoration.showResizeVeil(startT, startBounds); - + mOnTaskResizeAnimationListener.onAnimationStart(taskInfo.taskId, startT, startBounds); final ValueAnimator animator = ValueAnimator.ofObject(new RectEvaluator(), change.getStartAbsBounds(), change.getEndAbsBounds()); animator.setDuration(FREEFORM_ANIMATION_DURATION); SurfaceControl.Transaction t = mTransactionSupplier.get(); animator.addUpdateListener(animation -> { final Rect animationValue = (Rect) animator.getAnimatedValue(); - t.setPosition(leash, animationValue.left, animationValue.right) + t.setPosition(leash, animationValue.left, animationValue.top) .setWindowCrop(leash, animationValue.width(), animationValue.height()) .show(leash); - mDesktopModeWindowDecoration.updateResizeVeil(t, animationValue); + mOnTaskResizeAnimationListener.onBoundsChange(taskInfo.taskId, t, animationValue); }); animator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - mDesktopModeWindowDecoration.hideResizeVeil(); + mOnTaskResizeAnimationListener.onAnimationEnd(taskInfo.taskId); mTransitions.getMainExecutor().execute( () -> finishCallback.onTransitionFinished(null)); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl index 39128a863ec9..8ed87f23bf40 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopTaskListener.aidl @@ -22,8 +22,8 @@ package com.android.wm.shell.desktopmode; */ interface IDesktopTaskListener { - /** Desktop task visibility has change. Visible if at least 1 task is visible. */ - oneway void onVisibilityChanged(int displayId, boolean visible); + /** Desktop tasks visibility has changed. Visible if at least 1 task is visible. */ + oneway void onTasksVisibilityChanged(int displayId, int visibleTasksCount); /** Desktop task stashed status has changed. */ oneway void onStashedChanged(int displayId, boolean stashed); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt index 9debb25ff296..c469e652b117 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt @@ -21,7 +21,6 @@ import android.animation.RectEvaluator import android.animation.ValueAnimator import android.graphics.Rect import android.os.IBinder -import android.util.SparseArray import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CHANGE import android.window.TransitionInfo @@ -30,7 +29,7 @@ import android.window.WindowContainerTransaction import androidx.core.animation.addListener import com.android.wm.shell.transition.Transitions import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.util.function.Supplier /** Handles the animation of quick resizing of desktop tasks. */ @@ -40,7 +39,7 @@ class ToggleResizeDesktopTaskTransitionHandler( ) : Transitions.TransitionHandler { private val rectEvaluator = RectEvaluator(Rect()) - private val taskToDecorationMap = SparseArray<DesktopModeWindowDecoration>() + private lateinit var onTaskResizeAnimationListener: OnTaskResizeAnimationListener private var boundsAnimator: Animator? = null @@ -49,15 +48,12 @@ class ToggleResizeDesktopTaskTransitionHandler( ) : this(transitions, Supplier { SurfaceControl.Transaction() }) /** Starts a quick resize transition. */ - fun startTransition( - wct: WindowContainerTransaction, - taskId: Int, - windowDecoration: DesktopModeWindowDecoration - ) { - // Pause relayout until the transition animation finishes. - windowDecoration.incrementRelayoutBlock() + fun startTransition(wct: WindowContainerTransaction) { transitions.startTransition(TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE, wct, this) - taskToDecorationMap.put(taskId, windowDecoration) + } + + fun setOnTaskResizeAnimationListener(listener: OnTaskResizeAnimationListener) { + onTaskResizeAnimationListener = listener } override fun startAnimation( @@ -72,9 +68,6 @@ class ToggleResizeDesktopTaskTransitionHandler( val taskId = checkNotNull(change.taskInfo).taskId val startBounds = change.startAbsBounds val endBounds = change.endAbsBounds - val windowDecor = - taskToDecorationMap.removeReturnOld(taskId) - ?: throw IllegalStateException("Window decoration not found for task $taskId") val tx = transactionSupplier.get() boundsAnimator?.cancel() @@ -92,7 +85,11 @@ class ToggleResizeDesktopTaskTransitionHandler( ) .setWindowCrop(leash, startBounds.width(), startBounds.height()) .show(leash) - windowDecor.showResizeVeil(startTransaction, startBounds) + onTaskResizeAnimationListener.onAnimationStart( + taskId, + startTransaction, + startBounds + ) }, onEnd = { finishTransaction @@ -103,7 +100,7 @@ class ToggleResizeDesktopTaskTransitionHandler( ) .setWindowCrop(leash, endBounds.width(), endBounds.height()) .show(leash) - windowDecor.hideResizeVeil() + onTaskResizeAnimationListener.onAnimationEnd(taskId) finishCallback.onTransitionFinished(null) boundsAnimator = null } @@ -113,7 +110,7 @@ class ToggleResizeDesktopTaskTransitionHandler( tx.setPosition(leash, rect.left.toFloat(), rect.top.toFloat()) .setWindowCrop(leash, rect.width(), rect.height()) .show(leash) - windowDecor.updateResizeVeil(tx, rect) + onTaskResizeAnimationListener.onBoundsChange(taskId, tx, rect) } start() } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/README.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/README.md index 73a7348d5aca..3fad28ad232f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/README.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/README.md @@ -15,4 +15,4 @@ particular order): Todo - Per-feature docs - Feature flagging -- Best practices
\ No newline at end of file +- Best practices & patterns
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/changes.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/changes.md index fbf326eadcd5..9aa5f4ffcd78 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/changes.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/changes.md @@ -102,5 +102,5 @@ AIDL interfaces and constants. Currently, all AIDL files, and classes under the Launcher uses. If the new code doesn't fall into those categories, they can be added explicitly in the Shell's -[Android.bp](frameworks/base/libs/WindowManager/Shell/Android.bp) file under the +[Android.bp](/libs/WindowManager/Shell/Android.bp) file under the `wm_shell_util-sources` filegroup.
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/dagger.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/dagger.md index 6c01d962adc9..7070dead9957 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/dagger.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/dagger.md @@ -21,16 +21,16 @@ developers to jump into a few select files and understand how different componen (especially as products override components). The module dependency tree looks a bit like: -- [WMShellConcurrencyModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellConcurrencyModule.java) +- [WMShellConcurrencyModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellConcurrencyModule.java) (provides threading-related components) - - [WMShellBaseModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java) + - [WMShellBaseModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java) (provides components that are likely common to all products, ie. DisplayController, Transactions, etc.) - - [WMShellModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java) + - [WMShellModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java) (phone/tablet specific components only) - - [TvPipModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java) + - [TvPipModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java) (PIP specific components for TV) - - [TvWMShellModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java) + - [TvWMShellModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java) (TV specific components only) - etc. @@ -43,7 +43,7 @@ In some rare cases, there are base components that can change behavior depending product it runs on. If there are hooks that can be added to the component, that is the preferable approach. -The alternative is to use the [@DynamicOverride](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/DynamicOverride.java) +The alternative is to use the [@DynamicOverride](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/DynamicOverride.java) annotation to allow the product module to provide an implementation that the base module can reference. This is most useful if the existence of the entire component is controlled by the product and the override implementation is optional (there is a default implementation). More diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md index f9ea1d4e2a07..438aa768165e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/debugging.md @@ -29,30 +29,78 @@ building to check the log state (is enabled) before printing the print format st ### Kotlin Protolog tool does not yet have support for Kotlin code (see [b/168581922](https://b.corp.google.com/issues/168581922)). -For logging in Kotlin, use the [KtProtoLog](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt) +For logging in Kotlin, use the [KtProtoLog](/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt) class which has a similar API to the Java ProtoLog class. ### Enabling ProtoLog command line logging -Run these commands to enable protologs for both WM Core and WM Shell to print to logcat. +Run these commands to enable protologs (in logcat) for WM Core ([list of all core tags](/core/java/com/android/internal/protolog/ProtoLogGroup.java)): ```shell -adb shell wm logging enable-text NEW_FEATURE -adb shell wm logging disable-text NEW_FEATURE +adb shell wm logging enable-text TAG +adb shell wm logging disable-text TAG +``` + +And these commands to enable protologs (in logcat) for WM Shell ([list of all shell tags](/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java)): +```shell +adb shell dumpsys activity service SystemUIService WMShell protolog enable-text TAG +adb shell dumpsys activity service SystemUIService WMShell protolog enable-text TAG ``` ## Winscope Tracing The Winscope tool is extremely useful in determining what is happening on-screen in both WindowManager and SurfaceFlinger. Follow [go/winscope](http://go/winscope-help) to learn how to -use the tool. +use the tool. This trace will contain all the information about the windows/activities/surfaces on +screen. + +## WindowManager/SurfaceFlinger hierarchy dump + +A quick way to view the WindowManager hierarchy without a winscope trace is via the wm dumps: +```shell +adb shell dumpsys activity containers +``` + +Likewise, the SurfaceFlinger hierarchy can be dumped for inspection by running: +```shell +adb shell dumpsys SurfaceFlinger +# Search output for "Layer Hierarchy" +``` + +## Tracing global SurfaceControl transaction updates -In addition, there is limited preliminary support for Winscope tracing componetns in the Shell, -which involves adding trace fields to [wm_shell_trace.proto](frameworks/base/libs/WindowManager/Shell/proto/wm_shell_trace.proto) -file and ensure it is updated as a part of `WMShell#writeToProto`. +While Winscope traces are very useful, it sometimes doesn't give you enough information about which +part of the code is initiating the transaction updates. In such cases, it can be helpful to get +stack traces when specific surface transaction calls are made, which is possible by enabling the +following system properties for example: +```shell +# Enabling +adb shell setprop persist.wm.debug.sc.tx.log_match_call setAlpha # matches the name of the SurfaceControlTransaction method +adb shell setprop persist.wm.debug.sc.tx.log_match_name com.android.systemui # matches the name of the surface +adb reboot +adb logcat -s "SurfaceControlRegistry" + +# Disabling logging +adb shell setprop persist.wm.debug.sc.tx.log_match_call \"\" +adb shell setprop persist.wm.debug.sc.tx.log_match_name \"\" +adb reboot +``` + +It is not necessary to set both `log_match_call` and `log_match_name`, but note logs can be quite +noisy if unfiltered. -Tracing can be started via the shell command (to be added to the Winscope tool as needed): +## Tracing activity starts in the app process + +It's sometimes useful to know when to see a stack trace of when an activity starts in the app code +(ie. if you are repro'ing a bug related to activity starts). You can enable this system property to +get this trace: ```shell -adb shell cmd statusbar tracing start -adb shell cmd statusbar tracing stop +# Enabling +adb shell setprop persist.wm.debug.start_activity true +adb reboot +adb logcat -s "Instrumentation" + +# Disabling +adb shell setprop persist.wm.debug.start_activity \"\" +adb reboot ``` ## Dumps @@ -69,6 +117,21 @@ If information should be added to the dump, either: - Update `WMShell` if you are dumping SysUI state - Inject `ShellCommandHandler` into your Shell class, and add a dump callback +## Shell commands + +It can be useful to add additional shell commands to drive and test specific interactions. + +To add a new command for your feature, inject a `ShellCommandHandler` into your class and add a +shell command handler in your controller. + +```shell +# List all available commands +adb shell dumpsys activity service SystemUIService WMShell help + +# Run a specific command +adb shell dumpsys activity service SystemUIService WMShell <cmd> <args> ... +``` + ## Debugging in Android Studio If you are using the [go/sysui-studio](http://go/sysui-studio) project, then you can debug Shell diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/overview.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/overview.md index a88ef6aea2ec..b489fe8ea1a9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/overview.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/overview.md @@ -19,25 +19,24 @@ Currently, the WMShell library is used to drive the windowing experience on hand ## Where does the code live -The core WMShell library code is currently located in the [frameworks/base/libs/WindowManager/Shell](frameworks/base/libs/WindowManager/Shell) +The core WMShell library code is currently located in the [frameworks/base/libs/WindowManager/Shell](/libs/WindowManager/Shell) directory and is included as a part dependency of the host SystemUI apk. ## How do I build the Shell library -The library can be built directly by running (using [go/makepush](http://go/makepush)): +The library can be built directly by running: ```shell -mp :WindowManager-Shell +m WindowManager-Shell ``` But this is mainly useful for inspecting the contents of the library or verifying it builds. The -various targets can be found in the Shell library's [Android.bp](frameworks/base/libs/WindowManager/Shell/Android.bp) +various targets can be found in the Shell library's [Android.bp](/libs/WindowManager/Shell/Android.bp) file. Normally, you would build it as a part of the host SystemUI, for example via commandline: ```shell # Phone SystemUI variant -mp sysuig -# Building Shell & SysUI changes along w/ framework changes -mp core services sysuig +m SystemUI +adevice update ``` Or preferably, if you are making WMShell/SysUI only changes (no other framework changes), then diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/patterns/TEMPLATE.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/patterns/TEMPLATE.md new file mode 100644 index 000000000000..0e20a8ec275c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/patterns/TEMPLATE.md @@ -0,0 +1,30 @@ +# Pattern (one line description) + +### What this pattern solves + +Give detailed information about the problem that this pattern addresses, include when it +should/should not be used. + +### How it works + +Give a high level overview of how this pattern works technically with sufficient links for the +relevant dependencies for folks to read more. + +### Code examples + +Explain how this pattern is used in code. + +File.kt: +```kotlin +fun someFunction() { + // Use this code +} +``` + +### Relevant links + +Add relevant links to other files that implement this pattern, design docs, or other important +info. + +Link 1: [More info](some_example_link) \ +Link 2: [More info](some_example_link)
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/sysui.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/sysui.md index d6302e640ba7..30ff6691f503 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/sysui.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/sysui.md @@ -80,4 +80,6 @@ adb shell dumpsys activity service SystemUIService WMShell # Run a specific command adb shell dumpsys activity service SystemUIService WMShell help adb shell dumpsys activity service SystemUIService WMShell <cmd> <args> ... -```
\ No newline at end of file +``` + +More detail can be found in [Debugging in the Shell](debugging.md) section.
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/testing.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/testing.md index 8a80333facc4..98af930c4486 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/testing.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/testing.md @@ -5,7 +5,7 @@ ## Unit tests New WM Shell unit tests can be added to the -[Shell/tests/unittest](frameworks/base/libs/WindowManager/Shell/tests/unittest) directory, and can +[Shell/tests/unittest](/libs/WindowManager/Shell/tests/unittest) directory, and can be run via command line using `atest`: ```shell atest WMShellUnitTests @@ -25,10 +25,24 @@ Flicker tests are tests that perform actions and make assertions on the state in and SurfaceFlinger traces captured during the run. New WM Shell Flicker tests can be added to the -[Shell/tests/flicker](frameworks/base/libs/WindowManager/Shell/tests/flicker) directory, and can -be run via command line using `atest`: +[Shell/tests/flicker](/libs/WindowManager/Shell/tests/flicker) directory, and can be run via command line using `atest`: ```shell -atest WMShellFlickerTests +# Bubbles +atest WMShellFlickerTestsBubbles + +# PIP +atest WMShellFlickerTestsPip1 +atest WMShellFlickerTestsPip2 +atest WMShellFlickerTestsPip3 +atest WMShellFlickerTestsPipApps +atest WMShellFlickerTestsPipAppsCSuite + +# Splitscreen +atest WMShellFlickerTestsSplitScreenGroup1 +atest WMShellFlickerTestsSplitScreenGroup2 + +# Other +atest WMShellFlickerTestsOther ``` **Note**: Currently Flicker tests can only be run from the commandline and not via SysUI Studio diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/threading.md b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/threading.md index eac748894432..9d015357b60b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/docs/threading.md +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/docs/threading.md @@ -43,7 +43,7 @@ the product. ## Dagger setup -The threading-related components are provided by the [WMShellConcurrencyModule](frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellConcurrencyModule.java), +The threading-related components are provided by the [WMShellConcurrencyModule](/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellConcurrencyModule.java), for example, the Executors and Handlers for the various threads that are used. You can request an executor of the necessary type by using the appropriate annotation for each of the threads (ie. `@ShellMainThread Executor`) when injecting into your Shell component. @@ -76,7 +76,7 @@ To get the SysUI main thread, you can use the `@Main` annotation. want to dedupe multiple messages - In such cases inject `@ShellMainThread Handler` or use view.getHandler() which should be OK assuming that the view root was initialized on the main Shell thread -- **Never use Looper.getMainLooper()** +- <u>**Never</u> use Looper.getMainLooper()** - It's likely going to be wrong, you can inject `@Main ShellExecutor` to get the SysUI main thread ### Testing diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java index fdfb6f3680b2..269c3699ac0a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java @@ -105,25 +105,7 @@ public class DragAndDropController implements RemoteCallable<DragAndDropControll void onDragStarted(); } - /** - * Creates {@link DragAndDropController}. Returns {@code null} if the feature is disabled. - */ - public static DragAndDropController create(Context context, - ShellInit shellInit, - ShellController shellController, - ShellCommandHandler shellCommandHandler, - DisplayController displayController, - UiEventLogger uiEventLogger, - IconProvider iconProvider, - ShellExecutor mainExecutor) { - if (!context.getResources().getBoolean(R.bool.config_enableShellDragDrop)) { - return null; - } - return new DragAndDropController(context, shellInit, shellController, shellCommandHandler, - displayController, uiEventLogger, iconProvider, mainExecutor); - } - - DragAndDropController(Context context, + public DragAndDropController(Context context, ShellInit shellInit, ShellController shellController, ShellCommandHandler shellCommandHandler, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt new file mode 100644 index 000000000000..ccf48d0de9ed --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2024 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.draganddrop + +import android.os.RemoteException +import android.util.Log +import android.view.DragEvent +import android.view.IWindowManager +import android.window.IUnhandledDragCallback +import android.window.IUnhandledDragListener +import androidx.annotation.VisibleForTesting +import com.android.internal.protolog.common.ProtoLog +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.protolog.ShellProtoLogGroup +import java.util.function.Consumer + +/** + * Manages the listener and callbacks for unhandled global drags. + */ +class UnhandledDragController( + val wmService: IWindowManager, + mainExecutor: ShellExecutor +) { + private var callback: UnhandledDragAndDropCallback? = null + + private val unhandledDragListener: IUnhandledDragListener = + object : IUnhandledDragListener.Stub() { + override fun onUnhandledDrop(event: DragEvent, callback: IUnhandledDragCallback) { + mainExecutor.execute() { + this@UnhandledDragController.onUnhandledDrop(event, callback) + } + } + } + + /** + * Listener called when an unhandled drag is started. + */ + interface UnhandledDragAndDropCallback { + /** + * Called when a global drag is unhandled (ie. dropped outside of all visible windows, or + * dropped on a window that does not want to handle it). + * + * The implementer _must_ call onFinishedCallback, and if it consumes the drop, then it is + * also responsible for releasing up the drag surface provided via the drag event. + */ + fun onUnhandledDrop(dragEvent: DragEvent, onFinishedCallback: Consumer<Boolean>) {} + } + + /** + * Sets a listener for callbacks when an unhandled drag happens. + */ + fun setListener(listener: UnhandledDragAndDropCallback?) { + val updateWm = (callback == null && listener != null) + || (callback != null && listener == null) + callback = listener + if (updateWm) { + try { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "%s unhandled drag listener", + if (callback != null) "Registering" else "Unregistering") + wmService.setUnhandledDragListener( + if (callback != null) unhandledDragListener else null) + } catch (e: RemoteException) { + Log.e(TAG, "Failed to set unhandled drag listener") + } + } + } + + @VisibleForTesting + fun onUnhandledDrop(dragEvent: DragEvent, wmCallback: IUnhandledDragCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "onUnhandledDrop: %s", dragEvent) + if (callback == null) { + wmCallback.notifyUnhandledDropComplete(false) + } + + callback?.onUnhandledDrop(dragEvent) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "Notifying onUnhandledDrop complete: %b", it) + wmCallback.notifyUnhandledDropComplete(it) + } + } + + companion object { + private val TAG = UnhandledDragController::class.java.simpleName + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java index 6b6a7bc42046..ffcc526eac40 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java @@ -112,7 +112,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs onChangeTransitionReady(change, startT, finishT); break; } - mWindowDecorViewModel.onTransitionReady(transition, info, change); } mTransitionToTaskInfo.put(transition, taskInfoList); } @@ -153,8 +152,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs @Override public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) { - mWindowDecorViewModel.onTransitionMerged(merged, playing); - final List<ActivityManager.RunningTaskInfo> infoOfMerged = mTransitionToTaskInfo.get(merged); if (infoOfMerged == null) { @@ -178,7 +175,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs final List<ActivityManager.RunningTaskInfo> taskInfo = mTransitionToTaskInfo.getOrDefault(transition, Collections.emptyList()); mTransitionToTaskInfo.remove(transition); - mWindowDecorViewModel.onTransitionFinished(transition); for (int i = 0; i < taskInfo.size(); ++i) { mWindowDecorViewModel.destroyWindowDecoration(taskInfo.get(i)); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java index e63bbc07bc41..73de231fb63a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java @@ -27,7 +27,7 @@ import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_OCCLUDING; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_UNOCCLUDING; import static android.view.WindowManager.TRANSIT_SLEEP; -import static com.android.wm.shell.util.TransitionUtil.isOpeningType; +import static com.android.wm.shell.shared.TransitionUtil.isOpeningType; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl index 3906599b7581..8b3de6298b2a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl @@ -52,9 +52,10 @@ interface IPip { * @param componentName ComponentName represents the Activity * @param destinationBounds the destination bounds the PiP window lands into * @param overlay an optional overlay to fade out after entering PiP + * @param appBounds the bounds used to set the buffer size of the optional content overlay */ oneway void stopSwipePipToHome(int taskId, in ComponentName componentName, - in Rect destinationBounds, in SurfaceControl overlay) = 2; + in Rect destinationBounds, in SurfaceControl overlay, in Rect appBounds) = 2; /** * Notifies the swiping Activity to PiP onto home transition is aborted diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 3635165d76ce..9f73f1bad092 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -86,6 +86,7 @@ import com.android.wm.shell.common.annotations.ShellMainThread; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipDisplayLayoutState; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUiEventLogger; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.pip.phone.PipMotionHelper; @@ -334,6 +335,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, @Nullable SurfaceControl mPipOverlay; + /** + * The app bounds used for the buffer size of the + * {@link com.android.wm.shell.pip.PipContentOverlay.PipAppIconOverlay}. + * + * Note that this is empty if the overlay is removed or if it's some other type of overlay + * defined in {@link PipContentOverlay}. + */ + @NonNull + final Rect mAppBounds = new Rect(); + public PipTaskOrganizer(Context context, @NonNull SyncTransactionQueue syncTransactionQueue, @NonNull PipTransitionState pipTransitionState, @@ -464,15 +475,15 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, * Expect {@link #onTaskAppeared(ActivityManager.RunningTaskInfo, SurfaceControl)} afterwards. */ public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, - SurfaceControl overlay) { + SurfaceControl overlay, Rect appBounds) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, - "stopSwipePipToHome: %s, state=%s", componentName, mPipTransitionState); + "stopSwipePipToHome: %s, stat=%s", componentName, mPipTransitionState); // do nothing if there is no startSwipePipToHome being called before if (!mPipTransitionState.getInSwipePipToHomeTransition()) { return; } mPipBoundsState.setBounds(destinationBounds); - mPipOverlay = overlay; + setContentOverlay(overlay, appBounds); if (ENABLE_SHELL_TRANSITIONS && overlay != null) { // With Shell transition, the overlay was attached to the remote transition leash, which // will be removed when the current transition is finished, so we need to reparent it @@ -589,9 +600,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (Transitions.ENABLE_SHELL_TRANSITIONS) { if (requestEnterSplit && mSplitScreenOptional.isPresent()) { wct.setWindowingMode(mToken, WINDOWING_MODE_UNDEFINED); - mSplitScreenOptional.get().prepareEnterSplitScreen(wct, mTaskInfo, - isPipToTopLeft() - ? SPLIT_POSITION_TOP_OR_LEFT : SPLIT_POSITION_BOTTOM_OR_RIGHT); + mSplitScreenOptional.get().onPipExpandToSplit(wct, mTaskInfo); mPipTransitionController.startExitTransition( TRANSIT_EXIT_PIP_TO_SPLIT, wct, destinationBounds); return; @@ -1882,13 +1891,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } private void removeContentOverlay(SurfaceControl surface, Runnable callback) { + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "removeContentOverlay: %s, state=%s, surface=%s", + mTaskInfo, mPipTransitionState, surface); if (mPipOverlay != null) { if (mPipOverlay != surface) { ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: trying to remove overlay (%s) which is not local reference (%s)", TAG, surface, mPipOverlay); } - mPipOverlay = null; + clearContentOverlay(); } if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) { // Avoid double removal, which is fatal. @@ -1905,6 +1917,20 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (callback != null) callback.run(); } + void clearContentOverlay() { + mPipOverlay = null; + mAppBounds.setEmpty(); + } + + void setContentOverlay(@Nullable SurfaceControl leash, @NonNull Rect appBounds) { + mPipOverlay = leash; + if (mPipOverlay != null) { + mAppBounds.set(appBounds); + } else { + mAppBounds.setEmpty(); + } + } + private void resetShadowRadius() { if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) { // mLeash is undefined when in PipTransitionState.UNDEFINED diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java index f5f15d81ea44..e018ecc0f7e3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java @@ -68,13 +68,14 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipDisplayLayoutState; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.CounterRotatorHelper; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -141,8 +142,6 @@ public class PipTransition extends PipTransitionController { /** Whether the PIP window has fade out for fixed rotation. */ private boolean mHasFadeOut; - private Rect mInitBounds = new Rect(); - /** Used for setting transform to a transaction from animator. */ private final PipAnimationController.PipTransactionHandler mTransactionConsumer = new PipAnimationController.PipTransactionHandler() { @@ -287,12 +286,6 @@ public class PipTransition extends PipTransitionController { // For transition that we don't animate, but contains the PIP leash, we need to update the // PIP surface, otherwise it will be reset after the transition. if (currentPipTaskChange != null) { - // Set the "end" bounds of pip. The default setup uses the start bounds. Since this is - // changing the *finish*Transaction, we need to use the end bounds. This will also - // make sure that the fade-in animation (below) uses the end bounds as well. - if (!currentPipTaskChange.getEndAbsBounds().isEmpty()) { - mPipBoundsState.setBounds(currentPipTaskChange.getEndAbsBounds()); - } updatePipForUnhandledTransition(currentPipTaskChange, startTransaction, finishTransaction); } @@ -465,12 +458,13 @@ public class PipTransition extends PipTransitionController { mSurfaceTransactionHelper.crop(tx, leash, destinationBounds) .resetScale(tx, leash, destinationBounds) .round(tx, leash, true /* applyCornerRadius */); - if (mPipOrganizer.mPipOverlay != null && !mInitBounds.isEmpty()) { + final Rect appBounds = mPipOrganizer.mAppBounds; + if (mPipOrganizer.mPipOverlay != null && !appBounds.isEmpty()) { // Resetting the scale for pinned task while re-adjusting its crop, // also scales the overlay. So we need to update the overlay leash too. Rect overlayBounds = new Rect(destinationBounds); final int overlaySize = PipContentOverlay.PipAppIconOverlay - .getOverlaySize(mInitBounds, destinationBounds); + .getOverlaySize(appBounds, destinationBounds); overlayBounds.offsetTo( (destinationBounds.width() - overlaySize) / 2, @@ -479,7 +473,6 @@ public class PipTransition extends PipTransitionController { mPipOrganizer.mPipOverlay, overlayBounds); } } - mInitBounds.setEmpty(); wct.setBoundsChangeTransaction(taskInfo.token, tx); } final int displayRotation = taskInfo.getConfiguration().windowConfiguration @@ -617,7 +610,7 @@ public class PipTransition extends PipTransitionController { // if overlay is present remove it immediately, as exit transition came before it faded out if (mPipOrganizer.mPipOverlay != null) { startTransaction.remove(mPipOrganizer.mPipOverlay); - clearPipOverlay(); + mPipOrganizer.clearContentOverlay(); } if (pipChange == null) { ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, @@ -951,9 +944,6 @@ public class PipTransition extends PipTransitionController { final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds(); final Rect currentBounds = pipChange.getStartAbsBounds(); - // Cache the start bounds for overlay manipulations as a part of finishCallback. - mInitBounds.set(currentBounds); - int rotationDelta = deltaRotation(startRotation, endRotation); Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect( taskInfo.pictureInPictureParams, currentBounds, destinationBounds); @@ -992,10 +982,12 @@ public class PipTransition extends PipTransitionController { 0 /* startingAngle */, rotationDelta); if (sourceHintRect == null) { // We use content overlay when there is no source rect hint to enter PiP use bounds - // animation. + // animation. We also temporarily disallow app icon overlay and use color overlay + // instead when in fixed rotation enter PiP in button nav with no sourceRectHint. + // TODO(b/319286295): Fix App Icon Overlay animation in fixed rotation in btn nav. // TODO(b/272819817): cleanup the null-check and extra logging. final boolean hasTopActivityInfo = taskInfo.topActivityInfo != null; - if (hasTopActivityInfo) { + if (hasTopActivityInfo && mFixedRotationState != FIXED_ROTATION_TRANSITION) { animator.setAppIconContentOverlay( mContext, currentBounds, destinationBounds, taskInfo.topActivityInfo, mPipBoundsState.getLauncherState().getAppIconSizePx()); @@ -1022,7 +1014,7 @@ public class PipTransition extends PipTransitionController { } else { throw new RuntimeException("Unrecognized animation type: " + enterAnimationType); } - mPipOrganizer.mPipOverlay = animator.getContentOverlayLeash(); + mPipOrganizer.setContentOverlay(animator.getContentOverlayLeash(), currentBounds); animator.setTransitionDirection(TRANSITION_DIRECTION_TO_PIP) .setPipAnimationCallback(mPipAnimationCallback) .setDuration(mEnterExitAnimationDuration); @@ -1073,10 +1065,6 @@ public class PipTransition extends PipTransitionController { ProtoLog.w(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "%s: SwipePipToHome should not use fixed rotation %d", TAG, mEndFixedRotation); } - Rect appBounds = pipTaskInfo.configuration.windowConfiguration.getAppBounds(); - if (mFixedRotationState == FIXED_ROTATION_CALLBACK && appBounds != null) { - mInitBounds.set(appBounds); - } final SurfaceControl swipePipToHomeOverlay = mPipOrganizer.mPipOverlay; if (swipePipToHomeOverlay != null) { // Launcher fade in the overlay on top of the fullscreen Task. It is possible we @@ -1106,7 +1094,7 @@ public class PipTransition extends PipTransitionController { sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP); if (swipePipToHomeOverlay != null) { mPipOrganizer.fadeOutAndRemoveOverlay(swipePipToHomeOverlay, - this::clearPipOverlay /* callback */, false /* withStartDelay */); + null /* callback */, false /* withStartDelay */); } mPipTransitionState.setInSwipePipToHomeTransition(false); } @@ -1250,10 +1238,6 @@ public class PipTransition extends PipTransitionController { mPipMenuController.updateMenuBounds(destinationBounds); } - private void clearPipOverlay() { - mPipOrganizer.mPipOverlay = null; - } - @Override public void dump(PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java index 04911c0bc064..d1fd207c4a66 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java @@ -40,6 +40,7 @@ import androidx.annotation.NonNull; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.split.SplitScreenUtils; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; @@ -47,6 +48,7 @@ import com.android.wm.shell.transition.Transitions; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; /** * Responsible supplying PiP Transitions. @@ -116,6 +118,17 @@ public abstract class PipTransitionController implements Transitions.TransitionH } /** + * Called when the Shell wants to start resizing Pip transition/animation. + * + * @param onFinishResizeCallback callback guaranteed to execute when animation ends and + * client completes any potential draws upon WM state updates. + */ + public void startResizeTransition(WindowContainerTransaction wct, + Consumer<Rect> onFinishResizeCallback) { + // Default implementation does nothing. + } + + /** * Called when the transition animation can't continue (eg. task is removed during * animation) */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java index 760652625f9e..d8e8b587004a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java @@ -41,8 +41,8 @@ import com.android.wm.shell.common.SystemWindows; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipMediaController; import com.android.wm.shell.common.pip.PipMediaController.ActionListener; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUiEventLogger; -import com.android.wm.shell.pip.PipMenuController; import com.android.wm.shell.pip.PipSurfaceTransactionHelper; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.SplitScreenController; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index 63f20fd8e997..05d4f53986b8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -244,6 +244,9 @@ public class PipController implements PipTransitionController.PipTransitionCallb // The same rotation may have been set by auto PiP-able or fixed rotation. So notify // the change with fromRotation=false to apply the rotated destination bounds from // PipTaskOrganizer#onMovementBoundsChanged. + // We need to update the bounds scale in case this was from fixed rotation, as the + // current proportion was computed using the previous orientation max size and is wrong. + mPipBoundsState.updateBoundsScale(); updateMovementBounds(null, false /* fromRotation */, false /* fromImeAdjustment */, false /* fromShelfAdjustment */, t); return; @@ -982,8 +985,9 @@ public class PipController implements PipTransitionController.PipTransitionCallb } private void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds, - SurfaceControl overlay) { - mPipTaskOrganizer.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay); + SurfaceControl overlay, Rect appBounds) { + mPipTaskOrganizer.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay, + appBounds); } private void abortSwipePipToHome(int taskId, ComponentName componentName) { @@ -1143,6 +1147,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb // Update the display layout mPipDisplayLayoutState.rotateTo(toRotation); + mTouchHandler.updateMinMaxSize(mPipBoundsState.getAspectRatio()); + + postChangeStackBounds.set(0, 0, + (int) (mPipBoundsState.getMaxSize().x * mPipBoundsState.getBoundsScale()), + (int) (mPipBoundsState.getMaxSize().y * mPipBoundsState.getBoundsScale())); // Calculate the stack bounds in the new orientation based on same fraction along the // rotated movement bounds. @@ -1280,13 +1289,13 @@ public class PipController implements PipTransitionController.PipTransitionCallb @Override public void stopSwipePipToHome(int taskId, ComponentName componentName, - Rect destinationBounds, SurfaceControl overlay) { + Rect destinationBounds, SurfaceControl overlay, Rect appBounds) { if (overlay != null) { overlay.setUnreleasedWarningCallSite("PipController.stopSwipePipToHome"); } executeRemoteCallWithTaskPermission(mController, "stopSwipePipToHome", (controller) -> controller.stopSwipePipToHome( - taskId, componentName, destinationBounds, overlay)); + taskId, componentName, destinationBounds, overlay, appBounds)); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java index f175775ce8b2..5f9195a37c1b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java @@ -15,19 +15,13 @@ */ package com.android.wm.shell.pip.phone; -import static com.android.internal.policy.TaskResizingAlgorithm.CTRL_BOTTOM; -import static com.android.internal.policy.TaskResizingAlgorithm.CTRL_LEFT; import static com.android.internal.policy.TaskResizingAlgorithm.CTRL_NONE; -import static com.android.internal.policy.TaskResizingAlgorithm.CTRL_RIGHT; -import static com.android.internal.policy.TaskResizingAlgorithm.CTRL_TOP; -import static com.android.wm.shell.pip.phone.PipMenuView.ANIM_TYPE_NONE; import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; -import android.graphics.Region; import android.hardware.input.InputManager; import android.os.Looper; import android.view.BatchedInputEventReceiver; @@ -41,7 +35,6 @@ import android.view.ViewConfiguration; import androidx.annotation.VisibleForTesting; -import com.android.internal.policy.TaskResizingAlgorithm; import com.android.wm.shell.R; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; @@ -53,7 +46,6 @@ import com.android.wm.shell.pip.PipTaskOrganizer; import java.io.PrintWriter; import java.util.function.Consumer; -import java.util.function.Function; /** * Helper on top of PipTouchHandler that handles inputs OUTSIDE of the PIP window, which is used to @@ -77,7 +69,6 @@ public class PipResizeGestureHandler { private final PipPinchResizingAlgorithm mPinchResizingAlgorithm; private final int mDisplayId; private final ShellExecutor mMainExecutor; - private final Region mTmpRegion = new Region(); private final PointF mDownPoint = new PointF(); private final PointF mDownSecondPoint = new PointF(); @@ -88,24 +79,15 @@ public class PipResizeGestureHandler { private final Rect mLastResizeBounds = new Rect(); private final Rect mUserResizeBounds = new Rect(); private final Rect mDownBounds = new Rect(); - private final Rect mDragCornerSize = new Rect(); - private final Rect mTmpTopLeftCorner = new Rect(); - private final Rect mTmpTopRightCorner = new Rect(); - private final Rect mTmpBottomLeftCorner = new Rect(); - private final Rect mTmpBottomRightCorner = new Rect(); - private final Rect mDisplayBounds = new Rect(); - private final Function<Rect, Rect> mMovementBoundsSupplier; private final Runnable mUpdateMovementBoundsRunnable; private final Consumer<Rect> mUpdateResizeBoundsCallback; - private int mDelta; private float mTouchSlop; private boolean mAllowGesture; private boolean mIsAttached; private boolean mIsEnabled; private boolean mEnablePinchResize; - private boolean mEnableDragCornerResize; private boolean mIsSysUiStateValid; private boolean mThresholdCrossed; private boolean mOngoingPinchToResize = false; @@ -123,7 +105,7 @@ public class PipResizeGestureHandler { PipBoundsState pipBoundsState, PipMotionHelper motionHelper, PipTouchState pipTouchState, PipTaskOrganizer pipTaskOrganizer, PipDismissTargetHandler pipDismissTargetHandler, - Function<Rect, Rect> movementBoundsSupplier, Runnable updateMovementBoundsRunnable, + Runnable updateMovementBoundsRunnable, PipUiEventLogger pipUiEventLogger, PhonePipMenuController menuActivityController, ShellExecutor mainExecutor) { mContext = context; @@ -135,7 +117,6 @@ public class PipResizeGestureHandler { mPipTouchState = pipTouchState; mPipTaskOrganizer = pipTaskOrganizer; mPipDismissTargetHandler = pipDismissTargetHandler; - mMovementBoundsSupplier = movementBoundsSupplier; mUpdateMovementBoundsRunnable = updateMovementBoundsRunnable; mPhonePipMenuController = menuActivityController; mPipUiEventLogger = pipUiEventLogger; @@ -171,20 +152,9 @@ public class PipResizeGestureHandler { } private void reloadResources() { - final Resources res = mContext.getResources(); - mDelta = res.getDimensionPixelSize(R.dimen.pip_resize_edge_size); - mEnableDragCornerResize = res.getBoolean(R.bool.config_pipEnableDragCornerResize); mTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop(); } - private void resetDragCorners() { - mDragCornerSize.set(0, 0, mDelta, mDelta); - mTmpTopLeftCorner.set(mDragCornerSize); - mTmpTopRightCorner.set(mDragCornerSize); - mTmpBottomLeftCorner.set(mDragCornerSize); - mTmpBottomRightCorner.set(mDragCornerSize); - } - private void disposeInputChannel() { if (mInputEventReceiver != null) { mInputEventReceiver.dispose(); @@ -232,7 +202,7 @@ public class PipResizeGestureHandler { @VisibleForTesting void onInputEvent(InputEvent ev) { - if (!mEnableDragCornerResize && !mEnablePinchResize) { + if (!mEnablePinchResize) { // No need to handle anything if neither form of resizing is enabled. return; } @@ -260,8 +230,6 @@ public class PipResizeGestureHandler { if (mEnablePinchResize && mOngoingPinchToResize) { onPinchResize(mv); - } else if (mEnableDragCornerResize) { - onDragCornerResize(mv); } } } @@ -273,48 +241,6 @@ public class PipResizeGestureHandler { return mCtrlType != CTRL_NONE || mOngoingPinchToResize; } - /** - * Check whether the current x,y coordinate is within the region in which drag-resize should - * start. - * This consists of 4 small squares on the 4 corners of the PIP window, a quarter of which - * overlaps with the PIP window while the rest goes outside of the PIP window. - * _ _ _ _ - * |_|_|_________|_|_| - * |_|_| |_|_| - * | PIP | - * | WINDOW | - * _|_ _|_ - * |_|_|_________|_|_| - * |_|_| |_|_| - */ - public boolean isWithinDragResizeRegion(int x, int y) { - if (!mEnableDragCornerResize) { - return false; - } - - final Rect currentPipBounds = mPipBoundsState.getBounds(); - if (currentPipBounds == null) { - return false; - } - resetDragCorners(); - mTmpTopLeftCorner.offset(currentPipBounds.left - mDelta / 2, - currentPipBounds.top - mDelta / 2); - mTmpTopRightCorner.offset(currentPipBounds.right - mDelta / 2, - currentPipBounds.top - mDelta / 2); - mTmpBottomLeftCorner.offset(currentPipBounds.left - mDelta / 2, - currentPipBounds.bottom - mDelta / 2); - mTmpBottomRightCorner.offset(currentPipBounds.right - mDelta / 2, - currentPipBounds.bottom - mDelta / 2); - - mTmpRegion.setEmpty(); - mTmpRegion.op(mTmpTopLeftCorner, Region.Op.UNION); - mTmpRegion.op(mTmpTopRightCorner, Region.Op.UNION); - mTmpRegion.op(mTmpBottomLeftCorner, Region.Op.UNION); - mTmpRegion.op(mTmpBottomRightCorner, Region.Op.UNION); - - return mTmpRegion.contains(x, y); - } - public boolean isUsingPinchToZoom() { return mEnablePinchResize; } @@ -325,62 +251,17 @@ public class PipResizeGestureHandler { public boolean willStartResizeGesture(MotionEvent ev) { if (isInValidSysUiState()) { - switch (ev.getActionMasked()) { - case MotionEvent.ACTION_DOWN: - if (isWithinDragResizeRegion((int) ev.getRawX(), (int) ev.getRawY())) { - return true; - } - break; - - case MotionEvent.ACTION_POINTER_DOWN: - if (mEnablePinchResize && ev.getPointerCount() == 2) { - onPinchResize(ev); - mOngoingPinchToResize = mAllowGesture; - return mAllowGesture; - } - break; - - default: - break; + if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) { + if (mEnablePinchResize && ev.getPointerCount() == 2) { + onPinchResize(ev); + mOngoingPinchToResize = mAllowGesture; + return mAllowGesture; + } } } return false; } - private void setCtrlType(int x, int y) { - final Rect currentPipBounds = mPipBoundsState.getBounds(); - - Rect movementBounds = mMovementBoundsSupplier.apply(currentPipBounds); - - mDisplayBounds.set(movementBounds.left, - movementBounds.top, - movementBounds.right + currentPipBounds.width(), - movementBounds.bottom + currentPipBounds.height()); - - if (mTmpTopLeftCorner.contains(x, y) && currentPipBounds.top != mDisplayBounds.top - && currentPipBounds.left != mDisplayBounds.left) { - mCtrlType |= CTRL_LEFT; - mCtrlType |= CTRL_TOP; - } - if (mTmpTopRightCorner.contains(x, y) && currentPipBounds.top != mDisplayBounds.top - && currentPipBounds.right != mDisplayBounds.right) { - mCtrlType |= CTRL_RIGHT; - mCtrlType |= CTRL_TOP; - } - if (mTmpBottomRightCorner.contains(x, y) - && currentPipBounds.bottom != mDisplayBounds.bottom - && currentPipBounds.right != mDisplayBounds.right) { - mCtrlType |= CTRL_RIGHT; - mCtrlType |= CTRL_BOTTOM; - } - if (mTmpBottomLeftCorner.contains(x, y) - && currentPipBounds.bottom != mDisplayBounds.bottom - && currentPipBounds.left != mDisplayBounds.left) { - mCtrlType |= CTRL_LEFT; - mCtrlType |= CTRL_BOTTOM; - } - } - private boolean isInValidSysUiState() { return mIsSysUiStateValid; } @@ -457,59 +338,6 @@ public class PipResizeGestureHandler { } } - private void onDragCornerResize(MotionEvent ev) { - int action = ev.getActionMasked(); - float x = ev.getX(); - float y = ev.getY() - mOhmOffset; - if (action == MotionEvent.ACTION_DOWN) { - mLastResizeBounds.setEmpty(); - mAllowGesture = isInValidSysUiState() && isWithinDragResizeRegion((int) x, (int) y); - if (mAllowGesture) { - setCtrlType((int) x, (int) y); - mDownPoint.set(x, y); - mDownBounds.set(mPipBoundsState.getBounds()); - } - } else if (mAllowGesture) { - switch (action) { - case MotionEvent.ACTION_POINTER_DOWN: - // We do not support multi touch for resizing via drag - mAllowGesture = false; - break; - case MotionEvent.ACTION_MOVE: - // Capture inputs - if (!mThresholdCrossed - && Math.hypot(x - mDownPoint.x, y - mDownPoint.y) > mTouchSlop) { - mThresholdCrossed = true; - // Reset the down to begin resizing from this point - mDownPoint.set(x, y); - mInputMonitor.pilferPointers(); - } - if (mThresholdCrossed) { - if (mPhonePipMenuController.isMenuVisible()) { - mPhonePipMenuController.hideMenu(ANIM_TYPE_NONE, - false /* resize */); - } - final Rect currentPipBounds = mPipBoundsState.getBounds(); - mLastResizeBounds.set(TaskResizingAlgorithm.resizeDrag(x, y, - mDownPoint.x, mDownPoint.y, currentPipBounds, mCtrlType, mMinSize.x, - mMinSize.y, mMaxSize, true, - mDownBounds.width() > mDownBounds.height())); - mPipBoundsAlgorithm.transformBoundsToAspectRatio(mLastResizeBounds, - mPipBoundsState.getAspectRatio(), false /* useCurrentMinEdgeSize */, - true /* useCurrentSize */); - mPipTaskOrganizer.scheduleUserResizePip(mDownBounds, mLastResizeBounds, - null); - mPipBoundsState.setHasUserResizedPip(true); - } - break; - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: - finishResize(); - break; - } - } - } - private void snapToMovementBoundsEdge(Rect bounds, Rect movementBounds) { final int leftEdge = bounds.left; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java index 452a41696fcf..11c356d94ee1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java @@ -52,6 +52,7 @@ import com.android.wm.shell.common.FloatingContentCoordinator; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.common.pip.PipDoubleTapHelper; import com.android.wm.shell.common.pip.PipUiEventLogger; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.common.pip.SizeSpecSource; @@ -211,7 +212,7 @@ public class PipTouchHandler { mPipResizeGestureHandler = new PipResizeGestureHandler(context, pipBoundsAlgorithm, pipBoundsState, mMotionHelper, mTouchState, pipTaskOrganizer, mPipDismissTargetHandler, - this::getMovementBounds, this::updateMovementBounds, pipUiEventLogger, + this::updateMovementBounds, pipUiEventLogger, menuController, mainExecutor); mConnection = new PipAccessibilityInteractionConnection(mContext, pipBoundsState, mMotionHelper, pipTaskOrganizer, mPipBoundsAlgorithm.getSnapAlgorithm(), diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java index 5ee3734e371d..c5dc0edf1a4e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java @@ -110,6 +110,7 @@ public class TvPipBoundsState extends PipBoundsState { @Override public void onConfigurationChanged() { + super.onConfigurationChanged(); updateDefaultGravity(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java index cd3d38b6500c..3d286461ef79 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java @@ -223,10 +223,9 @@ public class TvPipController implements PipTransitionController.PipTransitionCal mShellController = shellController; mDisplayController = displayController; - DisplayLayout layout = new DisplayLayout(context, context.getDisplay()); - mTvPipBoundsState = tvPipBoundsState; + DisplayLayout layout = new DisplayLayout(context, context.getDisplay()); mPipDisplayLayoutState = pipDisplayLayoutState; mPipDisplayLayoutState.setDisplayLayout(layout); mPipDisplayLayoutState.setDisplayId(context.getDisplayId()); @@ -291,6 +290,7 @@ public class TvPipController implements PipTransitionController.PipTransitionCal mPipNotificationController.onConfigurationChanged(); mTvPipBoundsAlgorithm.onConfigurationChanged(mContext); mTvPipBoundsState.onConfigurationChanged(); + mPipDisplayLayoutState.onConfigurationChanged(); int defaultGravityX = mTvPipBoundsState.getDefaultGravity() & Gravity.HORIZONTAL_GRAVITY_MASK; @@ -299,6 +299,24 @@ public class TvPipController implements PipTransitionController.PipTransitionCal } } + @Override + public void onDensityOrFontScaleChanged() { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: onDensityOrFontScaleChanged()", TAG); + updatePinnedStackBounds(); + mTvPipMenuController.reloadMenu(); + } + + @Override + public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: onDisplayConfigurationChanged(), displayId %d, saved display id %d", + TAG, displayId, mPipDisplayLayoutState.getDisplayId()); + mPipDisplayLayoutState.setDisplayLayout( + new DisplayLayout(mContext, mContext.getDisplay())); + mPipDisplayLayoutState.setDisplayId(mContext.getDisplayId()); + } + private void reloadResources() { final Resources res = mContext.getResources(); mResizeAnimationDuration = res.getInteger(R.integer.config_pipResizeAnimationDuration); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java index c6803f7beebd..62156fc7443b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java @@ -40,7 +40,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.common.SystemWindows; -import com.android.wm.shell.pip.PipMenuController; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.util.List; @@ -63,6 +63,8 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis private TvPipMenuView mPipMenuView; private TvPipBackgroundView mPipBackgroundView; + private boolean mIsReloading; + @TvPipMenuMode private int mCurrentMenuMode = MODE_NO_MENU; @TvPipMenuMode @@ -134,6 +136,18 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis mTvPipActionsProvider = tvPipActionsProvider; } + void reloadMenu() { + if (mLeash == null) { + return; + } + mPrevMenuMode = mCurrentMenuMode; + detachPipMenu(); + mCurrentMenuMode = MODE_NO_MENU; + attachPipMenu(/* showEduText */ false); + mPipMenuView.onCloseEduTextAnimationEnd(); + mIsReloading = true; + } + @Override public void attach(SurfaceControl leash) { if (mDelegate == null) { @@ -141,10 +155,10 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis } mLeash = leash; - attachPipMenu(); + attachPipMenu(/* showEduText */ true); } - private void attachPipMenu() { + private void attachPipMenu(boolean showEduText) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: attachPipMenu()", TAG); @@ -155,13 +169,17 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis attachPipBackgroundView(); attachPipMenuView(); - int pipEduTextHeight = mContext.getResources() - .getDimensionPixelSize(R.dimen.pip_menu_edu_text_view_height); int pipMenuBorderWidth = mContext.getResources() .getDimensionPixelSize(R.dimen.pip_menu_border_width); mTvPipBoundsState.setPipMenuPermanentDecorInsets(Insets.of(-pipMenuBorderWidth, -pipMenuBorderWidth, -pipMenuBorderWidth, -pipMenuBorderWidth)); - mTvPipBoundsState.setPipMenuTemporaryDecorInsets(Insets.of(0, 0, 0, -pipEduTextHeight)); + if (showEduText) { + int pipEduTextHeight = mContext.getResources() + .getDimensionPixelSize(R.dimen.pip_menu_edu_text_view_height); + mTvPipBoundsState.setPipMenuTemporaryDecorInsets(Insets.of(0, 0, 0, -pipEduTextHeight)); + } else { + mTvPipBoundsState.setPipMenuTemporaryDecorInsets(Insets.NONE); + } } private void attachPipMenuView() { @@ -223,6 +241,10 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis mMainHandler.post(() -> { if (mPipMenuView != null) { mPipMenuView.onPipTransitionFinished(enterTransition); + if (mIsReloading) { + requestMenuMode(mPrevMenuMode); + mIsReloading = false; + } } }); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuEduTextDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuEduTextDrawer.java index 202d36f0dfbd..adc03cf5c4d7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuEduTextDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuEduTextDrawer.java @@ -18,7 +18,6 @@ package com.android.wm.shell.pip.tv; import static android.view.Gravity.BOTTOM; import static android.view.Gravity.CENTER; -import static android.view.View.GONE; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE; @@ -36,7 +35,6 @@ import android.text.TextUtils; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.FrameLayout; -import android.widget.FrameLayout.LayoutParams; import android.widget.TextView; import androidx.annotation.NonNull; @@ -267,7 +265,6 @@ class TvPipMenuEduTextDrawer extends FrameLayout { } public void onCloseEduTextAnimationEnd() { - setVisibility(GONE); mListener.onCloseEduTextAnimationEnd(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java index 57439a59ccca..b259e8d584a6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java @@ -89,6 +89,8 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L private final int mPipMenuOuterSpace; private final int mPipMenuBorderWidth; + private final int mButtonStartEndOffset; + private final int mPipMenuFadeAnimationDuration; private final int mResizeAnimationDuration; @@ -147,6 +149,7 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L mPipMenuOuterSpace = res.getDimensionPixelSize(R.dimen.pip_menu_outer_space); mPipMenuBorderWidth = res.getDimensionPixelSize(R.dimen.pip_menu_border_width); mArrowElevation = res.getDimensionPixelSize(R.dimen.pip_menu_arrow_elevation); + mButtonStartEndOffset = res.getDimensionPixelSize(R.dimen.pip_menu_button_start_end_offset); initMoveArrows(); @@ -204,6 +207,16 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L v.setElevation(mArrowElevation); } + private void setButtonPadding(boolean vertical) { + if (vertical) { + mActionButtonsRecyclerView.setPadding( + 0, mButtonStartEndOffset, 0, mButtonStartEndOffset); + } else { + mActionButtonsRecyclerView.setPadding( + mButtonStartEndOffset, 0, mButtonStartEndOffset, 0); + } + } + void onPipTransitionToTargetBoundsStarted(Rect targetBounds) { if (targetBounds == null) { return; @@ -244,6 +257,7 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L } else { mButtonLayoutManager.setOrientation(vertical ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); + setButtonPadding(vertical); } } @@ -262,9 +276,10 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L mEduTextDrawer.init(); } + boolean vertical = mCurrentPipBounds.height() > mCurrentPipBounds.width(); mButtonLayoutManager.setOrientation( - mCurrentPipBounds.height() > mCurrentPipBounds.width() - ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); + vertical ? LinearLayoutManager.VERTICAL : LinearLayoutManager.HORIZONTAL); + setButtonPadding(vertical); if (mCurrentMenuMode == MODE_ALL_ACTIONS_MENU && mActionButtonsRecyclerView.getAlpha() != 1f) { mActionButtonsRecyclerView.animate() @@ -468,6 +483,7 @@ public class TvPipMenuView extends FrameLayout implements TvPipActionsProvider.L @Override public void onCloseEduTextAnimationEnd() { + mEduTextDrawer.setVisibility(GONE); mPipFrameView.setVisibility(GONE); mEduTextContainer.setVisibility(GONE); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipNotificationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipNotificationController.java index 1c94625ddde9..54e162bba2f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipNotificationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipNotificationController.java @@ -54,6 +54,7 @@ public class TvPipNotificationController implements TvPipActionsProvider.Listene // Referenced in com.android.systemui.util.NotificationChannels. public static final String NOTIFICATION_CHANNEL = "TVPIP"; private static final String NOTIFICATION_TAG = "TvPip"; + private static final String EXTRA_COMPONENT_NAME = "TvPipComponentName"; private final Context mContext; private final PackageManager mPackageManager; @@ -176,6 +177,7 @@ public class TvPipNotificationController implements TvPipActionsProvider.Listene Bundle extras = new Bundle(); extras.putParcelable(Notification.EXTRA_MEDIA_SESSION, mMediaSessionToken); + extras.putParcelable(EXTRA_COMPONENT_NAME, PipUtils.getTopPipActivity(mContext).first); mNotificationBuilder.setExtras(extras); PendingIntent closeIntent = mTvPipActionsProvider.getCloseAction().getPendingIntent(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTaskOrganizer.java index 21223c9ac362..cac63eb2a2ad 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTaskOrganizer.java @@ -28,10 +28,10 @@ import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipDisplayLayoutState; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUiEventLogger; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.pip.PipAnimationController; -import com.android.wm.shell.pip.PipMenuController; import com.android.wm.shell.pip.PipParamsChangedForwarder; import com.android.wm.shell.pip.PipSurfaceTransactionHelper; import com.android.wm.shell.pip.PipTaskOrganizer; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTransition.java index 571c839adf11..c2f4d72a1ddf 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTransition.java @@ -25,10 +25,10 @@ import static android.view.WindowManager.TRANSIT_PIP; import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.view.WindowManager.transitTypeToString; +import static com.android.wm.shell.common.pip.PipMenuController.ALPHA_NO_CHANGE; import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_LEAVE_PIP; import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_REMOVE_STACK; import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_TO_PIP; -import static com.android.wm.shell.pip.PipMenuController.ALPHA_NO_CHANGE; import static com.android.wm.shell.pip.PipTransitionState.ENTERED_PIP; import static com.android.wm.shell.pip.PipTransitionState.ENTERING_PIP; import static com.android.wm.shell.pip.PipTransitionState.EXITING_PIP; @@ -71,9 +71,9 @@ import com.android.wm.shell.pip.PipSurfaceTransactionHelper; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.pip.PipTransitionState; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.List; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/PipSurfaceTransactionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/PipSurfaceTransactionHelper.java new file mode 100644 index 000000000000..24077a35d41c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/PipSurfaceTransactionHelper.java @@ -0,0 +1,277 @@ +/* + * Copyright (C) 2020 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.pip2; + +import android.content.Context; +import android.graphics.Matrix; +import android.graphics.Rect; +import android.graphics.RectF; +import android.view.Choreographer; +import android.view.SurfaceControl; + +import com.android.wm.shell.R; +import com.android.wm.shell.transition.Transitions; + +/** + * Abstracts the common operations on {@link SurfaceControl.Transaction} for PiP transition. + */ +public class PipSurfaceTransactionHelper { + /** for {@link #scale(SurfaceControl.Transaction, SurfaceControl, Rect, Rect)} operation */ + private final Matrix mTmpTransform = new Matrix(); + private final float[] mTmpFloat9 = new float[9]; + private final RectF mTmpSourceRectF = new RectF(); + private final RectF mTmpDestinationRectF = new RectF(); + private final Rect mTmpDestinationRect = new Rect(); + + private int mCornerRadius; + private int mShadowRadius; + + public PipSurfaceTransactionHelper(Context context) { + onDensityOrFontScaleChanged(context); + } + + /** + * Called when display size or font size of settings changed + * + * @param context the current context + */ + public void onDensityOrFontScaleChanged(Context context) { + mCornerRadius = context.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius); + mShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.pip_shadow_radius); + } + + /** + * Operates the alpha on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper alpha(SurfaceControl.Transaction tx, SurfaceControl leash, + float alpha) { + tx.setAlpha(leash, alpha); + return this; + } + + /** + * Operates the crop (and position) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper crop(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect destinationBounds) { + tx.setWindowCrop(leash, destinationBounds.width(), destinationBounds.height()) + .setPosition(leash, destinationBounds.left, destinationBounds.top); + return this; + } + + /** + * Operates the scale (setMatrix) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper scale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect sourceBounds, Rect destinationBounds) { + mTmpDestinationRectF.set(destinationBounds); + return scale(tx, leash, sourceBounds, mTmpDestinationRectF, 0 /* degrees */); + } + + /** + * Operates the scale (setMatrix) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper scale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect sourceBounds, RectF destinationBounds) { + return scale(tx, leash, sourceBounds, destinationBounds, 0 /* degrees */); + } + + /** + * Operates the scale (setMatrix) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper scale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect sourceBounds, Rect destinationBounds, float degrees) { + mTmpDestinationRectF.set(destinationBounds); + return scale(tx, leash, sourceBounds, mTmpDestinationRectF, degrees); + } + + /** + * Operates the scale (setMatrix) on a given transaction and leash, along with a rotation. + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper scale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect sourceBounds, RectF destinationBounds, float degrees) { + mTmpSourceRectF.set(sourceBounds); + // We want the matrix to position the surface relative to the screen coordinates so offset + // the source to 0,0 + mTmpSourceRectF.offsetTo(0, 0); + mTmpDestinationRectF.set(destinationBounds); + mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL); + mTmpTransform.postRotate(degrees, + mTmpDestinationRectF.centerX(), mTmpDestinationRectF.centerY()); + tx.setMatrix(leash, mTmpTransform, mTmpFloat9); + return this; + } + + /** + * Operates the scale (setMatrix) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper scaleAndCrop(SurfaceControl.Transaction tx, + SurfaceControl leash, Rect sourceRectHint, + Rect sourceBounds, Rect destinationBounds, Rect insets, + boolean isInPipDirection, float fraction) { + mTmpDestinationRect.set(sourceBounds); + // Similar to {@link #scale}, we want to position the surface relative to the screen + // coordinates so offset the bounds to 0,0 + mTmpDestinationRect.offsetTo(0, 0); + mTmpDestinationRect.inset(insets); + // Scale to the bounds no smaller than the destination and offset such that the top/left + // of the scaled inset source rect aligns with the top/left of the destination bounds + final float scale; + if (isInPipDirection + && sourceRectHint != null && sourceRectHint.width() < sourceBounds.width()) { + // scale by sourceRectHint if it's not edge-to-edge, for entering PiP transition only. + final float endScale = sourceBounds.width() <= sourceBounds.height() + ? (float) destinationBounds.width() / sourceRectHint.width() + : (float) destinationBounds.height() / sourceRectHint.height(); + final float startScale = sourceBounds.width() <= sourceBounds.height() + ? (float) destinationBounds.width() / sourceBounds.width() + : (float) destinationBounds.height() / sourceBounds.height(); + scale = (1 - fraction) * startScale + fraction * endScale; + } else { + scale = Math.max((float) destinationBounds.width() / sourceBounds.width(), + (float) destinationBounds.height() / sourceBounds.height()); + } + final float left = destinationBounds.left - insets.left * scale; + final float top = destinationBounds.top - insets.top * scale; + mTmpTransform.setScale(scale, scale); + tx.setMatrix(leash, mTmpTransform, mTmpFloat9) + .setCrop(leash, mTmpDestinationRect) + .setPosition(leash, left, top); + return this; + } + + /** + * Operates the rotation according to the given degrees and scale (setMatrix) according to the + * source bounds and rotated destination bounds. The crop will be the unscaled source bounds. + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper rotateAndScaleWithCrop(SurfaceControl.Transaction tx, + SurfaceControl leash, Rect sourceBounds, Rect destinationBounds, Rect insets, + float degrees, float positionX, float positionY, boolean isExpanding, + boolean clockwise) { + mTmpDestinationRect.set(sourceBounds); + mTmpDestinationRect.inset(insets); + final int srcW = mTmpDestinationRect.width(); + final int srcH = mTmpDestinationRect.height(); + final int destW = destinationBounds.width(); + final int destH = destinationBounds.height(); + // Scale by the short side so there won't be empty area if the aspect ratio of source and + // destination are different. + final float scale = srcW <= srcH ? (float) destW / srcW : (float) destH / srcH; + final Rect crop = mTmpDestinationRect; + crop.set(0, 0, Transitions.SHELL_TRANSITIONS_ROTATION ? destH + : destW, Transitions.SHELL_TRANSITIONS_ROTATION ? destW : destH); + // Inverse scale for crop to fit in screen coordinates. + crop.scale(1 / scale); + crop.offset(insets.left, insets.top); + if (isExpanding) { + // Expand bounds (shrink insets) in source orientation. + positionX -= insets.left * scale; + positionY -= insets.top * scale; + } else { + // Shrink bounds (expand insets) in destination orientation. + if (clockwise) { + positionX -= insets.top * scale; + positionY += insets.left * scale; + } else { + positionX += insets.top * scale; + positionY -= insets.left * scale; + } + } + mTmpTransform.setScale(scale, scale); + mTmpTransform.postRotate(degrees); + mTmpTransform.postTranslate(positionX, positionY); + tx.setMatrix(leash, mTmpTransform, mTmpFloat9).setCrop(leash, crop); + return this; + } + + /** + * Resets the scale (setMatrix) on a given transaction and leash if there's any + * + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper resetScale(SurfaceControl.Transaction tx, + SurfaceControl leash, + Rect destinationBounds) { + tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, mTmpFloat9) + .setPosition(leash, destinationBounds.left, destinationBounds.top); + return this; + } + + /** + * Operates the round corner radius on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper round(SurfaceControl.Transaction tx, SurfaceControl leash, + boolean applyCornerRadius) { + tx.setCornerRadius(leash, applyCornerRadius ? mCornerRadius : 0); + return this; + } + + /** + * Operates the round corner radius on a given transaction and leash, scaled by bounds + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper round(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect fromBounds, Rect toBounds) { + final float scale = (float) (Math.hypot(fromBounds.width(), fromBounds.height()) + / Math.hypot(toBounds.width(), toBounds.height())); + tx.setCornerRadius(leash, mCornerRadius * scale); + return this; + } + + /** + * Operates the shadow radius on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + public PipSurfaceTransactionHelper shadow(SurfaceControl.Transaction tx, SurfaceControl leash, + boolean applyShadowRadius) { + tx.setShadowRadius(leash, applyShadowRadius ? mShadowRadius : 0); + return this; + } + + /** + * Interface to standardize {@link SurfaceControl.Transaction} generation across PiP. + */ + public interface SurfaceControlTransactionFactory { + /** + * @return a new transaction to operate on. + */ + SurfaceControl.Transaction getTransaction(); + } + + /** + * Implementation of {@link SurfaceControlTransactionFactory} that returns + * {@link SurfaceControl.Transaction} with VsyncId being set. + */ + public static class VsyncSurfaceControlTransactionFactory + implements SurfaceControlTransactionFactory { + @Override + public SurfaceControl.Transaction getTransaction() { + final SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); + tx.setFrameTimelineVsync(Choreographer.getInstance().getVsyncId()); + return tx; + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java new file mode 100644 index 000000000000..2478252213a7 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PhonePipMenuController.java @@ -0,0 +1,608 @@ +/* + * Copyright (C) 2020 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.pip2.phone; + +import static android.view.WindowManager.SHELL_ROOT_LAYER_PIP; + +import android.annotation.Nullable; +import android.app.ActivityManager; +import android.app.RemoteAction; +import android.content.Context; +import android.graphics.Matrix; +import android.graphics.Rect; +import android.graphics.RectF; +import android.os.Debug; +import android.os.Handler; +import android.os.RemoteException; +import android.util.Size; +import android.view.MotionEvent; +import android.view.SurfaceControl; +import android.view.View; +import android.view.ViewRootImpl; +import android.view.WindowManagerGlobal; + +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.common.SystemWindows; +import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.common.pip.PipMediaController; +import com.android.wm.shell.common.pip.PipMediaController.ActionListener; +import com.android.wm.shell.common.pip.PipMenuController; +import com.android.wm.shell.common.pip.PipUiEventLogger; +import com.android.wm.shell.pip2.PipSurfaceTransactionHelper; +import com.android.wm.shell.protolog.ShellProtoLogGroup; + +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; + +/** + * Manages the PiP menu view which can show menu options or a scrim. + * + * The current media session provides actions whenever there are no valid actions provided by the + * current PiP activity. Otherwise, those actions always take precedence. + */ +public class PhonePipMenuController implements PipMenuController { + + private static final String TAG = "PhonePipMenuController"; + private static final boolean DEBUG = false; + + public static final int MENU_STATE_NONE = 0; + public static final int MENU_STATE_FULL = 1; + + /** + * A listener interface to receive notification on changes in PIP. + */ + public interface Listener { + /** + * Called when the PIP menu visibility change has started. + * + * @param menuState the new, about-to-change state of the menu + * @param resize whether or not to resize the PiP with the state change + */ + void onPipMenuStateChangeStart(int menuState, boolean resize, Runnable callback); + + /** + * Called when the PIP menu state has finished changing/animating. + * + * @param menuState the new state of the menu. + */ + void onPipMenuStateChangeFinish(int menuState); + + /** + * Called when the PIP requested to be expanded. + */ + void onPipExpand(); + + /** + * Called when the PIP requested to be dismissed. + */ + void onPipDismiss(); + + /** + * Called when the PIP requested to show the menu. + */ + void onPipShowMenu(); + + /** + * Called when the PIP requested to enter Split. + */ + void onEnterSplit(); + } + + private final Matrix mMoveTransform = new Matrix(); + private final Rect mTmpSourceBounds = new Rect(); + private final RectF mTmpSourceRectF = new RectF(); + private final RectF mTmpDestinationRectF = new RectF(); + private final Context mContext; + private final PipBoundsState mPipBoundsState; + private final PipMediaController mMediaController; + private final ShellExecutor mMainExecutor; + private final Handler mMainHandler; + + private final PipSurfaceTransactionHelper.SurfaceControlTransactionFactory + mSurfaceControlTransactionFactory; + private final float[] mTmpTransform = new float[9]; + + private final ArrayList<Listener> mListeners = new ArrayList<>(); + private final SystemWindows mSystemWindows; + private final PipUiEventLogger mPipUiEventLogger; + + private List<RemoteAction> mAppActions; + private RemoteAction mCloseAction; + private List<RemoteAction> mMediaActions; + + private int mMenuState; + + private PipMenuView mPipMenuView; + + private SurfaceControl mLeash; + + private ActionListener mMediaActionListener = new ActionListener() { + @Override + public void onMediaActionsChanged(List<RemoteAction> mediaActions) { + mMediaActions = new ArrayList<>(mediaActions); + updateMenuActions(); + } + }; + + public PhonePipMenuController(Context context, PipBoundsState pipBoundsState, + PipMediaController mediaController, SystemWindows systemWindows, + PipUiEventLogger pipUiEventLogger, + ShellExecutor mainExecutor, Handler mainHandler) { + mContext = context; + mPipBoundsState = pipBoundsState; + mMediaController = mediaController; + mSystemWindows = systemWindows; + mMainExecutor = mainExecutor; + mMainHandler = mainHandler; + mPipUiEventLogger = pipUiEventLogger; + + mSurfaceControlTransactionFactory = + new PipSurfaceTransactionHelper.VsyncSurfaceControlTransactionFactory(); + } + + public boolean isMenuVisible() { + return mPipMenuView != null && mMenuState != MENU_STATE_NONE; + } + + /** + * Attach the menu when the PiP task first appears. + */ + @Override + public void attach(SurfaceControl leash) { + mLeash = leash; + attachPipMenuView(); + } + + /** + * Detach the menu when the PiP task is gone. + */ + @Override + public void detach() { + hideMenu(); + detachPipMenuView(); + mLeash = null; + } + + void attachPipMenuView() { + // In case detach was not called (e.g. PIP unexpectedly closed) + if (mPipMenuView != null) { + detachPipMenuView(); + } + mPipMenuView = new PipMenuView(mContext, this, mMainExecutor, mMainHandler, + mPipUiEventLogger); + mPipMenuView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) { + v.getViewRootImpl().addSurfaceChangedCallback( + new ViewRootImpl.SurfaceChangedCallback() { + @Override + public void surfaceCreated(SurfaceControl.Transaction t) { + final SurfaceControl sc = getSurfaceControl(); + if (sc != null) { + t.reparent(sc, mLeash); + // make menu on top of the surface + t.setLayer(sc, Integer.MAX_VALUE); + } + } + + @Override + public void surfaceReplaced(SurfaceControl.Transaction t) { + } + + @Override + public void surfaceDestroyed() { + } + }); + } + + @Override + public void onViewDetachedFromWindow(View v) { + } + }); + + mSystemWindows.addView(mPipMenuView, + getPipMenuLayoutParams(mContext, MENU_WINDOW_TITLE, 0 /* width */, 0 /* height */), + 0, SHELL_ROOT_LAYER_PIP); + setShellRootAccessibilityWindow(); + + // Make sure the initial actions are set + updateMenuActions(); + } + + private void detachPipMenuView() { + if (mPipMenuView == null) { + return; + } + + mSystemWindows.removeView(mPipMenuView); + mPipMenuView = null; + } + + /** + * Updates the layout parameters of the menu. + * @param destinationBounds New Menu bounds. + */ + @Override + public void updateMenuBounds(Rect destinationBounds) { + mSystemWindows.updateViewLayout(mPipMenuView, + getPipMenuLayoutParams(mContext, MENU_WINDOW_TITLE, destinationBounds.width(), + destinationBounds.height())); + updateMenuLayout(destinationBounds); + } + + @Override + public void onFocusTaskChanged(ActivityManager.RunningTaskInfo taskInfo) { + if (mPipMenuView != null) { + mPipMenuView.onFocusTaskChanged(taskInfo); + } + } + + /** + * Tries to grab a surface control from {@link PipMenuView}. If this isn't available for some + * reason (ie. the window isn't ready yet, thus {@link ViewRootImpl} is + * {@code null}), it will get the leash that the WindowlessWM has assigned to it. + */ + public SurfaceControl getSurfaceControl() { + return mSystemWindows.getViewSurface(mPipMenuView); + } + + /** + * Adds a new menu activity listener. + */ + public void addListener(Listener listener) { + if (!mListeners.contains(listener)) { + mListeners.add(listener); + } + } + + @Nullable + Size getEstimatedMinMenuSize() { + return mPipMenuView == null ? null : mPipMenuView.getEstimatedMinMenuSize(); + } + + /** + * When other components requests the menu controller directly to show the menu, we must + * first fire off the request to the other listeners who will then propagate the call + * back to the controller with the right parameters. + */ + @Override + public void showMenu() { + mListeners.forEach(Listener::onPipShowMenu); + } + + /** + * Similar to {@link #showMenu(int, Rect, boolean, boolean, boolean)} but only show the menu + * upon PiP window transition is finished. + */ + public void showMenuWithPossibleDelay(int menuState, Rect stackBounds, boolean allowMenuTimeout, + boolean willResizeMenu, boolean showResizeHandle) { + if (willResizeMenu) { + // hide all visible controls including close button and etc. first, this is to ensure + // menu is totally invisible during the transition to eliminate unpleasant artifacts + fadeOutMenu(); + } + showMenuInternal(menuState, stackBounds, allowMenuTimeout, willResizeMenu, + willResizeMenu /* withDelay=willResizeMenu here */, showResizeHandle); + } + + /** + * Shows the menu activity immediately. + */ + public void showMenu(int menuState, Rect stackBounds, boolean allowMenuTimeout, + boolean willResizeMenu, boolean showResizeHandle) { + showMenuInternal(menuState, stackBounds, allowMenuTimeout, willResizeMenu, + false /* withDelay */, showResizeHandle); + } + + private void showMenuInternal(int menuState, Rect stackBounds, boolean allowMenuTimeout, + boolean willResizeMenu, boolean withDelay, boolean showResizeHandle) { + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: showMenu() state=%s" + + " isMenuVisible=%s" + + " allowMenuTimeout=%s" + + " willResizeMenu=%s" + + " withDelay=%s" + + " showResizeHandle=%s" + + " callers=\n%s", TAG, menuState, isMenuVisible(), allowMenuTimeout, + willResizeMenu, withDelay, showResizeHandle, Debug.getCallers(5, " ")); + } + + if (!checkPipMenuState()) { + return; + } + + // Sync the menu bounds before showing it in case it is out of sync. + movePipMenu(null /* pipLeash */, null /* transaction */, stackBounds, + PipMenuController.ALPHA_NO_CHANGE); + updateMenuBounds(stackBounds); + + mPipMenuView.showMenu(menuState, stackBounds, allowMenuTimeout, willResizeMenu, withDelay, + showResizeHandle); + } + + /** + * Move the PiP menu, which does a translation and possibly a scale transformation. + */ + @Override + public void movePipMenu(@Nullable SurfaceControl pipLeash, + @Nullable SurfaceControl.Transaction t, + Rect destinationBounds, float alpha) { + if (destinationBounds.isEmpty()) { + return; + } + + if (!checkPipMenuState()) { + return; + } + + // TODO(b/286307861) transaction should be applied outside of PiP menu controller + if (pipLeash != null && t != null) { + t.apply(); + } + } + + /** + * Does an immediate window crop of the PiP menu. + */ + @Override + public void resizePipMenu(@Nullable SurfaceControl pipLeash, + @Nullable SurfaceControl.Transaction t, + Rect destinationBounds) { + if (destinationBounds.isEmpty()) { + return; + } + + if (!checkPipMenuState()) { + return; + } + + // TODO(b/286307861) transaction should be applied outside of PiP menu controller + if (pipLeash != null && t != null) { + t.apply(); + } + } + + private boolean checkPipMenuState() { + if (mPipMenuView == null || mPipMenuView.getViewRootImpl() == null) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Not going to move PiP, either menu or its parent is not created.", TAG); + return false; + } + + return true; + } + + /** + * Pokes the menu, indicating that the user is interacting with it. + */ + public void pokeMenu() { + final boolean isMenuVisible = isMenuVisible(); + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: pokeMenu() isMenuVisible=%b", TAG, isMenuVisible); + } + if (isMenuVisible) { + mPipMenuView.pokeMenu(); + } + } + + private void fadeOutMenu() { + final boolean isMenuVisible = isMenuVisible(); + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: fadeOutMenu() isMenuVisible=%b", TAG, isMenuVisible); + } + if (isMenuVisible) { + mPipMenuView.fadeOutMenu(); + } + } + + /** + * Hides the menu view. + */ + public void hideMenu() { + final boolean isMenuVisible = isMenuVisible(); + if (isMenuVisible) { + mPipMenuView.hideMenu(); + } + } + + /** + * Hides the menu view. + * + * @param animationType the animation type to use upon hiding the menu + * @param resize whether or not to resize the PiP with the state change + */ + public void hideMenu(@PipMenuView.AnimationType int animationType, boolean resize) { + final boolean isMenuVisible = isMenuVisible(); + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: hideMenu() state=%s" + + " isMenuVisible=%s" + + " animationType=%s" + + " resize=%s" + + " callers=\n%s", TAG, mMenuState, isMenuVisible, + animationType, resize, + Debug.getCallers(5, " ")); + } + if (isMenuVisible) { + mPipMenuView.hideMenu(resize, animationType); + } + } + + /** + * Hides the menu activity. + */ + public void hideMenu(Runnable onStartCallback, Runnable onEndCallback) { + if (isMenuVisible()) { + // If the menu is visible in either the closed or full state, then hide the menu and + // trigger the animation trigger afterwards + if (onStartCallback != null) { + onStartCallback.run(); + } + mPipMenuView.hideMenu(onEndCallback); + } + } + + /** + * Sets the menu actions to the actions provided by the current PiP menu. + */ + @Override + public void setAppActions(List<RemoteAction> appActions, + RemoteAction closeAction) { + mAppActions = appActions; + mCloseAction = closeAction; + updateMenuActions(); + } + + void onPipExpand() { + mListeners.forEach(Listener::onPipExpand); + } + + void onPipDismiss() { + mListeners.forEach(Listener::onPipDismiss); + } + + void onEnterSplit() { + mListeners.forEach(Listener::onEnterSplit); + } + + /** + * @return the best set of actions to show in the PiP menu. + */ + private List<RemoteAction> resolveMenuActions() { + if (isValidActions(mAppActions)) { + return mAppActions; + } + return mMediaActions; + } + + /** + * Updates the PiP menu with the best set of actions provided. + */ + private void updateMenuActions() { + if (mPipMenuView != null) { + mPipMenuView.setActions(mPipBoundsState.getBounds(), + resolveMenuActions(), mCloseAction); + } + } + + /** + * Returns whether the set of actions are valid. + */ + private static boolean isValidActions(List<?> actions) { + return actions != null && actions.size() > 0; + } + + /** + * Handles changes in menu visibility. + */ + void onMenuStateChangeStart(int menuState, boolean resize, Runnable callback) { + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: onMenuStateChangeStart() mMenuState=%s" + + " menuState=%s resize=%s" + + " callers=\n%s", TAG, mMenuState, menuState, resize, + Debug.getCallers(5, " ")); + } + + if (menuState != mMenuState) { + mListeners.forEach(l -> l.onPipMenuStateChangeStart(menuState, resize, callback)); + if (menuState == MENU_STATE_FULL) { + // Once visible, start listening for media action changes. This call will trigger + // the menu actions to be updated again. + mMediaController.addActionListener(mMediaActionListener); + } else { + // Once hidden, stop listening for media action changes. This call will trigger + // the menu actions to be updated again. + mMediaController.removeActionListener(mMediaActionListener); + } + + try { + WindowManagerGlobal.getWindowSession().grantEmbeddedWindowFocus(null /* window */, + mSystemWindows.getFocusGrantToken(mPipMenuView), + menuState != MENU_STATE_NONE /* grantFocus */); + } catch (RemoteException e) { + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Unable to update focus as menu appears/disappears, %s", TAG, e); + } + } + } + + void onMenuStateChangeFinish(int menuState) { + if (menuState != mMenuState) { + mListeners.forEach(l -> l.onPipMenuStateChangeFinish(menuState)); + } + mMenuState = menuState; + setShellRootAccessibilityWindow(); + } + + private void setShellRootAccessibilityWindow() { + switch (mMenuState) { + case MENU_STATE_NONE: + mSystemWindows.setShellRootAccessibilityWindow(0, SHELL_ROOT_LAYER_PIP, null); + break; + default: + mSystemWindows.setShellRootAccessibilityWindow(0, SHELL_ROOT_LAYER_PIP, + mPipMenuView); + break; + } + } + + /** + * Handles a pointer event sent from pip input consumer. + */ + void handlePointerEvent(MotionEvent ev) { + if (mPipMenuView == null) { + return; + } + + if (ev.isTouchEvent()) { + mPipMenuView.dispatchTouchEvent(ev); + } else { + mPipMenuView.dispatchGenericMotionEvent(ev); + } + } + + /** + * Tell the PIP Menu to recalculate its layout given its current position on the display. + */ + public void updateMenuLayout(Rect bounds) { + final boolean isMenuVisible = isMenuVisible(); + if (DEBUG) { + ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: updateMenuLayout() state=%s" + + " isMenuVisible=%s" + + " callers=\n%s", TAG, mMenuState, isMenuVisible, + Debug.getCallers(5, " ")); + } + if (isMenuVisible) { + mPipMenuView.updateMenuLayout(bounds); + } + } + + void dump(PrintWriter pw, String prefix) { + final String innerPrefix = prefix + " "; + pw.println(prefix + TAG); + pw.println(innerPrefix + "mMenuState=" + mMenuState); + pw.println(innerPrefix + "mPipMenuView=" + mPipMenuView); + pw.println(innerPrefix + "mListeners=" + mListeners.size()); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuActionView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuActionView.java new file mode 100644 index 000000000000..7252675dc52d --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuActionView.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2021 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.pip2.phone; + +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.View; +import android.widget.FrameLayout; +import android.widget.ImageView; + +import com.android.wm.shell.R; + +/** + * Container layout wraps single action image view drawn in PiP menu and can restrict the size of + * action image view (see pip_menu_action.xml). + */ +public class PipMenuActionView extends FrameLayout { + private ImageView mImageView; + private View mCustomCloseBackground; + + public PipMenuActionView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mImageView = findViewById(R.id.image); + mCustomCloseBackground = findViewById(R.id.custom_close_bg); + } + + /** pass through to internal {@link #mImageView} */ + public void setImageDrawable(Drawable drawable) { + mImageView.setImageDrawable(drawable); + } + + /** pass through to internal {@link #mCustomCloseBackground} */ + public void setCustomCloseBackgroundVisibility(@Visibility int visibility) { + mCustomCloseBackground.setVisibility(visibility); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuIconsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuIconsAlgorithm.java new file mode 100644 index 000000000000..b5e575ba33f2 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuIconsAlgorithm.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2020 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.pip2.phone; + +import android.content.Context; +import android.graphics.Rect; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; + +/** + * Helper class to calculate and place the menu icons on the PIP Menu. + */ +public class PipMenuIconsAlgorithm { + + private static final String TAG = "PipMenuIconsAlgorithm"; + + protected ViewGroup mViewRoot; + protected ViewGroup mTopEndContainer; + protected View mDragHandle; + protected View mEnterSplitButton; + protected View mSettingsButton; + protected View mDismissButton; + + protected PipMenuIconsAlgorithm(Context context) { + } + + /** + * Bind the necessary views. + */ + public void bindViews(ViewGroup viewRoot, ViewGroup topEndContainer, View dragHandle, + View enterSplitButton, View settingsButton, View dismissButton) { + mViewRoot = viewRoot; + mTopEndContainer = topEndContainer; + mDragHandle = dragHandle; + mEnterSplitButton = enterSplitButton; + mSettingsButton = settingsButton; + mDismissButton = dismissButton; + } + + /** + * Updates the position of the drag handle based on where the PIP window is on the screen. + */ + public void onBoundsChanged(Rect bounds) { + // On phones, the menu icons are always static and will never move based on the PIP window + // position. No need to do anything here. + } + + /** + * Set the gravity on the given view. + */ + protected static void setLayoutGravity(View v, int gravity) { + if (v.getLayoutParams() instanceof FrameLayout.LayoutParams) { + FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams(); + params.gravity = gravity; + v.setLayoutParams(params); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuView.java new file mode 100644 index 000000000000..a5b76c7df20b --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipMenuView.java @@ -0,0 +1,630 @@ +/* + * Copyright (C) 2020 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.pip2.phone; + +import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static android.provider.Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS; +import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS; +import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_ICONS; +import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; + +import static com.android.wm.shell.pip.phone.PhonePipMenuController.MENU_STATE_FULL; +import static com.android.wm.shell.pip.phone.PhonePipMenuController.MENU_STATE_NONE; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.ActivityManager; +import android.app.PendingIntent; +import android.app.RemoteAction; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.graphics.Color; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; +import android.net.Uri; +import android.os.Bundle; +import android.os.Handler; +import android.os.UserHandle; +import android.util.Pair; +import android.util.Size; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.AccessibilityNodeInfo; +import android.widget.FrameLayout; +import android.widget.LinearLayout; + +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.R; +import com.android.wm.shell.animation.Interpolators; +import com.android.wm.shell.common.ShellExecutor; +import com.android.wm.shell.common.pip.PipUiEventLogger; +import com.android.wm.shell.common.pip.PipUtils; +import com.android.wm.shell.protolog.ShellProtoLogGroup; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * Translucent window that gets started on top of a task in PIP to allow the user to control it. + */ +public class PipMenuView extends FrameLayout { + + private static final String TAG = "PipMenuView"; + + private static final int ANIMATION_NONE_DURATION_MS = 0; + private static final int ANIMATION_HIDE_DURATION_MS = 125; + + /** No animation performed during menu hide. */ + public static final int ANIM_TYPE_NONE = 0; + /** Fade out the menu until it's invisible. Used when the PIP window remains visible. */ + public static final int ANIM_TYPE_HIDE = 1; + /** Fade out the menu in sync with the PIP window. */ + public static final int ANIM_TYPE_DISMISS = 2; + + @IntDef(prefix = { "ANIM_TYPE_" }, value = { + ANIM_TYPE_NONE, + ANIM_TYPE_HIDE, + ANIM_TYPE_DISMISS + }) + @Retention(RetentionPolicy.SOURCE) + public @interface AnimationType {} + + private static final int INITIAL_DISMISS_DELAY = 3500; + private static final int POST_INTERACTION_DISMISS_DELAY = 2000; + private static final long MENU_SHOW_ON_EXPAND_START_DELAY = 30; + + private static final float MENU_BACKGROUND_ALPHA = 0.54f; + private static final float DISABLED_ACTION_ALPHA = 0.54f; + + private int mMenuState; + private boolean mAllowMenuTimeout = true; + private boolean mAllowTouches = true; + private int mDismissFadeOutDurationMs; + private final List<RemoteAction> mActions = new ArrayList<>(); + private RemoteAction mCloseAction; + + private AccessibilityManager mAccessibilityManager; + private Drawable mBackgroundDrawable; + private View mMenuContainer; + private LinearLayout mActionsGroup; + private int mBetweenActionPaddingLand; + + private AnimatorSet mMenuContainerAnimator; + private final PhonePipMenuController mController; + private final PipUiEventLogger mPipUiEventLogger; + + private ValueAnimator.AnimatorUpdateListener mMenuBgUpdateListener = + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + final float alpha = (float) animation.getAnimatedValue(); + mBackgroundDrawable.setAlpha((int) (MENU_BACKGROUND_ALPHA * alpha * 255)); + } + }; + + private ShellExecutor mMainExecutor; + private Handler mMainHandler; + + /** + * Whether the most recent showing of the menu caused a PIP resize, such as when PIP is too + * small and it is resized on menu show to fit the actions. + */ + private boolean mDidLastShowMenuResize; + private final Runnable mHideMenuRunnable = this::hideMenu; + + protected View mViewRoot; + protected View mSettingsButton; + protected View mDismissButton; + protected View mEnterSplitButton; + protected View mTopEndContainer; + protected PipMenuIconsAlgorithm mPipMenuIconsAlgorithm; + + // How long the shell will wait for the app to close the PiP if a custom action is set. + private final int mPipForceCloseDelay; + + public PipMenuView(Context context, PhonePipMenuController controller, + ShellExecutor mainExecutor, Handler mainHandler, PipUiEventLogger pipUiEventLogger) { + super(context, null, 0); + mContext = context; + mController = controller; + mMainExecutor = mainExecutor; + mMainHandler = mainHandler; + mPipUiEventLogger = pipUiEventLogger; + + mAccessibilityManager = context.getSystemService(AccessibilityManager.class); + inflate(context, R.layout.pip_menu, this); + + mPipForceCloseDelay = context.getResources().getInteger( + R.integer.config_pipForceCloseDelay); + + mBackgroundDrawable = mContext.getDrawable(R.drawable.pip_menu_background); + mBackgroundDrawable.setAlpha(0); + mViewRoot = findViewById(R.id.background); + mViewRoot.setBackground(mBackgroundDrawable); + mMenuContainer = findViewById(R.id.menu_container); + mMenuContainer.setAlpha(0); + mTopEndContainer = findViewById(R.id.top_end_container); + mSettingsButton = findViewById(R.id.settings); + mSettingsButton.setAlpha(0); + mSettingsButton.setOnClickListener((v) -> { + if (v.getAlpha() != 0) { + showSettings(); + } + }); + mDismissButton = findViewById(R.id.dismiss); + mDismissButton.setAlpha(0); + mDismissButton.setOnClickListener(v -> dismissPip()); + findViewById(R.id.expand_button).setOnClickListener(v -> { + if (mMenuContainer.getAlpha() != 0) { + expandPip(); + } + }); + + mEnterSplitButton = findViewById(R.id.enter_split); + mEnterSplitButton.setAlpha(0); + mEnterSplitButton.setOnClickListener(v -> { + if (mEnterSplitButton.getAlpha() != 0) { + enterSplit(); + } + }); + + // this disables the ripples + mEnterSplitButton.setEnabled(false); + + findViewById(R.id.resize_handle).setAlpha(0); + + mActionsGroup = findViewById(R.id.actions_group); + mBetweenActionPaddingLand = getResources().getDimensionPixelSize( + R.dimen.pip_between_action_padding_land); + mPipMenuIconsAlgorithm = new PipMenuIconsAlgorithm(mContext); + mPipMenuIconsAlgorithm.bindViews((ViewGroup) mViewRoot, (ViewGroup) mTopEndContainer, + findViewById(R.id.resize_handle), mEnterSplitButton, mSettingsButton, + mDismissButton); + mDismissFadeOutDurationMs = context.getResources() + .getInteger(R.integer.config_pipExitAnimationDuration); + + initAccessibility(); + } + + private void initAccessibility() { + this.setAccessibilityDelegate(new AccessibilityDelegate() { + @Override + public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(host, info); + String label = getResources().getString(R.string.pip_menu_title); + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, label)); + } + + @Override + public boolean performAccessibilityAction(View host, int action, Bundle args) { + if (action == ACTION_CLICK && mMenuState != MENU_STATE_FULL) { + mController.showMenu(); + } + return super.performAccessibilityAction(host, action, args); + } + }); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_ESCAPE) { + hideMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } + + @Override + public boolean shouldDelayChildPressedState() { + return true; + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (!mAllowTouches) { + return false; + } + + if (mAllowMenuTimeout) { + repostDelayedHide(POST_INTERACTION_DISMISS_DELAY); + } + + return super.dispatchTouchEvent(ev); + } + + @Override + public boolean dispatchGenericMotionEvent(MotionEvent event) { + if (mAllowMenuTimeout) { + repostDelayedHide(POST_INTERACTION_DISMISS_DELAY); + } + + return super.dispatchGenericMotionEvent(event); + } + + void onFocusTaskChanged(ActivityManager.RunningTaskInfo taskInfo) {} + + void showMenu(int menuState, Rect stackBounds, boolean allowMenuTimeout, + boolean resizeMenuOnShow, boolean withDelay, boolean showResizeHandle) { + mAllowMenuTimeout = allowMenuTimeout; + mDidLastShowMenuResize = resizeMenuOnShow; + final boolean enableEnterSplit = + mContext.getResources().getBoolean(R.bool.config_pipEnableEnterSplitButton); + if (mMenuState != menuState) { + // Disallow touches if the menu needs to resize while showing, and we are transitioning + // to/from a full menu state. + boolean disallowTouchesUntilAnimationEnd = resizeMenuOnShow + && (mMenuState == MENU_STATE_FULL || menuState == MENU_STATE_FULL); + mAllowTouches = !disallowTouchesUntilAnimationEnd; + cancelDelayedHide(); + if (mMenuContainerAnimator != null) { + mMenuContainerAnimator.cancel(); + } + mMenuContainerAnimator = new AnimatorSet(); + ObjectAnimator menuAnim = ObjectAnimator.ofFloat(mMenuContainer, View.ALPHA, + mMenuContainer.getAlpha(), 1f); + menuAnim.addUpdateListener(mMenuBgUpdateListener); + ObjectAnimator settingsAnim = ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, + mSettingsButton.getAlpha(), 1f); + ObjectAnimator dismissAnim = ObjectAnimator.ofFloat(mDismissButton, View.ALPHA, + mDismissButton.getAlpha(), 1f); + if (menuState == MENU_STATE_FULL) { + mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim); + } + mMenuContainerAnimator.setInterpolator(Interpolators.ALPHA_IN); + mMenuContainerAnimator.setDuration(ANIMATION_HIDE_DURATION_MS); + mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + mAllowTouches = true; + notifyMenuStateChangeFinish(menuState); + if (allowMenuTimeout) { + repostDelayedHide(INITIAL_DISMISS_DELAY); + } + } + + @Override + public void onAnimationCancel(Animator animation) { + mAllowTouches = true; + } + }); + if (withDelay) { + // starts the menu container animation after window expansion is completed + notifyMenuStateChangeStart(menuState, resizeMenuOnShow, () -> { + if (mMenuContainerAnimator == null) { + return; + } + mMenuContainerAnimator.setStartDelay(MENU_SHOW_ON_EXPAND_START_DELAY); + setVisibility(VISIBLE); + mMenuContainerAnimator.start(); + }); + } else { + notifyMenuStateChangeStart(menuState, resizeMenuOnShow, null); + setVisibility(VISIBLE); + mMenuContainerAnimator.start(); + } + updateActionViews(menuState, stackBounds); + } else { + // If we are already visible, then just start the delayed dismiss and unregister any + // existing input consumers from the previous drag + if (allowMenuTimeout) { + repostDelayedHide(POST_INTERACTION_DISMISS_DELAY); + } + } + } + + /** + * Different from {@link #hideMenu()}, this function does not try to finish this menu activity + * and instead, it fades out the controls by setting the alpha to 0 directly without menu + * visibility callbacks invoked. + */ + void fadeOutMenu() { + mMenuContainer.setAlpha(0f); + mSettingsButton.setAlpha(0f); + mDismissButton.setAlpha(0f); + mEnterSplitButton.setAlpha(0f); + } + + void pokeMenu() { + cancelDelayedHide(); + } + + void updateMenuLayout(Rect bounds) { + mPipMenuIconsAlgorithm.onBoundsChanged(bounds); + } + + void hideMenu() { + hideMenu(null); + } + + void hideMenu(Runnable animationEndCallback) { + hideMenu(animationEndCallback, true /* notifyMenuVisibility */, mDidLastShowMenuResize, + ANIM_TYPE_HIDE); + } + + void hideMenu(boolean resize, @AnimationType int animationType) { + hideMenu(null /* animationFinishedRunnable */, true /* notifyMenuVisibility */, resize, + animationType); + } + + void hideMenu(final Runnable animationFinishedRunnable, boolean notifyMenuVisibility, + boolean resize, @AnimationType int animationType) { + if (mMenuState != MENU_STATE_NONE) { + cancelDelayedHide(); + if (notifyMenuVisibility) { + notifyMenuStateChangeStart(MENU_STATE_NONE, resize, null); + } + mMenuContainerAnimator = new AnimatorSet(); + ObjectAnimator menuAnim = ObjectAnimator.ofFloat(mMenuContainer, View.ALPHA, + mMenuContainer.getAlpha(), 0f); + menuAnim.addUpdateListener(mMenuBgUpdateListener); + ObjectAnimator settingsAnim = ObjectAnimator.ofFloat(mSettingsButton, View.ALPHA, + mSettingsButton.getAlpha(), 0f); + ObjectAnimator dismissAnim = ObjectAnimator.ofFloat(mDismissButton, View.ALPHA, + mDismissButton.getAlpha(), 0f); + ObjectAnimator enterSplitAnim = ObjectAnimator.ofFloat(mEnterSplitButton, View.ALPHA, + mEnterSplitButton.getAlpha(), 0f); + mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim, + enterSplitAnim); + mMenuContainerAnimator.setInterpolator(Interpolators.ALPHA_OUT); + mMenuContainerAnimator.setDuration(getFadeOutDuration(animationType)); + mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + setVisibility(GONE); + if (notifyMenuVisibility) { + notifyMenuStateChangeFinish(MENU_STATE_NONE); + } + if (animationFinishedRunnable != null) { + animationFinishedRunnable.run(); + } + } + }); + mMenuContainerAnimator.start(); + } + } + + /** + * @return Estimated minimum {@link Size} to hold the actions. + * See also {@link #updateActionViews(Rect)} + */ + Size getEstimatedMinMenuSize() { + final int pipActionSize = getResources().getDimensionPixelSize(R.dimen.pip_action_size); + // the minimum width would be (2 * pipActionSize) since we have settings and dismiss button + // on the top action container. + final int width = Math.max(2, mActions.size()) * pipActionSize; + final int height = getResources().getDimensionPixelSize(R.dimen.pip_expand_action_size) + + getResources().getDimensionPixelSize(R.dimen.pip_action_padding) + + getResources().getDimensionPixelSize(R.dimen.pip_expand_container_edge_margin); + return new Size(width, height); + } + + void setActions(Rect stackBounds, @Nullable List<RemoteAction> actions, + @Nullable RemoteAction closeAction) { + mActions.clear(); + if (actions != null && !actions.isEmpty()) { + mActions.addAll(actions); + } + mCloseAction = closeAction; + if (mMenuState == MENU_STATE_FULL) { + updateActionViews(mMenuState, stackBounds); + } + } + + private void updateActionViews(int menuState, Rect stackBounds) { + ViewGroup expandContainer = findViewById(R.id.expand_container); + ViewGroup actionsContainer = findViewById(R.id.actions_container); + actionsContainer.setOnTouchListener((v, ev) -> { + // Do nothing, prevent click through to parent + return true; + }); + + // Update the expand button only if it should show with the menu + expandContainer.setVisibility(menuState == MENU_STATE_FULL + ? View.VISIBLE + : View.INVISIBLE); + + LayoutParams expandedLp = + (LayoutParams) expandContainer.getLayoutParams(); + if (mActions.isEmpty() || menuState == MENU_STATE_NONE) { + actionsContainer.setVisibility(View.INVISIBLE); + + // Update the expand container margin to adjust the center of the expand button to + // account for the existence of the action container + expandedLp.topMargin = 0; + expandedLp.bottomMargin = 0; + } else { + actionsContainer.setVisibility(View.VISIBLE); + if (mActionsGroup != null) { + // Ensure we have as many buttons as actions + final LayoutInflater inflater = LayoutInflater.from(mContext); + while (mActionsGroup.getChildCount() < mActions.size()) { + final PipMenuActionView actionView = (PipMenuActionView) inflater.inflate( + R.layout.pip_menu_action, mActionsGroup, false); + mActionsGroup.addView(actionView); + } + + // Update the visibility of all views + for (int i = 0; i < mActionsGroup.getChildCount(); i++) { + mActionsGroup.getChildAt(i).setVisibility(i < mActions.size() + ? View.VISIBLE + : View.GONE); + } + + // Recreate the layout + final boolean isLandscapePip = stackBounds != null + && (stackBounds.width() > stackBounds.height()); + for (int i = 0; i < mActions.size(); i++) { + final RemoteAction action = mActions.get(i); + final PipMenuActionView actionView = + (PipMenuActionView) mActionsGroup.getChildAt(i); + final boolean isCloseAction = mCloseAction != null && Objects.equals( + mCloseAction.getActionIntent(), action.getActionIntent()); + + final int iconType = action.getIcon().getType(); + if (iconType == Icon.TYPE_URI || iconType == Icon.TYPE_URI_ADAPTIVE_BITMAP) { + // Disallow loading icon from content URI + actionView.setImageDrawable(null); + } else { + // TODO: Check if the action drawable has changed before we reload it + action.getIcon().loadDrawableAsync(mContext, d -> { + if (d != null) { + d.setTint(Color.WHITE); + actionView.setImageDrawable(d); + } + }, mMainHandler); + } + actionView.setCustomCloseBackgroundVisibility( + isCloseAction ? View.VISIBLE : View.GONE); + actionView.setContentDescription(action.getContentDescription()); + if (action.isEnabled()) { + actionView.setOnClickListener( + v -> onActionViewClicked(action.getActionIntent(), isCloseAction)); + } + actionView.setEnabled(action.isEnabled()); + actionView.setAlpha(action.isEnabled() ? 1f : DISABLED_ACTION_ALPHA); + + // Update the margin between actions + LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) + actionView.getLayoutParams(); + lp.leftMargin = (isLandscapePip && i > 0) ? mBetweenActionPaddingLand : 0; + } + } + + // Update the expand container margin to adjust the center of the expand button to + // account for the existence of the action container + expandedLp.topMargin = getResources().getDimensionPixelSize( + R.dimen.pip_action_padding); + expandedLp.bottomMargin = getResources().getDimensionPixelSize( + R.dimen.pip_expand_container_edge_margin); + } + expandContainer.requestLayout(); + } + + private void notifyMenuStateChangeStart(int menuState, boolean resize, Runnable callback) { + mController.onMenuStateChangeStart(menuState, resize, callback); + } + + private void notifyMenuStateChangeFinish(int menuState) { + mMenuState = menuState; + mController.onMenuStateChangeFinish(menuState); + } + + private void expandPip() { + // Do not notify menu visibility when hiding the menu, the controller will do this when it + // handles the message + hideMenu(mController::onPipExpand, false /* notifyMenuVisibility */, true /* resize */, + ANIM_TYPE_HIDE); + mPipUiEventLogger.log( + PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN); + } + + private void dismissPip() { + if (mMenuState != MENU_STATE_NONE) { + // Do not call hideMenu() directly. Instead, let the menu controller handle it just as + // any other dismissal that will update the touch state and fade out the PIP task + // and the menu view at the same time. + mController.onPipDismiss(); + mPipUiEventLogger.log(PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_TAP_TO_REMOVE); + } + } + + /** + * Execute the {@link PendingIntent} attached to the {@link PipMenuActionView}. + * If the given {@link PendingIntent} matches {@link #mCloseAction}, we need to make sure + * the PiP is removed after a certain timeout in case the app does not respond in a + * timely manner. + */ + private void onActionViewClicked(@NonNull PendingIntent intent, boolean isCloseAction) { + try { + intent.send(); + } catch (PendingIntent.CanceledException e) { + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, + "%s: Failed to send action, %s", TAG, e); + } + if (isCloseAction) { + mPipUiEventLogger.log(PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_CUSTOM_CLOSE); + mAllowTouches = false; + mMainExecutor.executeDelayed(() -> { + hideMenu(); + // TODO: it's unsafe to call onPipDismiss with a delay here since + // we may have a different PiP by the time this runnable is executed. + mController.onPipDismiss(); + mAllowTouches = true; + }, mPipForceCloseDelay); + } + } + + private void enterSplit() { + // Do not notify menu visibility when hiding the menu, the controller will do this when it + // handles the message + hideMenu(mController::onEnterSplit, false /* notifyMenuVisibility */, true /* resize */, + ANIM_TYPE_HIDE); + } + + + private void showSettings() { + final Pair<ComponentName, Integer> topPipActivityInfo = + PipUtils.getTopPipActivity(mContext); + if (topPipActivityInfo.first != null) { + final Intent settingsIntent = new Intent(ACTION_PICTURE_IN_PICTURE_SETTINGS, + Uri.fromParts("package", topPipActivityInfo.first.getPackageName(), null)); + settingsIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK); + mContext.startActivityAsUser(settingsIntent, UserHandle.of(topPipActivityInfo.second)); + mPipUiEventLogger.log(PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_SHOW_SETTINGS); + } + } + + private void cancelDelayedHide() { + mMainExecutor.removeCallbacks(mHideMenuRunnable); + } + + private void repostDelayedHide(int delay) { + int recommendedTimeout = mAccessibilityManager.getRecommendedTimeoutMillis(delay, + FLAG_CONTENT_ICONS | FLAG_CONTENT_CONTROLS); + mMainExecutor.removeCallbacks(mHideMenuRunnable); + mMainExecutor.executeDelayed(mHideMenuRunnable, recommendedTimeout); + } + + private long getFadeOutDuration(@AnimationType int animationType) { + switch (animationType) { + case ANIM_TYPE_NONE: + return ANIMATION_NONE_DURATION_MS; + case ANIM_TYPE_HIDE: + return ANIMATION_HIDE_DURATION_MS; + case ANIM_TYPE_DISMISS: + return mDismissFadeOutDurationMs; + default: + throw new IllegalStateException("Invalid animation type " + animationType); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java index 0448d94669ce..57b73b3019f4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java @@ -24,10 +24,12 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.graphics.Rect; import android.view.SurfaceControl; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; +import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; @@ -36,6 +38,10 @@ import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipUtils; import com.android.wm.shell.pip.PipTransitionController; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.function.Consumer; + /** * Scheduler for Shell initiated PiP transitions and animations. */ @@ -58,13 +64,37 @@ public class PipScheduler { private SurfaceControl mPinnedTaskLeash; /** - * A temporary broadcast receiver to initiate exit PiP via expand. - * This will later be modified to be triggered by the PiP menu. + * Temporary PiP CUJ codes to schedule PiP related transitions directly from Shell. + * This is used for a broadcast receiver to resolve intents. This should be removed once + * there is an equivalent of PipTouchHandler and PipResizeGestureHandler for PiP2. + */ + private static final int PIP_EXIT_VIA_EXPAND_CODE = 0; + private static final int PIP_DOUBLE_TAP = 1; + + @IntDef(value = { + PIP_EXIT_VIA_EXPAND_CODE, + PIP_DOUBLE_TAP + }) + @Retention(RetentionPolicy.SOURCE) + @interface PipUserJourneyCode {} + + /** + * A temporary broadcast receiver to initiate PiP CUJs. */ private class PipSchedulerReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - scheduleExitPipViaExpand(); + int userJourneyCode = intent.getIntExtra("cuj_code_extra", 0); + switch (userJourneyCode) { + case PIP_EXIT_VIA_EXPAND_CODE: + scheduleExitPipViaExpand(); + break; + case PIP_DOUBLE_TAP: + scheduleDoubleTapToResize(); + break; + default: + throw new IllegalStateException("unexpected CUJ code=" + userJourneyCode); + } } } @@ -96,7 +126,7 @@ public class PipScheduler { @Nullable private WindowContainerTransaction getExitPipViaExpandTransaction() { - if (mPipTaskToken == null || mPinnedTaskLeash == null) { + if (mPipTaskToken == null) { return null; } WindowContainerTransaction wct = new WindowContainerTransaction(); @@ -121,6 +151,23 @@ public class PipScheduler { } } + /** + * Schedules resize PiP via double tap. + */ + public void scheduleDoubleTapToResize() {} + + /** + * Animates resizing of the pinned stack given the duration. + */ + public void scheduleAnimateResizePip(Rect toBounds, Consumer<Rect> onFinishResizeCallback) { + if (mPipTaskToken == null) { + return; + } + WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.setBounds(mPipTaskToken, toBounds); + mPipTransitionController.startResizeTransition(wct, onFinishResizeCallback); + } + void onExitPip() { mPipTaskToken = null; mPinnedTaskLeash = null; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index 6200ea583a48..fbf4d13a0c19 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -18,12 +18,16 @@ package com.android.wm.shell.pip2.phone; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.WindowManager.TRANSIT_OPEN; +import static android.view.WindowManager.TRANSIT_PIP; +import static android.view.WindowManager.TRANSIT_TO_FRONT; import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP; +import static com.android.wm.shell.transition.Transitions.TRANSIT_RESIZE_PIP; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PictureInPictureParams; +import android.content.Context; import android.graphics.Rect; import android.os.IBinder; import android.view.SurfaceControl; @@ -34,30 +38,39 @@ import android.window.WindowContainerTransaction; import androidx.annotation.Nullable; +import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; -import com.android.wm.shell.pip.PipMenuController; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; +import java.util.function.Consumer; + /** * Implementation of transitions for PiP on phone. */ public class PipTransition extends PipTransitionController { private static final String TAG = PipTransition.class.getSimpleName(); + private final Context mContext; private final PipScheduler mPipScheduler; @Nullable private WindowContainerToken mPipTaskToken; @Nullable - private IBinder mAutoEnterButtonNavTransition; + private IBinder mEnterTransition; @Nullable private IBinder mExitViaExpandTransition; + @Nullable + private IBinder mResizeTransition; + + private Consumer<Rect> mFinishResizeCallback; public PipTransition( + Context context, @NonNull ShellInit shellInit, @NonNull ShellTaskOrganizer shellTaskOrganizer, @NonNull Transitions transitions, @@ -68,6 +81,7 @@ public class PipTransition extends PipTransitionController { super(shellInit, shellTaskOrganizer, transitions, pipBoundsState, pipMenuController, pipBoundsAlgorithm); + mContext = context; mPipScheduler = pipScheduler; mPipScheduler.setPipTransitionController(this); } @@ -81,7 +95,7 @@ public class PipTransition extends PipTransitionController { @Override public void startExitTransition(int type, WindowContainerTransaction out, - @android.annotation.Nullable Rect destinationBounds) { + @Nullable Rect destinationBounds) { if (out == null) { return; } @@ -91,12 +105,22 @@ public class PipTransition extends PipTransitionController { } } + @Override + public void startResizeTransition(WindowContainerTransaction wct, + Consumer<Rect> onFinishResizeCallback) { + if (wct == null) { + return; + } + mResizeTransition = mTransitions.startTransition(TRANSIT_RESIZE_PIP, wct, this); + mFinishResizeCallback = onFinishResizeCallback; + } + @Nullable @Override public WindowContainerTransaction handleRequest(@NonNull IBinder transition, @NonNull TransitionRequestInfo request) { - if (isAutoEnterInButtonNavigation(request)) { - mAutoEnterButtonNavTransition = transition; + if (isAutoEnterInButtonNavigation(request) || isEnterPictureInPictureModeRequest(request)) { + mEnterTransition = transition; return getEnterPipTransaction(transition, request); } return null; @@ -105,9 +129,9 @@ public class PipTransition extends PipTransitionController { @Override public void augmentRequest(@NonNull IBinder transition, @NonNull TransitionRequestInfo request, @NonNull WindowContainerTransaction outWct) { - if (isAutoEnterInButtonNavigation(request)) { + if (isAutoEnterInButtonNavigation(request) || isEnterPictureInPictureModeRequest(request)) { outWct.merge(getEnterPipTransaction(transition, request), true /* transfer */); - mAutoEnterButtonNavTransition = transition; + mEnterTransition = transition; } } @@ -120,6 +144,126 @@ public class PipTransition extends PipTransitionController { public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted, @Nullable SurfaceControl.Transaction finishT) {} + @Override + public boolean startAnimation(@NonNull IBinder transition, + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + if (transition == mEnterTransition) { + mEnterTransition = null; + if (isLegacyEnter(info)) { + // If this is a legacy-enter-pip (auto-enter is off and PiP activity went to pause), + // then we should run an ALPHA type (cross-fade) animation. + return startAlphaTypeEnterAnimation(info, startTransaction, finishTransaction, + finishCallback); + } + return startBoundsTypeEnterAnimation(info, startTransaction, finishTransaction, + finishCallback); + } else if (transition == mExitViaExpandTransition) { + mExitViaExpandTransition = null; + return startExpandAnimation(info, startTransaction, finishTransaction, finishCallback); + } else if (transition == mResizeTransition) { + mResizeTransition = null; + return startResizeAnimation(info, startTransaction, finishTransaction, finishCallback); + } + return false; + } + + private boolean startResizeAnimation(@NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + TransitionInfo.Change pipChange = getPipChange(info); + if (pipChange == null) { + return false; + } + SurfaceControl pipLeash = pipChange.getLeash(); + Rect destinationBounds = pipChange.getEndAbsBounds(); + + // Even though the final bounds and crop are applied with finishTransaction since + // this is a visible change, we still need to handle the app draw coming in. Snapshot + // covering app draw during collection will be removed by startTransaction. So we make + // the crop equal to the final bounds and then scale the leash back to starting bounds. + startTransaction.setWindowCrop(pipLeash, pipChange.getEndAbsBounds().width(), + pipChange.getEndAbsBounds().height()); + startTransaction.setScale(pipLeash, + (float) mPipBoundsState.getBounds().width() / destinationBounds.width(), + (float) mPipBoundsState.getBounds().height() / destinationBounds.height()); + startTransaction.apply(); + + finishTransaction.setScale(pipLeash, + (float) mPipBoundsState.getBounds().width() / destinationBounds.width(), + (float) mPipBoundsState.getBounds().height() / destinationBounds.height()); + + // We are done with the transition, but will continue animating leash to final bounds. + finishCallback.onTransitionFinished(null); + + // Animate the pip leash with the new buffer + final int duration = mContext.getResources().getInteger( + R.integer.config_pipResizeAnimationDuration); + // TODO: b/275910498 Couple this routine with a new implementation of the PiP animator. + startResizeAnimation(pipLeash, mPipBoundsState.getBounds(), destinationBounds, duration); + return true; + } + + private boolean startBoundsTypeEnterAnimation(@NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + TransitionInfo.Change pipChange = getPipChange(info); + if (pipChange == null) { + return false; + } + mPipTaskToken = pipChange.getContainer(); + + // cache the PiP task token and leash + mPipScheduler.setPipTaskToken(mPipTaskToken); + + startTransaction.apply(); + finishCallback.onTransitionFinished(null); + return true; + } + + private boolean startAlphaTypeEnterAnimation(@NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + TransitionInfo.Change pipChange = getPipChange(info); + if (pipChange == null) { + return false; + } + mPipTaskToken = pipChange.getContainer(); + + // cache the PiP task token and leash + mPipScheduler.setPipTaskToken(mPipTaskToken); + + startTransaction.apply(); + finishCallback.onTransitionFinished(null); + return true; + } + + private boolean startExpandAnimation(@NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + startTransaction.apply(); + finishCallback.onTransitionFinished(null); + onExitPip(); + return true; + } + + @Nullable + private TransitionInfo.Change getPipChange(TransitionInfo info) { + for (TransitionInfo.Change change : info.getChanges()) { + if (change.getTaskInfo() != null + && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED) { + return change; + } + } + return null; + } + private WindowContainerTransaction getEnterPipTransaction(@NonNull IBinder transition, @NonNull TransitionRequestInfo request) { // cache the original task token to check for multi-activity case later @@ -153,48 +297,24 @@ public class PipTransition extends PipTransitionController { && pipTask.pictureInPictureParams.isAutoEnterEnabled(); } - @Override - public boolean startAnimation(@NonNull IBinder transition, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - if (transition == mAutoEnterButtonNavTransition) { - mAutoEnterButtonNavTransition = null; - TransitionInfo.Change pipChange = getPipChange(info); - if (pipChange == null) { - return false; - } - mPipTaskToken = pipChange.getContainer(); - - // cache the PiP task token and leash - mPipScheduler.setPipTaskToken(mPipTaskToken); - mPipScheduler.setPinnedTaskLeash(pipChange.getLeash()); - - startTransaction.apply(); - finishCallback.onTransitionFinished(null); - return true; - } else if (transition == mExitViaExpandTransition) { - mExitViaExpandTransition = null; - startTransaction.apply(); - finishCallback.onTransitionFinished(null); - onExitPip(); - return true; - } - return false; + private boolean isEnterPictureInPictureModeRequest(@NonNull TransitionRequestInfo requestInfo) { + return requestInfo.getType() == TRANSIT_PIP; } - @Nullable - private TransitionInfo.Change getPipChange(TransitionInfo info) { - for (TransitionInfo.Change change : info.getChanges()) { - if (change.getTaskInfo() != null - && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED) { - return change; - } - } - return null; + private boolean isLegacyEnter(@NonNull TransitionInfo info) { + TransitionInfo.Change pipChange = getPipChange(info); + // If the only change in the changes list is a TO_FRONT mode PiP task, + // then this is legacy-enter PiP. + return pipChange != null && pipChange.getMode() == TRANSIT_TO_FRONT + && info.getChanges().size() == 1; } + /** + * TODO: b/275910498 Use a new implementation of the PiP animator here. + */ + private void startResizeAnimation(SurfaceControl leash, Rect startBounds, + Rect endBounds, int duration) {} + private void onExitPip() { mPipTaskToken = null; mPipScheduler.onExitPip(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index d023cea6d19d..97d3457aaa38 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -58,10 +58,10 @@ import com.android.internal.os.IResultReceiver; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.HomeTransitionObserver; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.function.Consumer; @@ -1020,7 +1020,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, "RecentsController.finishInner: no valid PiP leash;" + "mPipTransaction=%s, mPipTask=%s, mPipTaskId=%d", - mPipTransaction.toString(), mPipTask.toString(), mPipTaskId); + mPipTransaction, mPipTask, mPipTaskId); } else { t.show(pipLeash); PictureInPictureSurfaceTransaction.apply(mPipTransaction, pipLeash, t); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl index 253acc49071a..0ca244c4b96a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl @@ -158,5 +158,10 @@ interface ISplitScreen { * does not expect split to currently be running. */ RemoteAnimationTarget[] onStartingSplitLegacy(in RemoteAnimationTarget[] appTargets) = 14; + + /** + * Reverse the split. + */ + oneway void switchSplitPosition() = 22; } -// Last id = 21
\ No newline at end of file +// Last id = 22
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index 7b5709769369..1b124c2168df 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -23,12 +23,15 @@ import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.RemoteAnimationTarget.MODE_OPENING; +import static android.view.WindowManager.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI; import static com.android.wm.shell.common.ExecutorUtils.executeRemoteCallWithTaskPermission; import static com.android.wm.shell.common.split.SplitScreenConstants.KEY_EXTRA_WIDGET_INTENT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; +import static com.android.wm.shell.common.split.SplitScreenUtils.getComponent; +import static com.android.wm.shell.common.split.SplitScreenUtils.getShortcutComponent; import static com.android.wm.shell.common.split.SplitScreenUtils.isValidToSplit; import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPosition; import static com.android.wm.shell.common.split.SplitScreenUtils.samePackage; @@ -47,6 +50,8 @@ import android.app.TaskInfo; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.LauncherApps; +import android.content.pm.PackageManager; import android.content.pm.ShortcutInfo; import android.graphics.Rect; import android.os.Bundle; @@ -171,13 +176,15 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, private final ShellTaskOrganizer mTaskOrganizer; private final SyncTransactionQueue mSyncQueue; private final Context mContext; + private final PackageManager mPackageManager; + private final LauncherApps mLauncherApps; private final RootTaskDisplayAreaOrganizer mRootTDAOrganizer; private final ShellExecutor mMainExecutor; private final SplitScreenImpl mImpl = new SplitScreenImpl(); private final DisplayController mDisplayController; private final DisplayImeController mDisplayImeController; private final DisplayInsetsController mDisplayInsetsController; - private final Optional<DragAndDropController> mDragAndDropController; + private final DragAndDropController mDragAndDropController; private final Transitions mTransitions; private final TransactionPool mTransactionPool; private final IconProvider mIconProvider; @@ -186,7 +193,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, private final Optional<WindowDecorViewModel> mWindowDecorViewModel; private final Optional<DesktopTasksController> mDesktopTasksController; private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler; - private final String[] mAppsSupportMultiInstances; + // A static allow list of apps which support multi-instance + private final String[] mAppsSupportingMultiInstance; @VisibleForTesting StageCoordinator mStageCoordinator; @@ -206,7 +214,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, DisplayController displayController, DisplayImeController displayImeController, DisplayInsetsController displayInsetsController, - Optional<DragAndDropController> dragAndDropController, + DragAndDropController dragAndDropController, Transitions transitions, TransactionPool transactionPool, IconProvider iconProvider, @@ -220,6 +228,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mTaskOrganizer = shellTaskOrganizer; mSyncQueue = syncQueue; mContext = context; + mPackageManager = context.getPackageManager(); + mLauncherApps = context.getSystemService(LauncherApps.class); mRootTDAOrganizer = rootTDAOrganizer; mMainExecutor = mainExecutor; mDisplayController = displayController; @@ -242,7 +252,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, // TODO(255224696): Remove the config once having a way for client apps to opt-in // multi-instances split. - mAppsSupportMultiInstances = mContext.getResources() + mAppsSupportingMultiInstance = mContext.getResources() .getStringArray(R.array.config_appsSupportMultiInstancesSplit); } @@ -266,18 +276,21 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, WindowDecorViewModel windowDecorViewModel, DesktopTasksController desktopTasksController, ShellExecutor mainExecutor, - StageCoordinator stageCoordinator) { + StageCoordinator stageCoordinator, + String[] appsSupportingMultiInstance) { mShellCommandHandler = shellCommandHandler; mShellController = shellController; mTaskOrganizer = shellTaskOrganizer; mSyncQueue = syncQueue; mContext = context; + mPackageManager = context.getPackageManager(); + mLauncherApps = context.getSystemService(LauncherApps.class); mRootTDAOrganizer = rootTDAOrganizer; mMainExecutor = mainExecutor; mDisplayController = displayController; mDisplayImeController = displayImeController; mDisplayInsetsController = displayInsetsController; - mDragAndDropController = Optional.of(dragAndDropController); + mDragAndDropController = dragAndDropController; mTransitions = transitions; mTransactionPool = transactionPool; mIconProvider = iconProvider; @@ -288,8 +301,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mStageCoordinator = stageCoordinator; mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this); shellInit.addInitCallback(this::onInit, this); - mAppsSupportMultiInstances = mContext.getResources() - .getStringArray(R.array.config_appsSupportMultiInstancesSplit); + mAppsSupportingMultiInstance = appsSupportingMultiInstance; } public SplitScreen asSplitScreen() { @@ -316,7 +328,9 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, // TODO: Multi-display mStageCoordinator = createStageCoordinator(); } - mDragAndDropController.ifPresent(controller -> controller.setSplitScreenController(this)); + if (mDragAndDropController != null) { + mDragAndDropController.setSplitScreenController(this); + } mWindowDecorViewModel.ifPresent(viewModel -> viewModel.setSplitScreenController(this)); mDesktopTasksController.ifPresent(controller -> controller.setSplitScreenController(this)); } @@ -440,6 +454,17 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, } /** + * Performs previous child eviction and such to prepare for the pip task expending into one of + * the split stages + * + * @param taskInfo TaskInfo of the pip task + */ + public void onPipExpandToSplit(WindowContainerTransaction wct, + ActivityManager.RunningTaskInfo taskInfo) { + mStageCoordinator.onPipExpandToSplit(wct, taskInfo); + } + + /** * Doing necessary window transaction for other transition handler need to exit split in * transition. */ @@ -588,7 +613,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, if (samePackage(packageName, getPackageName(reverseSplitPosition(position)), user.getIdentifier(), getUserId(reverseSplitPosition(position)))) { - if (supportMultiInstancesSplit(packageName)) { + if (supportsMultiInstanceSplit(getShortcutComponent(packageName, shortcutId, user, + mLauncherApps))) { activityOptions.setApplyMultipleTaskFlagForShortcut(true); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); } else if (isSplitScreenVisible()) { @@ -609,7 +635,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, activityOptions.toBundle(), user); } - void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, + void startShortcutAndTaskWithLegacyTransition(@NonNull ShortcutInfo shortcutInfo, @Nullable Bundle options1, int taskId, @Nullable Bundle options2, @SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter, InstanceId instanceId) { @@ -621,7 +647,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, final int userId1 = shortcutInfo.getUserId(); final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer); if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(shortcutInfo.getPackage())) { + if (supportsMultiInstanceSplit(shortcutInfo.getActivity())) { activityOptions.setApplyMultipleTaskFlagForShortcut(true); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); } else { @@ -640,7 +666,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, instanceId); } - void startShortcutAndTask(ShortcutInfo shortcutInfo, @Nullable Bundle options1, + void startShortcutAndTask(@NonNull ShortcutInfo shortcutInfo, @Nullable Bundle options1, int taskId, @Nullable Bundle options2, @SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition, @Nullable RemoteTransition remoteTransition, InstanceId instanceId) { @@ -653,7 +679,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, final int userId1 = shortcutInfo.getUserId(); final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer); if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(shortcutInfo.getActivity())) { activityOptions.setApplyMultipleTaskFlagForShortcut(true); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); } else { @@ -692,7 +718,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, final String packageName2 = SplitScreenUtils.getPackageName(taskId, mTaskOrganizer); final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer); if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(getComponent(pendingIntent))) { fillInIntent = new Intent(); fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); @@ -722,7 +748,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer); boolean setSecondIntentMultipleTask = false; if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(getComponent(pendingIntent))) { setSecondIntentMultipleTask = true; ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); } else { @@ -757,7 +783,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent1); final String packageName2 = SplitScreenUtils.getPackageName(pendingIntent2); if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(getComponent(pendingIntent1))) { fillInIntent1 = new Intent(); fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); fillInIntent2 = new Intent(); @@ -794,7 +820,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, ? ActivityOptions.fromBundle(options2) : ActivityOptions.makeBasic(); boolean setSecondIntentMultipleTask = false; if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(getComponent(pendingIntent1))) { fillInIntent1 = new Intent(); fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); setSecondIntentMultipleTask = true; @@ -856,7 +882,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, return; } if (samePackage(packageName1, packageName2, userId1, userId2)) { - if (supportMultiInstancesSplit(packageName1)) { + if (supportsMultiInstanceSplit(getComponent(intent))) { // Flag with MULTIPLE_TASK if this is launching the same activity into both sides of // the split and there is no reusable background task. fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); @@ -915,16 +941,63 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, return taskInfo != null ? taskInfo.userId : -1; } + /** + * Returns whether a specific component desires to be launched in multiple instances for + * split screen. + */ @VisibleForTesting - boolean supportMultiInstancesSplit(String packageName) { - if (packageName != null) { - for (int i = 0; i < mAppsSupportMultiInstances.length; i++) { - if (mAppsSupportMultiInstances[i].equals(packageName)) { - return true; - } + boolean supportsMultiInstanceSplit(@Nullable ComponentName componentName) { + if (componentName == null || componentName.getPackageName() == null) { + // TODO(b/262864589): Handle empty component case + return false; + } + + // Check the pre-defined allow list + final String packageName = componentName.getPackageName(); + for (int i = 0; i < mAppsSupportingMultiInstance.length; i++) { + if (mAppsSupportingMultiInstance[i].equals(packageName)) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, + "application=%s in allowlist supports multi-instance", packageName); + return true; } } + // Check the activity property first + try { + final PackageManager.Property activityProp = mPackageManager.getProperty( + PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, componentName); + // If the above call doesn't throw a NameNotFoundException, then the activity property + // should override the application property value + if (activityProp.isBoolean()) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, + "activity=%s supports multi-instance", componentName); + return activityProp.getBoolean(); + } else { + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, + "Warning: property=%s for activity=%s has non-bool type=%d", + PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, packageName, + activityProp.getType()); + } + } catch (PackageManager.NameNotFoundException nnfe) { + // Not specified in the activity, fall through + } + + // Check the application property otherwise + try { + final PackageManager.Property appProp = mPackageManager.getProperty( + PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, packageName); + if (appProp.isBoolean()) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, + "application=%s supports multi-instance", packageName); + return appProp.getBoolean(); + } else { + ProtoLog.w(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, + "Warning: property=%s for application=%s has non-bool type=%d", + PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI, packageName, appProp.getType()); + } + } catch (PackageManager.NameNotFoundException nnfe) { + // Not specified in either application or activity + } return false; } @@ -1038,6 +1111,12 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, mStageCoordinator.onDroppedToSplit(position, dragSessionId); } + void switchSplitPosition(String reason) { + if (isSplitScreenVisible()) { + mStageCoordinator.switchSplitPosition(reason); + } + } + /** * Return the {@param exitReason} as a string. */ @@ -1402,5 +1481,11 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, true /* blocking */); return out[0]; } + + @Override + public void switchSplitPosition() { + executeRemoteCallWithTaskPermission(mController, "switchSplitPosition", + (controller) -> controller.switchSplitPosition("remoteCall")); + } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java index 7fd03a9a306b..7f16c5e3592e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java @@ -43,6 +43,8 @@ public class SplitScreenShellCommandHandler implements return runRemoveFromSideStage(args, pw); case "setSideStagePosition": return runSetSideStagePosition(args, pw); + case "switchSplitPosition": + return runSwitchSplitPosition(); default: pw.println("Invalid command: " + args[0]); return false; @@ -84,6 +86,11 @@ public class SplitScreenShellCommandHandler implements return true; } + private boolean runSwitchSplitPosition() { + mController.switchSplitPosition("shellCommand"); + return true; + } + @Override public void printShellCommandHelp(PrintWriter pw, String prefix) { pw.println(prefix + "moveToSideStage <taskId> <SideStagePosition>"); @@ -92,5 +99,7 @@ public class SplitScreenShellCommandHandler implements pw.println(prefix + " Remove a task with given id in split-screen mode."); pw.println(prefix + "setSideStagePosition <SideStagePosition>"); pw.println(prefix + " Sets the position of the side-stage."); + pw.println(prefix + "switchSplitPosition"); + pw.println(prefix + " Reverses the split."); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java index 2c0ba92524ad..b60e361caad8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java @@ -48,9 +48,9 @@ import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.common.split.SplitDecorManager; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.transition.OneShotRemoteHandler; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; @@ -388,6 +388,7 @@ class SplitScreenTransitions { IBinder startResizeTransition(WindowContainerTransaction wct, Transitions.TransitionHandler handler, + @Nullable TransitionConsumedCallback consumedCallback, @Nullable TransitionFinishedCallback finishCallback) { if (mPendingResize != null) { mPendingResize.cancel(null); @@ -396,13 +397,14 @@ class SplitScreenTransitions { } IBinder transition = mTransitions.startTransition(TRANSIT_CHANGE, wct, handler); - setResizeTransition(transition, finishCallback); + setResizeTransition(transition, consumedCallback, finishCallback); return transition; } void setResizeTransition(@NonNull IBinder transition, + @Nullable TransitionConsumedCallback consumedCallback, @Nullable TransitionFinishedCallback finishCallback) { - mPendingResize = new TransitSession(transition, null /* consumedCb */, finishCallback); + mPendingResize = new TransitSession(transition, consumedCallback, finishCallback); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " splitTransition " + " deduced Resize split screen"); } @@ -449,6 +451,8 @@ class SplitScreenTransitions { mPendingResize.onConsumed(aborted); mPendingResize = null; } + + // TODO: handle transition consumed for active remote handler } void onFinish(WindowContainerTransaction wct) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 96e57e71f05c..70b2f211d943 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -44,6 +44,8 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT import static com.android.wm.shell.common.split.SplitScreenConstants.splitPositionToString; import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPosition; import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage; +import static com.android.wm.shell.shared.TransitionUtil.isClosingType; +import static com.android.wm.shell.shared.TransitionUtil.isOpeningType; import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_MAIN; import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_SIDE; import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED; @@ -64,8 +66,6 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.exitReasonT import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS; import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE; import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_PAIR_OPEN; -import static com.android.wm.shell.util.TransitionUtil.isClosingType; -import static com.android.wm.shell.util.TransitionUtil.isOpeningType; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -135,13 +135,13 @@ import com.android.wm.shell.common.split.SplitScreenUtils; import com.android.wm.shell.common.split.SplitWindowManager; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.recents.RecentTasksController; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.splitscreen.SplitScreen.StageType; import com.android.wm.shell.splitscreen.SplitScreenController.ExitReason; import com.android.wm.shell.transition.DefaultMixedHandler; import com.android.wm.shell.transition.LegacyTransitions; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.util.SplitBounds; -import com.android.wm.shell.util.TransitionUtil; import com.android.wm.shell.windowdecor.WindowDecorViewModel; import dalvik.annotation.optimization.NeverCompile; @@ -2236,8 +2236,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, sendOnBoundsChanged(); if (ENABLE_SHELL_TRANSITIONS) { mSplitLayout.setDividerInteractive(false, false, "onSplitResizeStart"); - mSplitTransitions.startResizeTransition(wct, this, (finishWct, t) -> - mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish")); + mSplitTransitions.startResizeTransition(wct, this, (aborted) -> { + mSplitLayout.setDividerInteractive(true, false, "onSplitResizeConsumed"); + }, (finishWct, t) -> { + mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish"); + }); } else { // Only need screenshot for legacy case because shell transition should screenshot // itself during transition. @@ -2956,13 +2959,17 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, } public void goToFullscreenFromSplit() { - boolean leftOrTop; - if (mSideStage.isFocused()) { - leftOrTop = (mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT); + // If main stage is focused, toEnd = true if + // mSideStagePosition = SPLIT_POSITION_BOTTOM_OR_RIGHT. Otherwise toEnd = false + // If side stage is focused, toEnd = true if + // mSideStagePosition = SPLIT_POSITION_TOP_OR_LEFT. Otherwise toEnd = false + final boolean toEnd; + if (mMainStage.isFocused()) { + toEnd = (mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT); } else { - leftOrTop = (mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT); + toEnd = (mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT); } - mSplitLayout.flingDividerToDismiss(!leftOrTop, EXIT_REASON_FULLSCREEN_SHORTCUT); + mSplitLayout.flingDividerToDismiss(toEnd, EXIT_REASON_FULLSCREEN_SHORTCUT); } /** Move the specified task to fullscreen, regardless of focus state. */ @@ -2979,6 +2986,25 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, } + /** + * Performs previous child eviction and such to prepare for the pip task expending into one of + * the split stages + * + * @param taskInfo TaskInfo of the pip task + */ + public void onPipExpandToSplit(WindowContainerTransaction wct, + ActivityManager.RunningTaskInfo taskInfo) { + prepareEnterSplitScreen(wct, taskInfo, getActivateSplitPosition(taskInfo), + false /*resizeAnim*/); + + if (!isSplitScreenVisible() || mSplitRequest == null) { + return; + } + + boolean replacingMainStage = getMainStagePosition() == mSplitRequest.mActivatePosition; + (replacingMainStage ? mMainStage : mSideStage).evictOtherChildren(wct, taskInfo.taskId); + } + boolean isLaunchToSplit(TaskInfo taskInfo) { return getActivateSplitPosition(taskInfo) != SPLIT_POSITION_UNDEFINED; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java index c10142588bde..aec4d1176dc0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java @@ -74,7 +74,6 @@ public class TvSplitScreenController extends SplitScreenController { DisplayController displayController, DisplayImeController displayImeController, DisplayInsetsController displayInsetsController, - Optional<DragAndDropController> dragAndDropController, Transitions transitions, TransactionPool transactionPool, IconProvider iconProvider, @@ -85,7 +84,7 @@ public class TvSplitScreenController extends SplitScreenController { SystemWindows systemWindows) { super(context, shellInit, shellCommandHandler, shellController, shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController, displayImeController, - displayInsetsController, dragAndDropController, transitions, transactionPool, + displayInsetsController, null, transitions, transactionPool, iconProvider, recentTasks, launchAdjacentController, Optional.empty(), Optional.empty(), mainExecutor); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java index e86b62dee86d..6325c686a682 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java @@ -390,7 +390,7 @@ public class SplashScreenExitAnimationUtils { SurfaceControl firstWindowSurface, ViewGroup splashScreenView, TransactionPool transactionPool, Rect firstWindowFrame, int mainWindowShiftLength, float roundedCornerRadius) { - mFromYDelta = fromYDelta - roundedCornerRadius; + mFromYDelta = fromYDelta - Math.max(firstWindowFrame.top, roundedCornerRadius); mToYDelta = toYDelta; mOccludeHoleView = occludeHoleView; mApplier = new SyncRtSurfaceTransactionApplier(occludeHoleView); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java index ae21c4bf5450..bfb60c0f4fc8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java @@ -73,6 +73,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.graphics.palette.Palette; import com.android.internal.graphics.palette.Quantizer; import com.android.internal.graphics.palette.VariationalKMeansQuantizer; +import com.android.internal.policy.PhoneWindow; import com.android.internal.protolog.common.ProtoLog; import com.android.launcher3.icons.BaseIconFactory; import com.android.launcher3.icons.IconProvider; @@ -245,16 +246,19 @@ public class SplashscreenContentDrawer { } else { windowFlags |= WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; } - params.layoutInDisplayCutoutMode = a.getInt( - R.styleable.Window_windowLayoutInDisplayCutoutMode, - WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS); - params.windowAnimations = a.getResourceId(R.styleable.Window_windowAnimationStyle, 0); - a.recycle(); final ActivityManager.RunningTaskInfo taskInfo = windowInfo.taskInfo; final ActivityInfo activityInfo = windowInfo.targetActivityInfo != null ? windowInfo.targetActivityInfo : taskInfo.topActivityInfo; + params.layoutInDisplayCutoutMode = a.getInt( + R.styleable.Window_windowLayoutInDisplayCutoutMode, + PhoneWindow.isEdgeToEdgeEnforced(activityInfo.applicationInfo, false /* local */, a) + ? WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + : params.layoutInDisplayCutoutMode); + params.windowAnimations = a.getResourceId(R.styleable.Window_windowAnimationStyle, 0); + a.recycle(); + final int displayId = taskInfo.displayId; // Assumes it's safe to show starting windows of launched apps while // the keyguard is being hidden. This is okay because starting windows never show @@ -277,11 +281,6 @@ public class SplashscreenContentDrawer { params.token = appToken; params.packageName = activityInfo.packageName; params.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; - - if (!context.getResources().getCompatibilityInfo().supportsScreen()) { - params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW; - } - params.setTitle("Splash Screen " + title); return params; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java index e6418f35a0b1..1a0c011205fb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java @@ -135,7 +135,6 @@ public class TaskSnapshotWindow { } catch (RemoteException e) { snapshotSurface.clearWindowSynced(); } - window.setOuter(snapshotSurface); try { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "TaskSnapshot#relayout"); session.relayout(window, layoutParams, -1, -1, View.VISIBLE, 0, 0, 0, @@ -161,7 +160,7 @@ public class TaskSnapshotWindow { ShellExecutor splashScreenExecutor) { mSplashScreenExecutor = splashScreenExecutor; mSession = WindowManagerGlobal.getWindowSession(); - mWindow = new Window(); + mWindow = new Window(this); mWindow.setSession(mSession); int backgroundColor = taskDescription.getBackgroundColor(); mBackgroundPaint.setColor(backgroundColor != 0 ? backgroundColor : WHITE); @@ -204,9 +203,9 @@ public class TaskSnapshotWindow { } static class Window extends BaseIWindow { - private WeakReference<TaskSnapshotWindow> mOuter; + private final WeakReference<TaskSnapshotWindow> mOuter; - public void setOuter(TaskSnapshotWindow outer) { + Window(TaskSnapshotWindow outer) { mOuter = new WeakReference<>(outer); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java index 0eb7c2d98e0a..a7843e218a8a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java @@ -293,11 +293,7 @@ public class ShellController { private class ShellInterfaceImpl implements ShellInterface { @Override public void onInit() { - try { - mMainExecutor.executeBlocking(() -> ShellController.this.handleInit()); - } catch (InterruptedException e) { - throw new RuntimeException("Failed to initialize the Shell in 2s", e); - } + mMainExecutor.execute(ShellController.this::handleInit); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index 93d763608b5f..196e04edbb10 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -480,7 +480,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { WindowContainerTransaction wct = new WindowContainerTransaction(); if (mCaptionInsets != null) { wct.addInsetsSource(mTaskToken, mCaptionInsetsOwner, 0, - WindowInsets.Type.captionBar(), mCaptionInsets); + WindowInsets.Type.captionBar(), mCaptionInsets, null /* boundingRects */); } else { wct.removeInsetsSource(mTaskToken, mCaptionInsetsOwner, 0, WindowInsets.Type.captionBar()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java index 34c015f05c68..198ec82b5f21 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java @@ -37,8 +37,8 @@ import android.window.WindowContainerTransaction; import androidx.annotation.VisibleForTesting; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.Objects; @@ -330,7 +330,7 @@ public class TaskViewTransitions implements Transitions.TransitionHandler { continue; } if (isHide) { - if (pending.mType == TRANSIT_TO_BACK) { + if (pending != null && pending.mType == TRANSIT_TO_BACK) { // TO_BACK is only used when setting the task view visibility immediately, // so in that case we can also hide the surface immediately startTransaction.hide(chg.getLeash()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/CounterRotatorHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/CounterRotatorHelper.java index 628ce27fe514..b03daaafd70c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/CounterRotatorHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/CounterRotatorHelper.java @@ -27,8 +27,8 @@ import android.window.WindowContainerToken; import androidx.annotation.NonNull; -import com.android.wm.shell.util.CounterRotator; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.CounterRotator; +import com.android.wm.shell.shared.TransitionUtil; import java.util.List; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java index 9f20f49b4094..8746b8c8d55c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java @@ -22,17 +22,9 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_PIP; -import static android.view.WindowManager.TRANSIT_TO_BACK; -import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_UNOCCLUDING; import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; -import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; -import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR; -import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; -import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA; -import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED; -import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_CHILD_TASK_ENTER_PIP; -import static com.android.wm.shell.util.TransitionUtil.isOpeningType; +import static com.android.wm.shell.shared.TransitionUtil.isOpeningType; import android.annotation.NonNull; import android.annotation.Nullable; @@ -56,12 +48,11 @@ import com.android.wm.shell.keyguard.KeyguardTransitionHandler; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.recents.RecentsTransitionHandler; -import com.android.wm.shell.splitscreen.SplitScreen; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.splitscreen.StageCoordinator; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.unfold.UnfoldTransitionHandler; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.Map; @@ -84,7 +75,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, private UnfoldTransitionHandler mUnfoldHandler; private ActivityEmbeddingController mActivityEmbeddingController; - private class MixedTransition { + abstract static class MixedTransition { static final int TYPE_ENTER_PIP_FROM_SPLIT = 1; /** Both the display and split-state (enter/exit) is changing */ @@ -124,6 +115,12 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, int mAnimType = ANIM_TYPE_DEFAULT; final IBinder mTransition; + protected final Transitions mPlayer; + protected final DefaultMixedHandler mMixedHandler; + protected final PipTransitionController mPipHandler; + protected final StageCoordinator mSplitHandler; + protected final KeyguardTransitionHandler mKeyguardHandler; + Transitions.TransitionHandler mLeftoversHandler = null; TransitionInfo mInfo = null; WindowContainerTransaction mFinishWCT = null; @@ -144,12 +141,35 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, */ int mInFlightSubAnimations = 0; - MixedTransition(int type, IBinder transition) { + MixedTransition(int type, IBinder transition, Transitions player, + DefaultMixedHandler mixedHandler, PipTransitionController pipHandler, + StageCoordinator splitHandler, KeyguardTransitionHandler keyguardHandler) { mType = type; mTransition = transition; - } - - boolean startSubAnimation(Transitions.TransitionHandler handler, TransitionInfo info, + mPlayer = player; + mMixedHandler = mixedHandler; + mPipHandler = pipHandler; + mSplitHandler = splitHandler; + mKeyguardHandler = keyguardHandler; + } + + abstract boolean startAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback); + + abstract void mergeAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, + @NonNull Transitions.TransitionFinishCallback finishCallback); + + abstract void onTransitionConsumed( + @NonNull IBinder transition, boolean aborted, + @Nullable SurfaceControl.Transaction finishT); + + protected boolean startSubAnimation( + Transitions.TransitionHandler handler, TransitionInfo info, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT) { if (mInfo != null) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, @@ -164,7 +184,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, return true; } - void onSubAnimationFinished(TransitionInfo info, WindowContainerTransaction wct) { + private void onSubAnimationFinished(TransitionInfo info, WindowContainerTransaction wct) { mInFlightSubAnimations--; if (mInfo != null) { ProtoLog.d(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, @@ -175,7 +195,6 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, joinFinishArgs(wct); if (mInFlightSubAnimations == 0) { - mActiveTransitions.remove(MixedTransition.this); mFinishCB.onTransitionFinished(mFinishWCT); } } @@ -236,8 +255,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, throw new IllegalStateException("Unexpected remote transition in" + "pip-enter-from-split request"); } - mActiveTransitions.add(new MixedTransition(MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT, - transition)); + mActiveTransitions.add(createDefaultMixedTransition( + MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT, transition)); WindowContainerTransaction out = new WindowContainerTransaction(); mPipHandler.augmentRequest(transition, request, out); @@ -248,7 +267,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, mActivityEmbeddingController != null)) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a PiP-enter request from an Activity Embedding split"); - mActiveTransitions.add(new MixedTransition( + mActiveTransitions.add(createDefaultMixedTransition( MixedTransition.TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING, transition)); // Postpone transition splitting to later. WindowContainerTransaction out = new WindowContainerTransaction(); @@ -267,7 +286,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, if (handler == null) { return null; } - final MixedTransition mixed = new MixedTransition( + final MixedTransition mixed = createDefaultMixedTransition( MixedTransition.TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE, transition); mixed.mLeftoversHandler = handler.first; mActiveTransitions.add(mixed); @@ -293,7 +312,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, mPlayer.getRemoteTransitionHandler(), new WindowContainerTransaction()); } - final MixedTransition mixed = new MixedTransition( + final MixedTransition mixed = createRecentsMixedTransition( MixedTransition.TYPE_RECENTS_DURING_SPLIT, transition); mixed.mLeftoversHandler = handler.first; mActiveTransitions.add(mixed); @@ -302,16 +321,20 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, final WindowContainerTransaction wct = mUnfoldHandler.handleRequest(transition, request); if (wct != null) { - final MixedTransition mixed = new MixedTransition( - MixedTransition.TYPE_UNFOLD, transition); - mixed.mLeftoversHandler = mUnfoldHandler; - mActiveTransitions.add(mixed); + mActiveTransitions.add(createDefaultMixedTransition( + MixedTransition.TYPE_UNFOLD, transition)); } return wct; } return null; } + private DefaultMixedTransition createDefaultMixedTransition(int type, IBinder transition) { + return new DefaultMixedTransition( + type, transition, mPlayer, this, mPipHandler, mSplitHandler, mKeyguardHandler, + mUnfoldHandler, mActivityEmbeddingController); + } + @Override public Consumer<IBinder> handleRecentsRequest(WindowContainerTransaction outWCT) { if (mRecentsHandler != null) { @@ -331,31 +354,30 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, private void setRecentsTransitionDuringSplit(IBinder transition) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a recents request while " + "Split-Screen is foreground, so treat it as Mixed."); - final MixedTransition mixed = new MixedTransition( - MixedTransition.TYPE_RECENTS_DURING_SPLIT, transition); - mixed.mLeftoversHandler = mRecentsHandler; - mActiveTransitions.add(mixed); + mActiveTransitions.add(createRecentsMixedTransition( + MixedTransition.TYPE_RECENTS_DURING_SPLIT, transition)); } private void setRecentsTransitionDuringKeyguard(IBinder transition) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a recents request while " + "keyguard is visible, so treat it as Mixed."); - final MixedTransition mixed = new MixedTransition( - MixedTransition.TYPE_RECENTS_DURING_KEYGUARD, transition); - mixed.mLeftoversHandler = mRecentsHandler; - mActiveTransitions.add(mixed); + mActiveTransitions.add(createRecentsMixedTransition( + MixedTransition.TYPE_RECENTS_DURING_KEYGUARD, transition)); } private void setRecentsTransitionDuringDesktop(IBinder transition) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a recents request while " + "desktop mode is active, so treat it as Mixed."); - final MixedTransition mixed = new MixedTransition( - MixedTransition.TYPE_RECENTS_DURING_DESKTOP, transition); - mixed.mLeftoversHandler = mRecentsHandler; - mActiveTransitions.add(mixed); + mActiveTransitions.add(createRecentsMixedTransition( + MixedTransition.TYPE_RECENTS_DURING_DESKTOP, transition)); } - private TransitionInfo subCopy(@NonNull TransitionInfo info, + private MixedTransition createRecentsMixedTransition(int type, IBinder transition) { + return new RecentsMixedTransition(type, transition, mPlayer, this, mPipHandler, + mSplitHandler, mKeyguardHandler, mRecentsHandler, mDesktopTasksController); + } + + static TransitionInfo subCopy(@NonNull TransitionInfo info, @WindowManager.TransitionType int newType, boolean withChanges) { final TransitionInfo out = new TransitionInfo(newType, withChanges ? info.getFlags() : 0); out.setTrack(info.getTrack()); @@ -372,15 +394,6 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, return out; } - private boolean isHomeOpening(@NonNull TransitionInfo.Change change) { - return change.getTaskInfo() != null - && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME; - } - - private boolean isWallpaper(@NonNull TransitionInfo.Change change) { - return (change.getFlags() & FLAG_IS_WALLPAPER) != 0; - } - @Override public boolean startAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @@ -399,10 +412,15 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, if (KeyguardTransitionHandler.handles(info)) { if (mixed != null && mixed.mType != MixedTransition.TYPE_KEYGUARD) { final MixedTransition keyguardMixed = - new MixedTransition(MixedTransition.TYPE_KEYGUARD, transition); + createDefaultMixedTransition(MixedTransition.TYPE_KEYGUARD, transition); mActiveTransitions.add(keyguardMixed); - final boolean hasAnimateKeyguard = animateKeyguard(keyguardMixed, info, - startTransaction, finishTransaction, finishCallback); + Transitions.TransitionFinishCallback callback = wct -> { + mActiveTransitions.remove(keyguardMixed); + finishCallback.onTransitionFinished(wct); + }; + final boolean hasAnimateKeyguard = animateKeyguard( + keyguardMixed, info, startTransaction, finishTransaction, callback, + mKeyguardHandler, mPipHandler); if (hasAnimateKeyguard) { ProtoLog.w(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Converting mixed transition into a keyguard transition"); @@ -420,277 +438,18 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, if (mixed == null) return false; - if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT) { - return animateEnterPipFromSplit(mixed, info, startTransaction, finishTransaction, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING) { - return animateEnterPipFromActivityEmbedding(mixed, info, startTransaction, - finishTransaction, finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_DISPLAY_AND_SPLIT_CHANGE) { - return false; - } else if (mixed.mType == MixedTransition.TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE) { - final boolean handledToPip = animateOpenIntentWithRemoteAndPip(mixed, info, - startTransaction, finishTransaction, finishCallback); - // Consume the transition on remote handler if the leftover handler already handle this - // transition. And if it cannot, the transition will be handled by remote handler, so - // don't consume here. - // Need to check leftOverHandler as it may change in #animateOpenIntentWithRemoteAndPip - if (handledToPip && mixed.mHasRequestToRemote - && mixed.mLeftoversHandler != mPlayer.getRemoteTransitionHandler()) { - mPlayer.getRemoteTransitionHandler().onTransitionConsumed(transition, false, null); - } - return handledToPip; - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_SPLIT) { - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - final TransitionInfo.Change change = info.getChanges().get(i); - // Pip auto-entering info might be appended to recent transition like pressing - // home-key in 3-button navigation. This offers split handler the opportunity to - // handle split to pip animation. - if (mPipHandler.isEnteringPip(change, info.getType()) - && mSplitHandler.getSplitItemPosition(change.getLastParent()) - != SPLIT_POSITION_UNDEFINED) { - return animateEnterPipFromSplit(mixed, info, startTransaction, - finishTransaction, finishCallback); - } - } - - return animateRecentsDuringSplit(mixed, info, startTransaction, finishTransaction, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { - return animateKeyguard(mixed, info, startTransaction, finishTransaction, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_KEYGUARD) { - return animateRecentsDuringKeyguard(mixed, info, startTransaction, finishTransaction, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { - return animateRecentsDuringDesktop(mixed, info, startTransaction, finishTransaction, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_UNFOLD) { - return animateUnfold(mixed, info, startTransaction, finishTransaction, finishCallback); - } else { - mActiveTransitions.remove(mixed); - throw new IllegalStateException("Starting mixed animation without a known mixed type? " - + mixed.mType); - } - } - - private boolean animateEnterPipFromActivityEmbedding(@NonNull MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animating a mixed transition for " - + "entering PIP from an Activity Embedding window"); - // Split into two transitions (wct) - TransitionInfo.Change pipChange = null; - final TransitionInfo everythingElse = subCopy(info, TRANSIT_TO_BACK, true /* changes */); - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - TransitionInfo.Change change = info.getChanges().get(i); - if (mPipHandler.isEnteringPip(change, info.getType())) { - if (pipChange != null) { - throw new IllegalStateException("More than 1 pip-entering changes in one" - + " transition? " + info); - } - pipChange = change; - // going backwards, so remove-by-index is fine. - everythingElse.getChanges().remove(i); - } - } - - final Transitions.TransitionFinishCallback finishCB = (wct) -> { - --mixed.mInFlightSubAnimations; - mixed.joinFinishArgs(wct); - if (mixed.mInFlightSubAnimations > 0) return; - mActiveTransitions.remove(mixed); - finishCallback.onTransitionFinished(mixed.mFinishWCT); - }; - - if (!mActivityEmbeddingController.shouldAnimate(everythingElse)) { - // Fallback to dispatching to other handlers. - return false; - } - - // PIP window should always be on the highest Z order. - if (pipChange != null) { - mixed.mInFlightSubAnimations = 2; - mPipHandler.startEnterAnimation( - pipChange, startTransaction.setLayer(pipChange.getLeash(), Integer.MAX_VALUE), - finishTransaction, - finishCB); - } else { - mixed.mInFlightSubAnimations = 1; - } - - mActivityEmbeddingController.startAnimation(mixed.mTransition, everythingElse, - startTransaction, finishTransaction, finishCB); - return true; - } - - private boolean animateOpenIntentWithRemoteAndPip(@NonNull MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - TransitionInfo.Change pipChange = null; - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - TransitionInfo.Change change = info.getChanges().get(i); - if (mPipHandler.isEnteringPip(change, info.getType())) { - if (pipChange != null) { - throw new IllegalStateException("More than 1 pip-entering changes in one" - + " transition? " + info); - } - pipChange = change; - info.getChanges().remove(i); - } - } - Transitions.TransitionFinishCallback finishCB = (wct) -> { - --mixed.mInFlightSubAnimations; - mixed.joinFinishArgs(wct); - if (mixed.mInFlightSubAnimations > 0) return; - mActiveTransitions.remove(mixed); - finishCallback.onTransitionFinished(mixed.mFinishWCT); - }; - if (pipChange == null) { - if (mixed.mLeftoversHandler != null) { - mixed.mInFlightSubAnimations = 1; - if (mixed.mLeftoversHandler.startAnimation(mixed.mTransition, - info, startTransaction, finishTransaction, finishCB)) { - return true; - } - } - mActiveTransitions.remove(mixed); - return false; - } - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Splitting PIP into a separate" - + " animation because remote-animation likely doesn't support it"); - // Split the transition into 2 parts: the pip part and the rest. - mixed.mInFlightSubAnimations = 2; - // make a new startTransaction because pip's startEnterAnimation "consumes" it so - // we need a separate one to send over to launcher. - SurfaceControl.Transaction otherStartT = new SurfaceControl.Transaction(); - - mPipHandler.startEnterAnimation(pipChange, otherStartT, finishTransaction, finishCB); - - // Dispatch the rest of the transition normally. - if (mixed.mLeftoversHandler != null - && mixed.mLeftoversHandler.startAnimation(mixed.mTransition, info, - startTransaction, finishTransaction, finishCB)) { - return true; - } - mixed.mLeftoversHandler = mPlayer.dispatchTransition(mixed.mTransition, info, - startTransaction, finishTransaction, finishCB, this); - return true; - } - - private boolean animateEnterPipFromSplit(@NonNull final MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animating a mixed transition for " - + "entering PIP while Split-Screen is foreground."); - TransitionInfo.Change pipChange = null; - TransitionInfo.Change wallpaper = null; - final TransitionInfo everythingElse = subCopy(info, TRANSIT_TO_BACK, true /* changes */); - boolean homeIsOpening = false; - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - TransitionInfo.Change change = info.getChanges().get(i); - if (mPipHandler.isEnteringPip(change, info.getType())) { - if (pipChange != null) { - throw new IllegalStateException("More than 1 pip-entering changes in one" - + " transition? " + info); - } - pipChange = change; - // going backwards, so remove-by-index is fine. - everythingElse.getChanges().remove(i); - } else if (isHomeOpening(change)) { - homeIsOpening = true; - } else if (isWallpaper(change)) { - wallpaper = change; - } - } - if (pipChange == null) { - // um, something probably went wrong. - mActiveTransitions.remove(mixed); - return false; - } - final boolean isGoingHome = homeIsOpening; - Transitions.TransitionFinishCallback finishCB = (wct) -> { - --mixed.mInFlightSubAnimations; - mixed.joinFinishArgs(wct); - if (mixed.mInFlightSubAnimations > 0) return; - mActiveTransitions.remove(mixed); - if (isGoingHome) { - mSplitHandler.onTransitionAnimationComplete(); - } - finishCallback.onTransitionFinished(mixed.mFinishWCT); + final MixedTransition chosenTransition = mixed; + Transitions.TransitionFinishCallback callback = wct -> { + mActiveTransitions.remove(chosenTransition); + finishCallback.onTransitionFinished(wct); }; - if (isGoingHome || mSplitHandler.getSplitItemPosition(pipChange.getLastParent()) - != SPLIT_POSITION_UNDEFINED) { - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animation is actually mixed " - + "since entering-PiP caused us to leave split and return home."); - // We need to split the transition into 2 parts: the pip part (animated by pip) - // and the dismiss-part (animated by launcher). - mixed.mInFlightSubAnimations = 2; - // immediately make the wallpaper visible (so that we don't see it pop-in during - // the time it takes to start recents animation (which is remote). - if (wallpaper != null) { - startTransaction.show(wallpaper.getLeash()).setAlpha(wallpaper.getLeash(), 1.f); - } - // make a new startTransaction because pip's startEnterAnimation "consumes" it so - // we need a separate one to send over to launcher. - SurfaceControl.Transaction otherStartT = new SurfaceControl.Transaction(); - @SplitScreen.StageType int topStageToKeep = STAGE_TYPE_UNDEFINED; - if (mSplitHandler.isSplitScreenVisible()) { - // The non-going home case, we could be pip-ing one of the split stages and keep - // showing the other - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - TransitionInfo.Change change = info.getChanges().get(i); - if (change == pipChange) { - // Ignore the change/task that's going into Pip - continue; - } - @SplitScreen.StageType int splitItemStage = - mSplitHandler.getSplitItemStage(change.getLastParent()); - if (splitItemStage != STAGE_TYPE_UNDEFINED) { - topStageToKeep = splitItemStage; - break; - } - } - } - // Let split update internal state for dismiss. - mSplitHandler.prepareDismissAnimation(topStageToKeep, - EXIT_REASON_CHILD_TASK_ENTER_PIP, everythingElse, otherStartT, - finishTransaction); - - // We are trying to accommodate launcher's close animation which can't handle the - // divider-bar, so if split-handler is closing the divider-bar, just hide it and remove - // from transition info. - for (int i = everythingElse.getChanges().size() - 1; i >= 0; --i) { - if ((everythingElse.getChanges().get(i).getFlags() & FLAG_IS_DIVIDER_BAR) != 0) { - everythingElse.getChanges().remove(i); - break; - } - } - mPipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA); - mPipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction, - finishCB); - // Dispatch the rest of the transition normally. This will most-likely be taken by - // recents or default handler. - mixed.mLeftoversHandler = mPlayer.dispatchTransition(mixed.mTransition, everythingElse, - otherStartT, finishTransaction, finishCB, this); - } else { - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Not leaving split, so just " - + "forward animation to Pip-Handler."); - // This happens if the pip-ing activity is in a multi-activity task (and thus a - // new pip task is spawned). In this case, we don't actually exit split so we can - // just let pip transition handle the animation verbatim. - mixed.mInFlightSubAnimations = 1; - mPipHandler.startAnimation(mixed.mTransition, info, startTransaction, finishTransaction, - finishCB); + boolean handled = chosenTransition.startAnimation( + transition, info, startTransaction, finishTransaction, callback); + if (!handled) { + mActiveTransitions.remove(chosenTransition); } - return true; + return handled; } private void unlinkMissingParents(TransitionInfo from) { @@ -724,10 +483,14 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, public boolean animatePendingEnterPipFromSplit(IBinder transition, TransitionInfo info, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, Transitions.TransitionFinishCallback finishCallback) { - final MixedTransition mixed = new MixedTransition( + final MixedTransition mixed = createDefaultMixedTransition( MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT, transition); mActiveTransitions.add(mixed); - return animateEnterPipFromSplit(mixed, info, startT, finishT, finishCallback); + Transitions.TransitionFinishCallback callback = wct -> { + mActiveTransitions.remove(mixed); + finishCallback.onTransitionFinished(wct); + }; + return mixed.startAnimation(transition, info, startT, finishT, callback); } /** @@ -750,7 +513,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, } if (displayPart.getChanges().isEmpty()) return false; unlinkMissingParents(everythingElse); - final MixedTransition mixed = new MixedTransition( + final MixedTransition mixed = createDefaultMixedTransition( MixedTransition.TYPE_DISPLAY_AND_SPLIT_CHANGE, transition); mActiveTransitions.add(mixed); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animation is a mix of display change " @@ -779,116 +542,22 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, return true; } - private boolean animateRecentsDuringSplit(@NonNull final MixedTransition mixed, + private static boolean animateKeyguard(@NonNull final MixedTransition mixed, @NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - // Split-screen is only interested in the recents transition finishing (and merging), so - // just wrap finish and start recents animation directly. - Transitions.TransitionFinishCallback finishCB = (wct) -> { - mixed.mInFlightSubAnimations = 0; - mActiveTransitions.remove(mixed); - // If pair-to-pair switching, the post-recents clean-up isn't needed. - wct = wct != null ? wct : new WindowContainerTransaction(); - if (mixed.mAnimType != MixedTransition.ANIM_TYPE_PAIR_TO_PAIR) { - mSplitHandler.onRecentsInSplitAnimationFinish(wct, finishTransaction); - } else { - // notify pair-to-pair recents animation finish - mSplitHandler.onRecentsPairToPairAnimationFinish(wct); - } - mSplitHandler.onTransitionAnimationComplete(); - finishCallback.onTransitionFinished(wct); - }; - mixed.mInFlightSubAnimations = 1; - mSplitHandler.onRecentsInSplitAnimationStart(info); - final boolean handled = mixed.mLeftoversHandler.startAnimation(mixed.mTransition, info, - startTransaction, finishTransaction, finishCB); - if (!handled) { - mSplitHandler.onRecentsInSplitAnimationCanceled(); - mActiveTransitions.remove(mixed); - } - return handled; - } - - private boolean animateKeyguard(@NonNull final MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { + @NonNull Transitions.TransitionFinishCallback finishCallback, + @NonNull KeyguardTransitionHandler keyguardHandler, + PipTransitionController pipHandler) { if (mixed.mFinishT == null) { mixed.mFinishT = finishTransaction; mixed.mFinishCB = finishCallback; } // Sync pip state. - if (mPipHandler != null) { - mPipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction); + if (pipHandler != null) { + pipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction); } - return mixed.startSubAnimation(mKeyguardHandler, info, startTransaction, finishTransaction); - } - - private boolean animateRecentsDuringKeyguard(@NonNull final MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - if (mixed.mInfo == null) { - mixed.mInfo = info; - mixed.mFinishT = finishTransaction; - mixed.mFinishCB = finishCallback; - } - return mixed.startSubAnimation(mRecentsHandler, info, startTransaction, finishTransaction); - } - - private boolean animateRecentsDuringDesktop(@NonNull final MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - Transitions.TransitionFinishCallback finishCB = wct -> { - mixed.mInFlightSubAnimations--; - if (mixed.mInFlightSubAnimations == 0) { - mActiveTransitions.remove(mixed); - finishCallback.onTransitionFinished(wct); - } - }; - - mixed.mInFlightSubAnimations++; - boolean consumed = mRecentsHandler.startAnimation( - mixed.mTransition, info, startTransaction, finishTransaction, finishCB); - if (!consumed) { - mixed.mInFlightSubAnimations--; - return false; - } - if (mDesktopTasksController != null) { - mDesktopTasksController.syncSurfaceState(info, finishTransaction); - return true; - } - - return false; - } - - private boolean animateUnfold(@NonNull final MixedTransition mixed, - @NonNull TransitionInfo info, - @NonNull SurfaceControl.Transaction startTransaction, - @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback) { - final Transitions.TransitionFinishCallback finishCB = (wct) -> { - mixed.mInFlightSubAnimations--; - if (mixed.mInFlightSubAnimations > 0) return; - mActiveTransitions.remove(mixed); - finishCallback.onTransitionFinished(wct); - }; - mixed.mInFlightSubAnimations = 1; - // Sync pip state. - if (mPipHandler != null) { - mPipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction); - } - if (mSplitHandler != null && mSplitHandler.isSplitActive()) { - mSplitHandler.updateSurfaces(startTransaction); - } - return mUnfoldHandler.startAnimation( - mixed.mTransition, info, startTransaction, finishTransaction, finishCB); + return mixed.startSubAnimation(keyguardHandler, info, startTransaction, finishTransaction); } /** Use to when split use intent to enter, check if this enter transition should be mixed or @@ -932,65 +601,13 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, @NonNull Transitions.TransitionFinishCallback finishCallback) { for (int i = 0; i < mActiveTransitions.size(); ++i) { if (mActiveTransitions.get(i).mTransition != mergeTarget) continue; + MixedTransition mixed = mActiveTransitions.get(i); if (mixed.mInFlightSubAnimations <= 0) { // Already done, so no need to end it. return; } - if (mixed.mType == MixedTransition.TYPE_DISPLAY_AND_SPLIT_CHANGE) { - // queue since no actual animation. - } else if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT) { - if (mixed.mAnimType == MixedTransition.ANIM_TYPE_GOING_HOME) { - boolean ended = mSplitHandler.end(); - // If split couldn't end (because it is remote), then don't end everything else - // since we have to play out the animation anyways. - if (!ended) return; - mPipHandler.end(); - if (mixed.mLeftoversHandler != null) { - mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } - } else { - mPipHandler.end(); - } - } else if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING) { - mPipHandler.end(); - mActivityEmbeddingController.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE) { - mPipHandler.end(); - if (mixed.mLeftoversHandler != null) { - mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_SPLIT) { - if (mSplitHandler.isPendingEnter(transition)) { - // Recents -> enter-split means that we are switching from one pair to - // another pair. - mixed.mAnimType = MixedTransition.ANIM_TYPE_PAIR_TO_PAIR; - } - mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { - mKeyguardHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_KEYGUARD) { - if ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_UNOCCLUDING) != 0) { - handoverTransitionLeashes(mixed, info, t, mixed.mFinishT); - if (animateKeyguard(mixed, info, t, mixed.mFinishT, mixed.mFinishCB)) { - finishCallback.onTransitionFinished(null); - } - } - mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { - mixed.mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, - finishCallback); - } else if (mixed.mType == MixedTransition.TYPE_UNFOLD) { - mUnfoldHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); - } else { - throw new IllegalStateException("Playing a mixed transition with unknown type? " - + mixed.mType); - } + mixed.mergeAnimation(transition, info, t, mergeTarget, finishCallback); } } @@ -1003,46 +620,30 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, mixed = mActiveTransitions.remove(i); break; } - if (mixed == null) return; - if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT) { - mPipHandler.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING) { - mPipHandler.onTransitionConsumed(transition, aborted, finishT); - mActivityEmbeddingController.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_SPLIT) { - mixed.mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE) { - mixed.mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) { - mKeyguardHandler.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_DESKTOP) { - mixed.mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); - } else if (mixed.mType == MixedTransition.TYPE_UNFOLD) { - mUnfoldHandler.onTransitionConsumed(transition, aborted, finishT); - } - if (mixed.mHasRequestToRemote) { - mPlayer.getRemoteTransitionHandler().onTransitionConsumed(transition, aborted, finishT); + if (mixed != null) { + mixed.onTransitionConsumed(transition, aborted, finishT); } } /** - * Update an incoming {@link TransitionInfo} with the leashes from an ongoing - * {@link MixedTransition} so that it can take over some parts of the animation without + * Update an incoming {@link TransitionInfo} with the leashes from an existing + * {@link TransitionInfo} so that it can take over some parts of the animation without * reparenting to new transition roots. */ - private static void handoverTransitionLeashes(@NonNull MixedTransition mixed, - @NonNull TransitionInfo info, + static void handoverTransitionLeashes( + @NonNull TransitionInfo from, + @NonNull TransitionInfo to, @NonNull SurfaceControl.Transaction startT, @NonNull SurfaceControl.Transaction finishT) { // Show the roots in case they contain new changes not present in the original transition. - for (int j = info.getRootCount() - 1; j >= 0; --j) { - startT.show(info.getRoot(j).getLeash()); + for (int j = to.getRootCount() - 1; j >= 0; --j) { + startT.show(to.getRoot(j).getLeash()); } // Find all of the leashes from the original transition. Map<WindowContainerToken, TransitionInfo.Change> originalChanges = new ArrayMap<>(); - for (TransitionInfo.Change oldChange : mixed.mInfo.getChanges()) { + for (TransitionInfo.Change oldChange : from.getChanges()) { if (oldChange.getContainer() != null) { originalChanges.put(oldChange.getContainer(), oldChange); } @@ -1050,9 +651,10 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, // Merge the animation leashes by re-using the original ones if we see the same container // in the new transition and the old. - for (TransitionInfo.Change newChange : info.getChanges()) { + for (TransitionInfo.Change newChange : to.getChanges()) { if (originalChanges.containsKey(newChange.getContainer())) { - final TransitionInfo.Change oldChange = originalChanges.get(newChange.getContainer()); + final TransitionInfo.Change oldChange = originalChanges.get( + newChange.getContainer()); startT.reparent(newChange.getLeash(), null); newChange.setLeash(oldChange.getLeash()); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java new file mode 100644 index 000000000000..e9cd73b0df5e --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java @@ -0,0 +1,321 @@ +/* + * 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.transition; + +import static android.view.WindowManager.TRANSIT_TO_BACK; + +import static com.android.wm.shell.transition.DefaultMixedHandler.subCopy; +import static com.android.wm.shell.transition.MixedTransitionHelper.animateEnterPipFromSplit; +import static com.android.wm.shell.transition.MixedTransitionHelper.animateKeyguard; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.IBinder; +import android.view.SurfaceControl; +import android.window.TransitionInfo; + +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.activityembedding.ActivityEmbeddingController; +import com.android.wm.shell.keyguard.KeyguardTransitionHandler; +import com.android.wm.shell.pip.PipTransitionController; +import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.splitscreen.StageCoordinator; +import com.android.wm.shell.unfold.UnfoldTransitionHandler; + +class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { + private final UnfoldTransitionHandler mUnfoldHandler; + private final ActivityEmbeddingController mActivityEmbeddingController; + + DefaultMixedTransition(int type, IBinder transition, Transitions player, + DefaultMixedHandler mixedHandler, PipTransitionController pipHandler, + StageCoordinator splitHandler, KeyguardTransitionHandler keyguardHandler, + UnfoldTransitionHandler unfoldHandler, + ActivityEmbeddingController activityEmbeddingController) { + super(type, transition, player, mixedHandler, pipHandler, splitHandler, keyguardHandler); + mUnfoldHandler = unfoldHandler; + mActivityEmbeddingController = activityEmbeddingController; + + switch (type) { + case TYPE_UNFOLD: + mLeftoversHandler = mUnfoldHandler; + break; + case TYPE_DISPLAY_AND_SPLIT_CHANGE: + case TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING: + case TYPE_ENTER_PIP_FROM_SPLIT: + case TYPE_KEYGUARD: + case TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE: + default: + break; + } + } + + @Override + boolean startAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + return switch (mType) { + case TYPE_DISPLAY_AND_SPLIT_CHANGE -> false; + case TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING -> + animateEnterPipFromActivityEmbedding( + info, startTransaction, finishTransaction, finishCallback); + case TYPE_ENTER_PIP_FROM_SPLIT -> + animateEnterPipFromSplit(this, info, startTransaction, finishTransaction, + finishCallback, mPlayer, mMixedHandler, mPipHandler, mSplitHandler); + case TYPE_KEYGUARD -> + animateKeyguard(this, info, startTransaction, finishTransaction, finishCallback, + mKeyguardHandler, mPipHandler); + case TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE -> + animateOpenIntentWithRemoteAndPip(transition, info, startTransaction, + finishTransaction, finishCallback); + case TYPE_UNFOLD -> + animateUnfold(info, startTransaction, finishTransaction, finishCallback); + default -> throw new IllegalStateException( + "Starting default mixed animation with unknown or illegal type: " + mType); + }; + } + + private boolean animateEnterPipFromActivityEmbedding( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for entering PIP from" + + " an Activity Embedding window #%d", info.getDebugId()); + // Split into two transitions (wct) + TransitionInfo.Change pipChange = null; + final TransitionInfo everythingElse = subCopy(info, TRANSIT_TO_BACK, true /* changes */); + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + TransitionInfo.Change change = info.getChanges().get(i); + if (mPipHandler.isEnteringPip(change, info.getType())) { + if (pipChange != null) { + throw new IllegalStateException("More than 1 pip-entering changes in one" + + " transition? " + info); + } + pipChange = change; + // going backwards, so remove-by-index is fine. + everythingElse.getChanges().remove(i); + } + } + + final Transitions.TransitionFinishCallback finishCB = (wct) -> { + --mInFlightSubAnimations; + joinFinishArgs(wct); + if (mInFlightSubAnimations > 0) return; + finishCallback.onTransitionFinished(mFinishWCT); + }; + + if (!mActivityEmbeddingController.shouldAnimate(everythingElse)) { + // Fallback to dispatching to other handlers. + return false; + } + + // PIP window should always be on the highest Z order. + if (pipChange != null) { + mInFlightSubAnimations = 2; + mPipHandler.startEnterAnimation( + pipChange, startTransaction.setLayer(pipChange.getLeash(), Integer.MAX_VALUE), + finishTransaction, + finishCB); + } else { + mInFlightSubAnimations = 1; + } + + mActivityEmbeddingController.startAnimation( + mTransition, everythingElse, startTransaction, finishTransaction, finishCB); + return true; + } + + private boolean animateOpenIntentWithRemoteAndPip( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for opening an intent" + + " with a remote transition and PIP #%d", info.getDebugId()); + boolean handledToPip = tryAnimateOpenIntentWithRemoteAndPip( + info, startTransaction, finishTransaction, finishCallback); + // Consume the transition on remote handler if the leftover handler already handle this + // transition. And if it cannot, the transition will be handled by remote handler, so don't + // consume here. + // Need to check leftOverHandler as it may change in #animateOpenIntentWithRemoteAndPip + if (handledToPip && mHasRequestToRemote + && mLeftoversHandler != mPlayer.getRemoteTransitionHandler()) { + mPlayer.getRemoteTransitionHandler().onTransitionConsumed(transition, false, null); + } + return handledToPip; + } + + private boolean tryAnimateOpenIntentWithRemoteAndPip( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + TransitionInfo.Change pipChange = null; + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + TransitionInfo.Change change = info.getChanges().get(i); + if (mPipHandler.isEnteringPip(change, info.getType())) { + if (pipChange != null) { + throw new IllegalStateException("More than 1 pip-entering changes in one" + + " transition? " + info); + } + pipChange = change; + info.getChanges().remove(i); + } + } + Transitions.TransitionFinishCallback finishCB = (wct) -> { + --mInFlightSubAnimations; + joinFinishArgs(wct); + if (mInFlightSubAnimations > 0) return; + finishCallback.onTransitionFinished(mFinishWCT); + }; + if (pipChange == null) { + if (mLeftoversHandler != null) { + mInFlightSubAnimations = 1; + if (mLeftoversHandler.startAnimation( + mTransition, info, startTransaction, finishTransaction, finishCB)) { + return true; + } + } + return false; + } + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Splitting PIP into a separate" + + " animation because remote-animation likely doesn't support it #%d", + info.getDebugId()); + // Split the transition into 2 parts: the pip part and the rest. + mInFlightSubAnimations = 2; + // make a new startTransaction because pip's startEnterAnimation "consumes" it so + // we need a separate one to send over to launcher. + SurfaceControl.Transaction otherStartT = new SurfaceControl.Transaction(); + + mPipHandler.startEnterAnimation(pipChange, otherStartT, finishTransaction, finishCB); + + // Dispatch the rest of the transition normally. + if (mLeftoversHandler != null + && mLeftoversHandler.startAnimation(mTransition, info, + startTransaction, finishTransaction, finishCB)) { + return true; + } + mLeftoversHandler = mPlayer.dispatchTransition( + mTransition, info, startTransaction, finishTransaction, finishCB, mMixedHandler); + return true; + } + + private boolean animateUnfold( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for unfolding #%d", + info.getDebugId()); + + final Transitions.TransitionFinishCallback finishCB = (wct) -> { + mInFlightSubAnimations--; + if (mInFlightSubAnimations > 0) return; + finishCallback.onTransitionFinished(wct); + }; + mInFlightSubAnimations = 1; + // Sync pip state. + if (mPipHandler != null) { + mPipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction); + } + if (mSplitHandler != null && mSplitHandler.isSplitActive()) { + mSplitHandler.updateSurfaces(startTransaction); + } + return mUnfoldHandler.startAnimation( + mTransition, info, startTransaction, finishTransaction, finishCB); + } + + @Override + void mergeAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + switch (mType) { + case TYPE_DISPLAY_AND_SPLIT_CHANGE: + // queue since no actual animation. + return; + case TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING: + mPipHandler.end(); + mActivityEmbeddingController.mergeAnimation( + transition, info, t, mergeTarget, finishCallback); + return; + case TYPE_ENTER_PIP_FROM_SPLIT: + if (mAnimType == ANIM_TYPE_GOING_HOME) { + boolean ended = mSplitHandler.end(); + // If split couldn't end (because it is remote), then don't end everything else + // since we have to play out the animation anyways. + if (!ended) return; + mPipHandler.end(); + if (mLeftoversHandler != null) { + mLeftoversHandler.mergeAnimation( + transition, info, t, mergeTarget, finishCallback); + } + } else { + mPipHandler.end(); + } + return; + case TYPE_KEYGUARD: + mKeyguardHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); + return; + case TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE: + mPipHandler.end(); + if (mLeftoversHandler != null) { + mLeftoversHandler.mergeAnimation( + transition, info, t, mergeTarget, finishCallback); + } + return; + case TYPE_UNFOLD: + mUnfoldHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); + return; + default: + throw new IllegalStateException("Playing a default mixed transition with unknown or" + + " illegal type: " + mType); + } + } + + @Override + void onTransitionConsumed( + @NonNull IBinder transition, boolean aborted, + @Nullable SurfaceControl.Transaction finishT) { + switch (mType) { + case TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING: + mPipHandler.onTransitionConsumed(transition, aborted, finishT); + mActivityEmbeddingController.onTransitionConsumed(transition, aborted, finishT); + break; + case TYPE_ENTER_PIP_FROM_SPLIT: + mPipHandler.onTransitionConsumed(transition, aborted, finishT); + break; + case TYPE_KEYGUARD: + mKeyguardHandler.onTransitionConsumed(transition, aborted, finishT); + break; + case TYPE_OPTIONS_REMOTE_AND_PIP_CHANGE: + mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); + break; + case TYPE_UNFOLD: + mUnfoldHandler.onTransitionConsumed(transition, aborted, finishT); + break; + default: + break; + } + + if (mHasRequestToRemote) { + mPlayer.getRemoteTransitionHandler().onTransitionConsumed(transition, aborted, finishT); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index 193a4fb5b503..c70a8219489e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -109,8 +109,8 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellInit; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.List; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java index 473deba3b7d2..cb2944c120e0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java @@ -17,6 +17,7 @@ package com.android.wm.shell.transition; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.Display.DEFAULT_DISPLAY; import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED; import static com.android.wm.shell.transition.Transitions.TransitionObserver; @@ -31,11 +32,12 @@ import android.window.TransitionInfo; import com.android.wm.shell.common.RemoteCallable; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SingleInstanceRemoteListener; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; /** * The {@link TransitionObserver} that observes for transitions involving the home - * activity. It reports transitions to the caller via {@link IHomeTransitionListener}. + * activity on the {@link android.view.Display#DEFAULT_DISPLAY} only. + * It reports transitions to the caller via {@link IHomeTransitionListener}. */ public class HomeTransitionObserver implements TransitionObserver, RemoteCallable<HomeTransitionObserver> { @@ -58,6 +60,7 @@ public class HomeTransitionObserver implements TransitionObserver, for (TransitionInfo.Change change : info.getChanges()) { final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); if (taskInfo == null + || taskInfo.displayId != DEFAULT_DISPLAY || taskInfo.taskId == -1 || !taskInfo.isRunning) { continue; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/IHomeTransitionListener.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/IHomeTransitionListener.aidl index 18716c68da27..72fba3bb7de4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/IHomeTransitionListener.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/IHomeTransitionListener.aidl @@ -20,12 +20,13 @@ import android.window.RemoteTransition; import android.window.TransitionFilter; /** - * Listener interface that Launcher attaches to SystemUI to get home activity transition callbacks. + * Listener interface that Launcher attaches to SystemUI to get home activity transition callbacks + * on the default display. */ -interface IHomeTransitionListener { +oneway interface IHomeTransitionListener { /** - * Called when a transition changes the visibility of the home activity. + * Called when a transition changes the visibility of the home activity on the default display. */ void onHomeVisibilityChanged(in boolean isVisible); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java new file mode 100644 index 000000000000..0974cd13f249 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java @@ -0,0 +1,181 @@ +/* + * 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.transition; + +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.WindowManager.TRANSIT_TO_BACK; +import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; + +import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR; +import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; +import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA; +import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED; +import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_CHILD_TASK_ENTER_PIP; +import static com.android.wm.shell.transition.DefaultMixedHandler.subCopy; + +import android.annotation.NonNull; +import android.view.SurfaceControl; +import android.window.TransitionInfo; + +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.keyguard.KeyguardTransitionHandler; +import com.android.wm.shell.pip.PipTransitionController; +import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.splitscreen.SplitScreen; +import com.android.wm.shell.splitscreen.StageCoordinator; + +public class MixedTransitionHelper { + static boolean animateEnterPipFromSplit( + @NonNull DefaultMixedHandler.MixedTransition mixed, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback, + @NonNull Transitions player, @NonNull DefaultMixedHandler mixedHandler, + @NonNull PipTransitionController pipHandler, @NonNull StageCoordinator splitHandler) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animating a mixed transition for " + + "entering PIP while Split-Screen is foreground."); + TransitionInfo.Change pipChange = null; + TransitionInfo.Change wallpaper = null; + final TransitionInfo everythingElse = + subCopy(info, TRANSIT_TO_BACK, true /* changes */); + boolean homeIsOpening = false; + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + TransitionInfo.Change change = info.getChanges().get(i); + if (pipHandler.isEnteringPip(change, info.getType())) { + if (pipChange != null) { + throw new IllegalStateException("More than 1 pip-entering changes in one" + + " transition? " + info); + } + pipChange = change; + // going backwards, so remove-by-index is fine. + everythingElse.getChanges().remove(i); + } else if (isHomeOpening(change)) { + homeIsOpening = true; + } else if (isWallpaper(change)) { + wallpaper = change; + } + } + if (pipChange == null) { + // um, something probably went wrong. + return false; + } + final boolean isGoingHome = homeIsOpening; + Transitions.TransitionFinishCallback finishCB = (wct) -> { + --mixed.mInFlightSubAnimations; + mixed.joinFinishArgs(wct); + if (mixed.mInFlightSubAnimations > 0) return; + if (isGoingHome) { + splitHandler.onTransitionAnimationComplete(); + } + finishCallback.onTransitionFinished(mixed.mFinishWCT); + }; + if (isGoingHome || splitHandler.getSplitItemPosition(pipChange.getLastParent()) + != SPLIT_POSITION_UNDEFINED) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animation is actually mixed " + + "since entering-PiP caused us to leave split and return home."); + // We need to split the transition into 2 parts: the pip part (animated by pip) + // and the dismiss-part (animated by launcher). + mixed.mInFlightSubAnimations = 2; + // immediately make the wallpaper visible (so that we don't see it pop-in during + // the time it takes to start recents animation (which is remote). + if (wallpaper != null) { + startTransaction.show(wallpaper.getLeash()).setAlpha(wallpaper.getLeash(), 1.f); + } + // make a new startTransaction because pip's startEnterAnimation "consumes" it so + // we need a separate one to send over to launcher. + SurfaceControl.Transaction otherStartT = new SurfaceControl.Transaction(); + @SplitScreen.StageType int topStageToKeep = STAGE_TYPE_UNDEFINED; + if (splitHandler.isSplitScreenVisible()) { + // The non-going home case, we could be pip-ing one of the split stages and keep + // showing the other + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + TransitionInfo.Change change = info.getChanges().get(i); + if (change == pipChange) { + // Ignore the change/task that's going into Pip + continue; + } + @SplitScreen.StageType int splitItemStage = + splitHandler.getSplitItemStage(change.getLastParent()); + if (splitItemStage != STAGE_TYPE_UNDEFINED) { + topStageToKeep = splitItemStage; + break; + } + } + } + // Let split update internal state for dismiss. + splitHandler.prepareDismissAnimation(topStageToKeep, + EXIT_REASON_CHILD_TASK_ENTER_PIP, everythingElse, otherStartT, + finishTransaction); + + // We are trying to accommodate launcher's close animation which can't handle the + // divider-bar, so if split-handler is closing the divider-bar, just hide it and + // remove from transition info. + for (int i = everythingElse.getChanges().size() - 1; i >= 0; --i) { + if ((everythingElse.getChanges().get(i).getFlags() & FLAG_IS_DIVIDER_BAR) + != 0) { + everythingElse.getChanges().remove(i); + break; + } + } + + pipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA); + pipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction, + finishCB); + // Dispatch the rest of the transition normally. This will most-likely be taken by + // recents or default handler. + mixed.mLeftoversHandler = player.dispatchTransition(mixed.mTransition, everythingElse, + otherStartT, finishTransaction, finishCB, mixedHandler); + } else { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Not leaving split, so just " + + "forward animation to Pip-Handler."); + // This happens if the pip-ing activity is in a multi-activity task (and thus a + // new pip task is spawned). In this case, we don't actually exit split so we can + // just let pip transition handle the animation verbatim. + mixed.mInFlightSubAnimations = 1; + pipHandler.startAnimation( + mixed.mTransition, info, startTransaction, finishTransaction, finishCB); + } + return true; + } + + private static boolean isHomeOpening(@NonNull TransitionInfo.Change change) { + return change.getTaskInfo() != null + && change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME; + } + + private static boolean isWallpaper(@NonNull TransitionInfo.Change change) { + return (change.getFlags() & FLAG_IS_WALLPAPER) != 0; + } + + static boolean animateKeyguard( + @NonNull DefaultMixedHandler.MixedTransition mixed, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback, + @NonNull KeyguardTransitionHandler keyguardHandler, + PipTransitionController pipHandler) { + if (mixed.mFinishT == null) { + mixed.mFinishT = finishTransaction; + mixed.mFinishCB = finishCallback; + } + // Sync pip state. + if (pipHandler != null) { + pipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction); + } + return mixed.startSubAnimation(keyguardHandler, info, startTransaction, finishTransaction); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/OneShotRemoteHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/OneShotRemoteHandler.java index 4355ed2bd3bf..94519a0d118c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/OneShotRemoteHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/OneShotRemoteHandler.java @@ -74,6 +74,9 @@ public class OneShotRemoteHandler implements Transitions.TransitionHandler { @Override public void onTransitionFinished(WindowContainerTransaction wct, SurfaceControl.Transaction sct) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, + "Finished one-shot remote transition %s for (#%d).", mRemote, + info.getDebugId()); if (mRemote.asBinder() != null) { mRemote.asBinder().unlinkToDeath(remoteDied, 0 /* flags */); } @@ -82,8 +85,8 @@ public class OneShotRemoteHandler implements Transitions.TransitionHandler { } mMainExecutor.execute(() -> { finishCallback.onTransitionFinished(wct); + mRemote = null; }); - mRemote = null; } }; Transitions.setRunningRemoteTransitionDelegate(mRemote.getAppThread()); @@ -115,17 +118,24 @@ public class OneShotRemoteHandler implements Transitions.TransitionHandler { public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Merging registered One-shot remote" + + " transition %s for (#%d).", mRemote, info.getDebugId()); IRemoteTransitionFinishedCallback cb = new IRemoteTransitionFinishedCallback.Stub() { @Override public void onTransitionFinished(WindowContainerTransaction wct, SurfaceControl.Transaction sct) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, + "Finished merging one-shot remote transition %s for (#%d).", mRemote, + info.getDebugId()); // We have merged, since we sent the transaction over binder, the one in this // process won't be cleared if the remote applied it. We don't actually know if the // remote applied the transaction, but applying twice will break surfaceflinger // so just assume the worst-case and clear the local transaction. t.clear(); - mMainExecutor.execute(() -> finishCallback.onTransitionFinished(wct)); - mRemote = null; + mMainExecutor.execute(() -> { + finishCallback.onTransitionFinished(wct); + mRemote = null; + }); } }; try { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RecentsMixedTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RecentsMixedTransition.java new file mode 100644 index 000000000000..4ea71490798c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RecentsMixedTransition.java @@ -0,0 +1,225 @@ +/* + * 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.transition; + +import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_UNOCCLUDING; + +import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; +import static com.android.wm.shell.transition.DefaultMixedHandler.handoverTransitionLeashes; +import static com.android.wm.shell.transition.MixedTransitionHelper.animateEnterPipFromSplit; +import static com.android.wm.shell.transition.MixedTransitionHelper.animateKeyguard; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.IBinder; +import android.view.SurfaceControl; +import android.window.TransitionInfo; +import android.window.WindowContainerTransaction; + +import com.android.internal.protolog.common.ProtoLog; +import com.android.wm.shell.desktopmode.DesktopTasksController; +import com.android.wm.shell.keyguard.KeyguardTransitionHandler; +import com.android.wm.shell.pip.PipTransitionController; +import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.recents.RecentsTransitionHandler; +import com.android.wm.shell.splitscreen.StageCoordinator; + +class RecentsMixedTransition extends DefaultMixedHandler.MixedTransition { + private final RecentsTransitionHandler mRecentsHandler; + private final DesktopTasksController mDesktopTasksController; + + RecentsMixedTransition(int type, IBinder transition, Transitions player, + DefaultMixedHandler mixedHandler, PipTransitionController pipHandler, + StageCoordinator splitHandler, KeyguardTransitionHandler keyguardHandler, + RecentsTransitionHandler recentsHandler, + DesktopTasksController desktopTasksController) { + super(type, transition, player, mixedHandler, pipHandler, splitHandler, keyguardHandler); + mRecentsHandler = recentsHandler; + mDesktopTasksController = desktopTasksController; + mLeftoversHandler = mRecentsHandler; + } + + @Override + boolean startAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + return switch (mType) { + case TYPE_RECENTS_DURING_DESKTOP -> + animateRecentsDuringDesktop( + info, startTransaction, finishTransaction, finishCallback); + case TYPE_RECENTS_DURING_KEYGUARD -> + animateRecentsDuringKeyguard( + info, startTransaction, finishTransaction, finishCallback); + case TYPE_RECENTS_DURING_SPLIT -> + animateRecentsDuringSplit( + info, startTransaction, finishTransaction, finishCallback); + default -> throw new IllegalStateException( + "Starting Recents mixed animation with unknown or illegal type: " + mType); + }; + } + + private boolean animateRecentsDuringDesktop( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Transition for Recents during" + + " Desktop #%d", info.getDebugId()); + + if (mInfo == null) { + mInfo = info; + mFinishT = finishTransaction; + mFinishCB = finishCallback; + } + Transitions.TransitionFinishCallback finishCB = wct -> { + mInFlightSubAnimations--; + if (mInFlightSubAnimations == 0) { + finishCallback.onTransitionFinished(wct); + } + }; + + mInFlightSubAnimations++; + boolean consumed = mRecentsHandler.startAnimation( + mTransition, info, startTransaction, finishTransaction, finishCB); + if (!consumed) { + mInFlightSubAnimations--; + return false; + } + if (mDesktopTasksController != null) { + mDesktopTasksController.syncSurfaceState(info, finishTransaction); + return true; + } + + return false; + } + + private boolean animateRecentsDuringKeyguard( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for Recents during" + + " Keyguard #%d", info.getDebugId()); + + if (mInfo == null) { + mInfo = info; + mFinishT = finishTransaction; + mFinishCB = finishCallback; + } + return startSubAnimation(mRecentsHandler, info, startTransaction, finishTransaction); + } + + private boolean animateRecentsDuringSplit( + @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for Recents during" + + " split screen #%d", info.getDebugId()); + + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + final TransitionInfo.Change change = info.getChanges().get(i); + // Pip auto-entering info might be appended to recent transition like pressing + // home-key in 3-button navigation. This offers split handler the opportunity to + // handle split to pip animation. + if (mPipHandler.isEnteringPip(change, info.getType()) + && mSplitHandler.getSplitItemPosition(change.getLastParent()) + != SPLIT_POSITION_UNDEFINED) { + return animateEnterPipFromSplit(this, info, startTransaction, finishTransaction, + finishCallback, mPlayer, mMixedHandler, mPipHandler, mSplitHandler); + } + } + + // Split-screen is only interested in the recents transition finishing (and merging), so + // just wrap finish and start recents animation directly. + Transitions.TransitionFinishCallback finishCB = (wct) -> { + mInFlightSubAnimations = 0; + // If pair-to-pair switching, the post-recents clean-up isn't needed. + wct = wct != null ? wct : new WindowContainerTransaction(); + if (mAnimType != ANIM_TYPE_PAIR_TO_PAIR) { + mSplitHandler.onRecentsInSplitAnimationFinish(wct, finishTransaction); + } else { + // notify pair-to-pair recents animation finish + mSplitHandler.onRecentsPairToPairAnimationFinish(wct); + } + mSplitHandler.onTransitionAnimationComplete(); + finishCallback.onTransitionFinished(wct); + }; + mInFlightSubAnimations = 1; + mSplitHandler.onRecentsInSplitAnimationStart(info); + final boolean handled = mLeftoversHandler.startAnimation( + mTransition, info, startTransaction, finishTransaction, finishCB); + if (!handled) { + mSplitHandler.onRecentsInSplitAnimationCanceled(); + } + return handled; + } + + @Override + void mergeAnimation( + @NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + switch (mType) { + case TYPE_RECENTS_DURING_DESKTOP: + mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); + return; + case TYPE_RECENTS_DURING_KEYGUARD: + if ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_UNOCCLUDING) != 0) { + handoverTransitionLeashes(mInfo, info, t, mFinishT); + if (animateKeyguard( + this, info, t, mFinishT, mFinishCB, mKeyguardHandler, mPipHandler)) { + finishCallback.onTransitionFinished(null); + } + } + mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, + finishCallback); + return; + case TYPE_RECENTS_DURING_SPLIT: + if (mSplitHandler.isPendingEnter(transition)) { + // Recents -> enter-split means that we are switching from one pair to + // another pair. + mAnimType = DefaultMixedHandler.MixedTransition.ANIM_TYPE_PAIR_TO_PAIR; + } + mLeftoversHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback); + return; + default: + throw new IllegalStateException("Playing a Recents mixed transition with unknown or" + + " illegal type: " + mType); + } + } + + @Override + void onTransitionConsumed( + @NonNull IBinder transition, boolean aborted, + @Nullable SurfaceControl.Transaction finishT) { + switch (mType) { + case TYPE_RECENTS_DURING_DESKTOP: + case TYPE_RECENTS_DURING_SPLIT: + mLeftoversHandler.onTransitionConsumed(transition, aborted, finishT); + break; + default: + break; + } + + if (mHasRequestToRemote) { + mPlayer.getRemoteTransitionHandler().onTransitionConsumed(transition, aborted, finishT); + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java index 293b66084d28..4c4c5806ea55 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java @@ -39,7 +39,7 @@ import androidx.annotation.BinderThread; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.protolog.ShellProtoLogGroup; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; import java.util.ArrayList; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java index b012d359931a..1be85d05c16e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java @@ -56,7 +56,7 @@ import com.android.internal.R; import com.android.internal.policy.TransitionAnimation; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.protolog.ShellProtoLogGroup; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.shared.TransitionUtil; /** The helper class that provides methods for adding styles to transition animations. */ public class TransitionAnimationHelper { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index af69b5272ad5..5e79681e060b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -37,9 +37,9 @@ import static android.window.TransitionInfo.FLAG_NO_ANIMATION; import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT; import static com.android.wm.shell.common.ExecutorUtils.executeRemoteCallWithTaskPermission; +import static com.android.wm.shell.shared.TransitionUtil.isClosingType; +import static com.android.wm.shell.shared.TransitionUtil.isOpeningType; import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SHELL_TRANSITIONS; -import static com.android.wm.shell.util.TransitionUtil.isClosingType; -import static com.android.wm.shell.util.TransitionUtil.isOpeningType; import android.annotation.NonNull; import android.annotation.Nullable; @@ -80,10 +80,13 @@ import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.common.annotations.ExternalThread; import com.android.wm.shell.keyguard.KeyguardTransitionHandler; import com.android.wm.shell.protolog.ShellProtoLogGroup; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; -import com.android.wm.shell.util.TransitionUtil; +import com.android.wm.shell.transition.tracing.LegacyTransitionTracer; +import com.android.wm.shell.transition.tracing.PerfettoTransitionTracer; +import com.android.wm.shell.transition.tracing.TransitionTracer; import java.io.PrintWriter; import java.util.ArrayList; @@ -172,6 +175,9 @@ public class Transitions implements RemoteCallable<Transitions>, /** Transition to animate task to desktop. */ public static final int TRANSIT_MOVE_TO_DESKTOP = WindowManager.TRANSIT_FIRST_CUSTOM + 15; + /** Transition to resize PiP task. */ + public static final int TRANSIT_RESIZE_PIP = TRANSIT_FIRST_CUSTOM + 16; + private final ShellTaskOrganizer mOrganizer; private final Context mContext; private final ShellExecutor mMainExecutor; @@ -184,7 +190,7 @@ public class Transitions implements RemoteCallable<Transitions>, private final ShellController mShellController; private final ShellTransitionImpl mImpl = new ShellTransitionImpl(); private final SleepHandler mSleepHandler = new SleepHandler(); - private final Tracer mTracer = new Tracer(); + private final TransitionTracer mTransitionTracer; private boolean mIsRegistered = false; /** List of possible handlers. Ordered by specificity (eg. tapped back to front). */ @@ -307,6 +313,12 @@ public class Transitions implements RemoteCallable<Transitions>, ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "addHandler: Remote"); shellInit.addInitCallback(this::onInit, this); mHomeTransitionObserver = observer; + + if (android.tracing.Flags.perfettoTransitionTracing()) { + mTransitionTracer = new PerfettoTransitionTracer(); + } else { + mTransitionTracer = new LegacyTransitionTracer(); + } } private void onInit() { @@ -757,6 +769,10 @@ public class Transitions implements RemoteCallable<Transitions>, } if (!change.hasFlags(FLAG_IS_OCCLUDED)) { allOccluded = false; + } else if (change.hasAllFlags(TransitionInfo.FLAGS_IS_OCCLUDED_NO_ANIMATION)) { + // Remove the change because it should be invisible in the animation. + info.getChanges().remove(i); + continue; } // The change has already animated by back gesture, don't need to play transition // animation on it. @@ -864,7 +880,7 @@ public class Transitions implements RemoteCallable<Transitions>, ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Transition %s ready while" + " %s is still animating. Notify the animating transition" + " in case they can be merged", ready, playing); - mTracer.logMergeRequested(ready.mInfo.getDebugId(), playing.mInfo.getDebugId()); + mTransitionTracer.logMergeRequested(ready.mInfo.getDebugId(), playing.mInfo.getDebugId()); playing.mHandler.mergeAnimation(ready.mToken, ready.mInfo, ready.mStartT, playing.mToken, (wct) -> onMerged(playing, ready)); } @@ -898,7 +914,7 @@ public class Transitions implements RemoteCallable<Transitions>, for (int i = 0; i < mObservers.size(); ++i) { mObservers.get(i).onTransitionMerged(merged.mToken, playing.mToken); } - mTracer.logMerged(merged.mInfo.getDebugId(), playing.mInfo.getDebugId()); + mTransitionTracer.logMerged(merged.mInfo.getDebugId(), playing.mInfo.getDebugId()); // See if we should merge another transition. processReadyQueue(track); } @@ -919,7 +935,7 @@ public class Transitions implements RemoteCallable<Transitions>, active.mStartT, active.mFinishT, (wct) -> onFinish(active, wct)); if (consumed) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by firstHandler"); - mTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler); + mTransitionTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler); return; } } @@ -944,7 +960,7 @@ public class Transitions implements RemoteCallable<Transitions>, if (consumed) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by %s", mHandlers.get(i)); - mTracer.logDispatched(info.getDebugId(), mHandlers.get(i)); + mTransitionTracer.logDispatched(info.getDebugId(), mHandlers.get(i)); return mHandlers.get(i); } } @@ -974,7 +990,7 @@ public class Transitions implements RemoteCallable<Transitions>, final Track track = mTracks.get(transition.getTrack()); transition.mAborted = true; - mTracer.logAborted(transition.mInfo.getDebugId()); + mTransitionTracer.logAborted(transition.mInfo.getDebugId()); if (transition.mHandler != null) { // Notifies to clean-up the aborted transition. @@ -1502,12 +1518,18 @@ public class Transitions implements RemoteCallable<Transitions>, } } - @Override public boolean onShellCommand(String[] args, PrintWriter pw) { switch (args[0]) { case "tracing": { - mTracer.onShellCommand(Arrays.copyOfRange(args, 1, args.length), pw); + if (!android.tracing.Flags.perfettoTransitionTracing()) { + ((LegacyTransitionTracer) mTransitionTracer) + .onShellCommand(Arrays.copyOfRange(args, 1, args.length), pw); + } else { + pw.println("Command not supported. Use the Perfetto command instead to start " + + "and stop this trace instead."); + return false; + } return true; } default: { @@ -1520,8 +1542,10 @@ public class Transitions implements RemoteCallable<Transitions>, @Override public void printShellCommandHelp(PrintWriter pw, String prefix) { - pw.println(prefix + "tracing"); - mTracer.printShellCommandHelp(pw, prefix + " "); + if (!android.tracing.Flags.perfettoTransitionTracing()) { + pw.println(prefix + "tracing"); + ((LegacyTransitionTracer) mTransitionTracer).printShellCommandHelp(pw, prefix + " "); + } } private void dump(@NonNull PrintWriter pw, String prefix) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Tracer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/LegacyTransitionTracer.java index 5919aad133c7..9c848869e0f8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Tracer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/LegacyTransitionTracer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.transition; +package com.android.wm.shell.transition.tracing; import static android.os.Build.IS_USER; @@ -29,6 +29,7 @@ import android.util.Log; import com.android.internal.util.TraceBuffer; import com.android.wm.shell.sysui.ShellCommandHandler; +import com.android.wm.shell.transition.Transitions; import com.google.protobuf.nano.MessageNano; @@ -45,7 +46,8 @@ import java.util.concurrent.TimeUnit; /** * Helper class to collect and dump transition traces. */ -public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { +public class LegacyTransitionTracer + implements ShellCommandHandler.ShellCommandActionHandler, TransitionTracer { private static final int ALWAYS_ON_TRACING_CAPACITY = 15 * 1024; // 15 KB private static final int ACTIVE_TRACING_BUFFER_CAPACITY = 5000 * 1024; // 5 MB @@ -60,33 +62,33 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { private final TraceBuffer.ProtoProvider mProtoProvider = new TraceBuffer.ProtoProvider<MessageNano, - com.android.wm.shell.nano.WmShellTransitionTraceProto, - com.android.wm.shell.nano.Transition>() { - @Override - public int getItemSize(MessageNano proto) { - return proto.getCachedSize(); - } - - @Override - public byte[] getBytes(MessageNano proto) { - return MessageNano.toByteArray(proto); - } - - @Override - public void write( - com.android.wm.shell.nano.WmShellTransitionTraceProto encapsulatingProto, - Queue<com.android.wm.shell.nano.Transition> buffer, OutputStream os) + com.android.wm.shell.nano.WmShellTransitionTraceProto, + com.android.wm.shell.nano.Transition>() { + @Override + public int getItemSize(MessageNano proto) { + return proto.getCachedSize(); + } + + @Override + public byte[] getBytes(MessageNano proto) { + return MessageNano.toByteArray(proto); + } + + @Override + public void write( + com.android.wm.shell.nano.WmShellTransitionTraceProto encapsulatingProto, + Queue<com.android.wm.shell.nano.Transition> buffer, OutputStream os) throws IOException { - encapsulatingProto.transitions = buffer.toArray( - new com.android.wm.shell.nano.Transition[0]); - os.write(getBytes(encapsulatingProto)); - } - }; + encapsulatingProto.transitions = buffer.toArray( + new com.android.wm.shell.nano.Transition[0]); + os.write(getBytes(encapsulatingProto)); + } + }; private final TraceBuffer<MessageNano, com.android.wm.shell.nano.WmShellTransitionTraceProto, - com.android.wm.shell.nano.Transition> mTraceBuffer - = new TraceBuffer(ALWAYS_ON_TRACING_CAPACITY, mProtoProvider, - (proto) -> handleOnEntryRemovedFromTrace(proto)); + com.android.wm.shell.nano.Transition> mTraceBuffer = + new TraceBuffer(ALWAYS_ON_TRACING_CAPACITY, mProtoProvider, + this::handleOnEntryRemovedFromTrace); private final Map<Object, Runnable> mRemovedFromTraceCallbacks = new HashMap<>(); private final Map<Transitions.TransitionHandler, Integer> mHandlerIds = new HashMap<>(); @@ -99,6 +101,7 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { * @param transitionId The id of the transition being dispatched. * @param handler The handler the transition is being dispatched to. */ + @Override public void logDispatched(int transitionId, Transitions.TransitionHandler handler) { final int handlerId; if (mHandlerIds.containsKey(handler)) { @@ -130,6 +133,7 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { * * @param mergeRequestedTransitionId The id of the transition we are requesting to be merged. */ + @Override public void logMergeRequested(int mergeRequestedTransitionId, int playingTransitionId) { com.android.wm.shell.nano.Transition proto = new com.android.wm.shell.nano.Transition(); proto.id = mergeRequestedTransitionId; @@ -145,6 +149,7 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { * @param mergedTransitionId The id of the transition that was merged. * @param playingTransitionId The id of the transition the transition was merged into. */ + @Override public void logMerged(int mergedTransitionId, int playingTransitionId) { com.android.wm.shell.nano.Transition proto = new com.android.wm.shell.nano.Transition(); proto.id = mergedTransitionId; @@ -159,6 +164,7 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { * * @param transitionId The id of the transition that was aborted. */ + @Override public void logAborted(int transitionId) { com.android.wm.shell.nano.Transition proto = new com.android.wm.shell.nano.Transition(); proto.id = transitionId; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/OWNERS b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/OWNERS new file mode 100644 index 000000000000..2ff4d90306a9 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/OWNERS @@ -0,0 +1,4 @@ +# WM shell transition tracing owners +# Bug component: 1157642 +natanieljr@google.com +pablogamito@google.com diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java new file mode 100644 index 000000000000..fa331af267fa --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java @@ -0,0 +1,215 @@ +/* + * 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.transition.tracing; + +import android.internal.perfetto.protos.PerfettoTrace; +import android.os.SystemClock; +import android.os.Trace; +import android.tracing.perfetto.DataSourceParams; +import android.tracing.perfetto.InitArguments; +import android.tracing.perfetto.Producer; +import android.tracing.transition.TransitionDataSource; +import android.util.proto.ProtoOutputStream; + +import com.android.wm.shell.transition.Transitions; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Helper class to collect and dump transition traces. + */ +public class PerfettoTransitionTracer implements TransitionTracer { + private final AtomicInteger mActiveTraces = new AtomicInteger(0); + private final TransitionDataSource mDataSource = new TransitionDataSource( + mActiveTraces::incrementAndGet, + this::onFlush, + mActiveTraces::decrementAndGet); + private final Map<String, Integer> mHandlerMapping = new HashMap<>(); + + public PerfettoTransitionTracer() { + Producer.init(InitArguments.DEFAULTS); + mDataSource.register(DataSourceParams.DEFAULTS); + } + + /** + * Adds an entry in the trace to log that a transition has been dispatched to a handler. + * + * @param transitionId The id of the transition being dispatched. + * @param handler The handler the transition is being dispatched to. + */ + @Override + public void logDispatched(int transitionId, Transitions.TransitionHandler handler) { + if (!isTracing()) { + return; + } + + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logDispatched"); + try { + doLogDispatched(transitionId, handler); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); + } + } + + private void doLogDispatched(int transitionId, Transitions.TransitionHandler handler) { + mDataSource.trace(ctx -> { + final int handlerId = getHandlerId(handler); + + final ProtoOutputStream os = ctx.newTracePacket(); + final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION); + os.write(PerfettoTrace.ShellTransition.ID, transitionId); + os.write(PerfettoTrace.ShellTransition.DISPATCH_TIME_NS, + SystemClock.elapsedRealtimeNanos()); + os.write(PerfettoTrace.ShellTransition.HANDLER, handlerId); + os.end(token); + }); + } + + private int getHandlerId(Transitions.TransitionHandler handler) { + final int handlerId; + synchronized (mHandlerMapping) { + if (mHandlerMapping.containsKey(handler.getClass().getName())) { + handlerId = mHandlerMapping.get(handler.getClass().getName()); + } else { + // + 1 to avoid 0 ids which can be confused with missing value when dumped to proto + handlerId = mHandlerMapping.size() + 1; + mHandlerMapping.put(handler.getClass().getName(), handlerId); + } + } + return handlerId; + } + + /** + * Adds an entry in the trace to log that a request to merge a transition was made. + * + * @param mergeRequestedTransitionId The id of the transition we are requesting to be merged. + */ + @Override + public void logMergeRequested(int mergeRequestedTransitionId, int playingTransitionId) { + if (!isTracing()) { + return; + } + + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logMergeRequested"); + try { + doLogMergeRequested(mergeRequestedTransitionId, playingTransitionId); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); + } + } + + private void doLogMergeRequested(int mergeRequestedTransitionId, int playingTransitionId) { + mDataSource.trace(ctx -> { + final ProtoOutputStream os = ctx.newTracePacket(); + final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION); + os.write(PerfettoTrace.ShellTransition.ID, mergeRequestedTransitionId); + os.write(PerfettoTrace.ShellTransition.MERGE_REQUEST_TIME_NS, + SystemClock.elapsedRealtimeNanos()); + os.write(PerfettoTrace.ShellTransition.MERGE_TARGET, playingTransitionId); + os.end(token); + }); + } + + /** + * Adds an entry in the trace to log that a transition was merged by the handler. + * + * @param mergedTransitionId The id of the transition that was merged. + * @param playingTransitionId The id of the transition the transition was merged into. + */ + @Override + public void logMerged(int mergedTransitionId, int playingTransitionId) { + if (!isTracing()) { + return; + } + + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logMerged"); + try { + doLogMerged(mergedTransitionId, playingTransitionId); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); + } + } + + private void doLogMerged(int mergeRequestedTransitionId, int playingTransitionId) { + mDataSource.trace(ctx -> { + final ProtoOutputStream os = ctx.newTracePacket(); + final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION); + os.write(PerfettoTrace.ShellTransition.ID, mergeRequestedTransitionId); + os.write(PerfettoTrace.ShellTransition.MERGE_TIME_NS, + SystemClock.elapsedRealtimeNanos()); + os.write(PerfettoTrace.ShellTransition.MERGE_TARGET, playingTransitionId); + os.end(token); + }); + } + + /** + * Adds an entry in the trace to log that a transition was aborted. + * + * @param transitionId The id of the transition that was aborted. + */ + @Override + public void logAborted(int transitionId) { + if (!isTracing()) { + return; + } + + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logAborted"); + try { + doLogAborted(transitionId); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); + } + } + + private void doLogAborted(int transitionId) { + mDataSource.trace(ctx -> { + final ProtoOutputStream os = ctx.newTracePacket(); + final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION); + os.write(PerfettoTrace.ShellTransition.ID, transitionId); + os.write(PerfettoTrace.ShellTransition.SHELL_ABORT_TIME_NS, + SystemClock.elapsedRealtimeNanos()); + os.end(token); + }); + } + + private boolean isTracing() { + return mActiveTraces.get() > 0; + } + + private void onFlush() { + mDataSource.trace(ctx -> { + final ProtoOutputStream os = ctx.newTracePacket(); + + final long mappingsToken = os.start(PerfettoTrace.TracePacket.SHELL_HANDLER_MAPPINGS); + for (Map.Entry<String, Integer> entry : mHandlerMapping.entrySet()) { + final String handler = entry.getKey(); + final int handlerId = entry.getValue(); + + final long mappingEntryToken = os.start(PerfettoTrace.ShellHandlerMappings.MAPPING); + os.write(PerfettoTrace.ShellHandlerMapping.ID, handlerId); + os.write(PerfettoTrace.ShellHandlerMapping.NAME, handler); + os.end(mappingEntryToken); + + } + os.end(mappingsToken); + + ctx.flush(); + }); + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/TransitionTracer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/TransitionTracer.java new file mode 100644 index 000000000000..5857ad88e9e6 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/TransitionTracer.java @@ -0,0 +1,51 @@ +/* + * 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.transition.tracing; + +import com.android.wm.shell.transition.Transitions; + +public interface TransitionTracer { + /** + * Adds an entry in the trace to log that a transition has been dispatched to a handler. + * + * @param transitionId The id of the transition being dispatched. + * @param handler The handler the transition is being dispatched to. + */ + void logDispatched(int transitionId, Transitions.TransitionHandler handler); + + /** + * Adds an entry in the trace to log that a request to merge a transition was made. + * + * @param mergeRequestedTransitionId The id of the transition we are requesting to be merged. + */ + void logMergeRequested(int mergeRequestedTransitionId, int playingTransitionId); + + /** + * Adds an entry in the trace to log that a transition was merged by the handler. + * + * @param mergedTransitionId The id of the transition that was merged. + * @param playingTransitionId The id of the transition the transition was merged into. + */ + void logMerged(int mergedTransitionId, int playingTransitionId); + + /** + * Adds an entry in the trace to log that a transition was aborted. + * + * @param transitionId The id of the transition that was aborted. + */ + void logAborted(int transitionId); +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java index d7cb490ed0cb..e6d35e83116b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java @@ -28,11 +28,11 @@ import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.unfold.ShellUnfoldProgressProvider.UnfoldListener; import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator; +import dagger.Lazy; + import java.util.List; import java.util.Optional; -import dagger.Lazy; - /** * Manages fold/unfold animations of tasks on foldable devices. * When folding or unfolding a foldable device we play animations that diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java index 98d343b66760..c26604a84a61 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java @@ -35,6 +35,7 @@ import androidx.annotation.Nullable; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.common.TransactionPool; +import com.android.wm.shell.shared.TransitionUtil; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.transition.Transitions.TransitionFinishCallback; @@ -43,7 +44,6 @@ import com.android.wm.shell.unfold.ShellUnfoldProgressProvider.UnfoldListener; import com.android.wm.shell.unfold.animation.FullscreenUnfoldTaskAnimator; import com.android.wm.shell.unfold.animation.SplitTaskUnfoldAnimator; import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator; -import com.android.wm.shell.util.TransitionUtil; import java.util.ArrayList; import java.util.List; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java index cf1692018518..b2eeea7048bc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java @@ -23,13 +23,11 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import android.app.ActivityManager.RunningTaskInfo; import android.content.Context; import android.os.Handler; -import android.os.IBinder; import android.util.SparseArray; import android.view.Choreographer; import android.view.MotionEvent; import android.view.SurfaceControl; import android.view.View; -import android.window.TransitionInfo; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; @@ -54,6 +52,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { private final Choreographer mMainChoreographer; private final DisplayController mDisplayController; private final SyncTransactionQueue mSyncQueue; + private final Transitions mTransitions; private TaskOperations mTaskOperations; private final SparseArray<CaptionWindowDecoration> mWindowDecorByTaskId = new SparseArray<>(); @@ -64,29 +63,21 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { Choreographer mainChoreographer, ShellTaskOrganizer taskOrganizer, DisplayController displayController, - SyncTransactionQueue syncQueue) { + SyncTransactionQueue syncQueue, + Transitions transitions) { mContext = context; mMainHandler = mainHandler; mMainChoreographer = mainChoreographer; mTaskOrganizer = taskOrganizer; mDisplayController = displayController; mSyncQueue = syncQueue; + mTransitions = transitions; if (!Transitions.ENABLE_SHELL_TRANSITIONS) { mTaskOperations = new TaskOperations(null, mContext, mSyncQueue); } } @Override - public void onTransitionReady(IBinder transition, TransitionInfo info, - TransitionInfo.Change change) {} - - @Override - public void onTransitionMerged(IBinder merged, IBinder playing) {} - - @Override - public void onTransitionFinished(IBinder transition) {} - - @Override public void setFreeformTaskTransitionStarter(FreeformTaskTransitionStarter transitionStarter) { mTaskOperations = new TaskOperations(transitionStarter, mContext, mSyncQueue); } @@ -133,7 +124,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { if (decoration == null) { createWindowDecoration(taskInfo, taskSurface, startT, finishT); } else { - decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */); + decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */, + false /* setTaskCropAndPosition */); } } @@ -145,7 +137,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId); if (decoration == null) return; - decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */); + decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */, + false /* setTaskCropAndPosition */); } @Override @@ -191,16 +184,17 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { mSyncQueue); mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration); - final DragPositioningCallback dragPositioningCallback = - new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration, mDisplayController, - 0 /* disallowedAreaForEndBoundsHeight */); + final FluidResizeTaskPositioner taskPositioner = + new FluidResizeTaskPositioner(mTaskOrganizer, mTransitions, windowDecoration, + mDisplayController, 0 /* disallowedAreaForEndBoundsHeight */); final CaptionTouchEventListener touchEventListener = - new CaptionTouchEventListener(taskInfo, dragPositioningCallback); + new CaptionTouchEventListener(taskInfo, taskPositioner); windowDecoration.setCaptionListeners(touchEventListener, touchEventListener); - windowDecoration.setDragPositioningCallback(dragPositioningCallback); + windowDecoration.setDragPositioningCallback(taskPositioner); windowDecoration.setDragDetector(touchEventListener.mDragDetector); + windowDecoration.setTaskDragResizer(taskPositioner); windowDecoration.relayout(taskInfo, startT, finishT, - false /* applyStartTransactionOnDraw */); + false /* applyStartTransactionOnDraw */, false /* setTaskCropAndPosition */); setupCaptionColor(taskInfo, windowDecoration); } @@ -277,6 +271,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { if (e.findPointerIndex(mDragPointerId) == -1) { mDragPointerId = e.getPointerId(0); } + final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); + // If a decor's resize drag zone is active, don't also try to reposition it. + if (decoration.isHandlingDragResize()) break; final int dragPointerIdx = e.findPointerIndex(mDragPointerId); mDragPositioningCallback.onDragPositioningMove( e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java index c12ac8b3772e..96eaa1edbae4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java @@ -22,6 +22,7 @@ import android.app.WindowConfiguration.WindowingMode; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; +import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.VectorDrawable; import android.os.Handler; @@ -34,6 +35,7 @@ import android.window.WindowContainerTransaction; import com.android.wm.shell.R; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; +import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; /** @@ -84,6 +86,69 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL mDragPositioningCallback = dragPositioningCallback; } + @Override + Rect calculateValidDragArea() { + final int leftButtonsWidth = loadDimensionPixelSize(mContext.getResources(), + R.dimen.caption_left_buttons_width); + + // On a smaller screen, don't require as much empty space on screen, as offscreen + // drags will be restricted too much. + final int requiredEmptySpaceId = mDisplayController.getDisplayContext(mTaskInfo.displayId) + .getResources().getConfiguration().smallestScreenWidthDp >= 600 + ? R.dimen.freeform_required_visible_empty_space_in_header : + R.dimen.small_screen_required_visible_empty_space_in_header; + final int requiredEmptySpace = loadDimensionPixelSize(mContext.getResources(), + requiredEmptySpaceId); + + final int rightButtonsWidth = loadDimensionPixelSize(mContext.getResources(), + R.dimen.caption_right_buttons_width); + final int taskWidth = mTaskInfo.configuration.windowConfiguration.getBounds().width(); + final DisplayLayout layout = mDisplayController.getDisplayLayout(mTaskInfo.displayId); + final int displayWidth = layout.width(); + final Rect stableBounds = new Rect(); + layout.getStableBounds(stableBounds); + return new Rect( + determineMinX(leftButtonsWidth, rightButtonsWidth, requiredEmptySpace, + taskWidth), + stableBounds.top, + determineMaxX(leftButtonsWidth, rightButtonsWidth, requiredEmptySpace, taskWidth, + displayWidth), + determineMaxY(requiredEmptySpace, stableBounds)); + } + + + /** + * Determine the lowest x coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMinX(int leftButtonsWidth, int rightButtonsWidth, int requiredEmptySpace, + int taskWidth) { + // Do not let apps with < 48dp empty header space go off the left edge at all. + if (leftButtonsWidth + rightButtonsWidth + requiredEmptySpace > taskWidth) { + return 0; + } + return -taskWidth + requiredEmptySpace + rightButtonsWidth; + } + + /** + * Determine the highest x coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMaxX(int leftButtonsWidth, int rightButtonsWidth, int requiredEmptySpace, + int taskWidth, int displayWidth) { + // Do not let apps with < 48dp empty header space go off the right edge at all. + if (leftButtonsWidth + rightButtonsWidth + requiredEmptySpace > taskWidth) { + return displayWidth - taskWidth; + } + return displayWidth - requiredEmptySpace - leftButtonsWidth; + } + + /** + * Determine the highest y coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMaxY(int requiredEmptySpace, Rect stableBounds) { + return stableBounds.bottom - requiredEmptySpace; + } + + void setDragDetector(DragDetector dragDetector) { mDragDetector = dragDetector; mDragDetector.setTouchSlop(ViewConfiguration.get(mContext).getScaledTouchSlop()); @@ -92,15 +157,21 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL @Override void relayout(RunningTaskInfo taskInfo) { final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + // The crop and position of the task should only be set when a task is fluid resizing. In + // all other cases, it is expected that the transition handler positions and crops the task + // in order to allow the handler time to animate before the task before the final + // position and crop are set. + final boolean shouldSetTaskPositionAndCrop = mTaskDragResizer.isResizingOrAnimating(); // Use |applyStartTransactionOnDraw| so that the transaction (that applies task crop) is // synced with the buffer transaction (that draws the View). Both will be shown on screen // at the same, whereas applying them independently causes flickering. See b/270202228. - relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */); + relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */, + shouldSetTaskPositionAndCrop); } void relayout(RunningTaskInfo taskInfo, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - boolean applyStartTransactionOnDraw) { + boolean applyStartTransactionOnDraw, boolean setTaskCropAndPosition) { final int shadowRadiusID = taskInfo.isFocused ? R.dimen.freeform_decor_shadow_focused_thickness : R.dimen.freeform_decor_shadow_unfocused_thickness; @@ -118,6 +189,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL mRelayoutParams.mCaptionHeightId = getCaptionHeightId(taskInfo.getWindowingMode()); mRelayoutParams.mShadowRadiusId = shadowRadiusID; mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; + mRelayoutParams.mSetTaskPositionAndCrop = setTaskCropAndPosition; relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult); // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo @@ -214,6 +286,10 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL closeBackground.setTintList(buttonTintColor); } + boolean isHandlingDragResize() { + return mDragResizeListener != null && mDragResizeListener.isHandlingDragResize(); + } + private void closeDragResizeListener() { if (mDragResizeListener == null) { return; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index ab29df1f780c..7db3d382ed8e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -22,7 +22,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.WindowInsets.Type.statusBars; -import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; @@ -33,6 +32,7 @@ import static com.android.wm.shell.windowdecor.MoveToDesktopAnimator.DRAG_FREEFO import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.annotation.NonNull; import android.app.ActivityManager; import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityTaskManager; @@ -43,7 +43,6 @@ import android.graphics.Rect; import android.graphics.Region; import android.hardware.input.InputManager; import android.os.Handler; -import android.os.IBinder; import android.os.Looper; import android.util.SparseArray; import android.view.Choreographer; @@ -59,12 +58,9 @@ import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; import android.view.View; import android.view.ViewConfiguration; -import android.view.WindowManager; -import android.window.TransitionInfo; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; @@ -80,8 +76,6 @@ import com.android.wm.shell.desktopmode.DesktopModeStatus; import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.desktopmode.DesktopTasksController.SnapPosition; import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; -import com.android.wm.shell.recents.RecentsTransitionHandler; -import com.android.wm.shell.recents.RecentsTransitionStateListener; import com.android.wm.shell.splitscreen.SplitScreen; import com.android.wm.shell.splitscreen.SplitScreen.StageType; import com.android.wm.shell.splitscreen.SplitScreenController; @@ -115,7 +109,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private final DisplayController mDisplayController; private final SyncTransactionQueue mSyncQueue; private final Optional<DesktopTasksController> mDesktopTasksController; - private final RecentsTransitionHandler mRecentsTransitionHandler; private boolean mTransitionDragActive; private SparseArray<EventReceiver> mEventReceiversByDisplay = new SparseArray<>(); @@ -154,7 +147,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { SyncTransactionQueue syncQueue, Transitions transitions, Optional<DesktopTasksController> desktopTasksController, - RecentsTransitionHandler recentsTransitionHandler, RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer ) { this( @@ -170,7 +162,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { syncQueue, transitions, desktopTasksController, - recentsTransitionHandler, new DesktopModeWindowDecoration.Factory(), new InputMonitorFactory(), SurfaceControl.Transaction::new, @@ -191,7 +182,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { SyncTransactionQueue syncQueue, Transitions transitions, Optional<DesktopTasksController> desktopTasksController, - RecentsTransitionHandler recentsTransitionHandler, DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory, InputMonitorFactory inputMonitorFactory, Supplier<SurfaceControl.Transaction> transactionFactory, @@ -207,7 +197,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mSyncQueue = syncQueue; mTransitions = transitions; mDesktopTasksController = desktopTasksController; - mRecentsTransitionHandler = recentsTransitionHandler; mShellCommandHandler = shellCommandHandler; mDesktopModeWindowDecorFactory = desktopModeWindowDecorFactory; mInputMonitorFactory = inputMonitorFactory; @@ -219,15 +208,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private void onInit() { mShellController.addKeyguardChangeListener(mDesktopModeKeyguardChangeListener); - mRecentsTransitionHandler.addTransitionStateListener(new RecentsTransitionStateListener() { - @Override - public void onTransitionStarted(IBinder transition) { - blockRelayoutOnTransitionStarted(transition); - } - }); mShellCommandHandler.addDumpCallback(this::dump, this); mDisplayInsetsController.addInsetsChangedListener(mContext.getDisplayId(), new DesktopModeOnInsetsChangedListener()); + mDesktopTasksController.ifPresent(c -> c.setOnTaskResizeAnimationListener( + new DeskopModeOnTaskResizeAnimationListener())); } @Override @@ -264,48 +249,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } @Override - public void onTransitionReady( - @NonNull IBinder transition, - @NonNull TransitionInfo info, - @NonNull TransitionInfo.Change change) { - if (change.getMode() == WindowManager.TRANSIT_CHANGE - && (info.getType() == Transitions.TRANSIT_EXIT_DESKTOP_MODE - || info.getType() == Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE - || info.getType() == Transitions.TRANSIT_MOVE_TO_DESKTOP)) { - mWindowDecorByTaskId.get(change.getTaskInfo().taskId) - .addTransitionPausingRelayout(transition); - } else if (change.getMode() == WindowManager.TRANSIT_TO_BACK - && info.getType() == Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP - && change.getTaskInfo() != null) { - final DesktopModeWindowDecoration decor = - mWindowDecorByTaskId.get(change.getTaskInfo().taskId); - if (decor != null) { - decor.addTransitionPausingRelayout(transition); - } - } else if (change.getMode() == WindowManager.TRANSIT_TO_FRONT - && ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_GOING_AWAY) != 0) - && change.getTaskInfo() != null) { - blockRelayoutOnTransitionStarted(transition); - } - } - - @Override - public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) { - for (int i = 0; i < mWindowDecorByTaskId.size(); i++) { - final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.valueAt(i); - decor.mergeTransitionPausingRelayout(merged, playing); - } - } - - @Override - public void onTransitionFinished(@NonNull IBinder transition) { - for (int i = 0; i < mWindowDecorByTaskId.size(); i++) { - final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.valueAt(i); - decor.removeTransitionPausingRelayout(transition); - } - } - - @Override public void onTaskInfoChanged(RunningTaskInfo taskInfo) { final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId); if (decoration == null) return; @@ -335,7 +278,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { if (decoration == null) { createWindowDecoration(taskInfo, taskSurface, startT, finishT); } else { - decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */); + decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */, + false /* shouldSetTaskPositionAndCrop */); } } @@ -347,7 +291,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId); if (decoration == null) return; - decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */); + decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */, + false /* shouldSetTaskPositionAndCrop */); } @Override @@ -363,16 +308,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } } - private void blockRelayoutOnTransitionStarted(IBinder transition) { - // Block relayout on window decorations originating from #onTaskInfoChanges until the - // animation completes to avoid interfering with the transition animation. - for (int i = 0; i < mWindowDecorByTaskId.size(); i++) { - final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.valueAt(i); - decor.incrementRelayoutBlock(); - decor.addTransitionPausingRelayout(transition); - } - } - private class DesktopModeTouchEventListener extends GestureDetector.SimpleOnGestureListener implements View.OnClickListener, View.OnTouchListener, View.OnLongClickListener, DragDetector.MotionEventHandler { @@ -412,7 +347,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mTaskOperations.injectBackKey(); } else if (id == R.id.caption_handle || id == R.id.open_menu_button) { if (!decoration.isHandleMenuActive()) { - moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId)); + moveTaskToFront(decoration.mTaskInfo); decoration.createHandleMenu(); } else { decoration.closeHandleMenu(); @@ -423,8 +358,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { // App sometimes draws before the insets from WindowDecoration#relayout have // been added, so they must be added here mWindowDecorByTaskId.get(mTaskId).addCaptionInset(wct); - decoration.incrementRelayoutBlock(); - mDesktopTasksController.get().moveToDesktop(decoration, mTaskId, wct); + mDesktopTasksController.get().moveToDesktop(mTaskId, wct); closeOtherSplitTask(mTaskId); } decoration.closeHandleMenu(); @@ -434,7 +368,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mSplitScreenController.moveTaskToFullscreen(mTaskId); } else { mDesktopTasksController.ifPresent(c -> - c.moveToFullscreen(mTaskId, mWindowDecorByTaskId.get(mTaskId))); + c.moveToFullscreen(mTaskId)); } } else if (id == R.id.split_screen_button) { decoration.closeHandleMenu(); @@ -455,25 +389,23 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return; } final RunningTaskInfo taskInfo = decoration.mTaskInfo; - mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize( - taskInfo, decoration)); + mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize(taskInfo)); decoration.closeHandleMenu(); } else if (id == R.id.maximize_menu_maximize_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; - mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId))); + mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize(taskInfo)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } else if (id == R.id.maximize_menu_snap_left_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; mDesktopTasksController.ifPresent(c -> c.snapToHalfScreen( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId), SnapPosition.LEFT)); + taskInfo, SnapPosition.LEFT)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } else if (id == R.id.maximize_menu_snap_right_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; mDesktopTasksController.ifPresent(c -> c.snapToHalfScreen( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId), SnapPosition.RIGHT)); + taskInfo, SnapPosition.RIGHT)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } @@ -487,11 +419,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { && id != R.id.maximize_window) { return false; } - moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId)); + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); + moveTaskToFront(decoration.mTaskInfo); - if (!mHasLongClicked) { - final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); - decoration.closeMaximizeMenu(); + if (!mHasLongClicked && id != R.id.maximize_window) { + decoration.closeMaximizeMenuIfNeeded(e); } final long eventDuration = e.getEventTime() - e.getDownTime(); @@ -534,7 +466,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { */ @Override public boolean handleMotionEvent(@Nullable View v, MotionEvent e) { - final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId); + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); + final RunningTaskInfo taskInfo = decoration.mTaskInfo; if (DesktopModeStatus.isEnabled() && taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { return false; @@ -559,8 +492,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return true; } case MotionEvent.ACTION_MOVE: { - final DesktopModeWindowDecoration decoration = - mWindowDecorByTaskId.get(mTaskId); + mShouldClick = false; + // If a decor's resize drag zone is active, don't also try to reposition it. + if (decoration.isHandlingDragResize()) break; decoration.closeMaximizeMenu(); if (e.findPointerIndex(mDragPointerId) == -1) { mDragPointerId = e.getPointerId(0); @@ -570,10 +504,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)); mDesktopTasksController.ifPresent(c -> c.onDragPositioningMove(taskInfo, decoration.mTaskSurface, - new PointF(e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)), + e.getRawX(dragPointerIdx), newTaskBounds)); mIsDragging = true; - mShouldClick = false; return true; } case MotionEvent.ACTION_UP: @@ -602,7 +535,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mDesktopTasksController.ifPresent(c -> c.onDragPositioningEnd(taskInfo, position, new PointF(e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx)), - newTaskBounds, mWindowDecorByTaskId.get(mTaskId))); + newTaskBounds)); mIsDragging = false; return true; } @@ -610,11 +543,22 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return true; } + /** + * Perform a task size toggle on release of the double-tap, assuming no drag event + * was handled during the double-tap. + * @param e The motion event that occurred during the double-tap gesture. + * @return true if the event should be consumed, false if not + */ @Override - public boolean onDoubleTap(@NonNull MotionEvent e) { - final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId); + public boolean onDoubleTapEvent(@NonNull MotionEvent e) { + final int action = e.getActionMasked(); + if (mIsDragging || (action != MotionEvent.ACTION_UP + && action != MotionEvent.ACTION_CANCEL)) { + return false; + } mDesktopTasksController.ifPresent(c -> { - c.toggleDesktopTaskSize(taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId)); + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); + c.toggleDesktopTaskSize(decoration.mTaskInfo); }); return true; } @@ -711,7 +655,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { handleCaptionThroughStatusBar(ev, relevantDecor); } } - handleEventOutsideFocusedCaption(ev, relevantDecor); + handleEventOutsideCaption(ev, relevantDecor); // Prevent status bar from reacting to a caption drag. if (DesktopModeStatus.isEnabled()) { if (mTransitionDragActive) { @@ -720,8 +664,14 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } } - // If an UP/CANCEL action is received outside of caption bounds, turn off handle menu - private void handleEventOutsideFocusedCaption(MotionEvent ev, + /** + * If an UP/CANCEL action is received outside of the caption bounds, close the handle and + * maximize the menu. + * + * @param relevantDecor the window decoration of the focused task's caption. This method only + * handles motion events outside this caption's bounds. + */ + private void handleEventOutsideCaption(MotionEvent ev, DesktopModeWindowDecoration relevantDecor) { // Returns if event occurs within caption if (relevantDecor == null || relevantDecor.checkTouchEventInCaption(ev)) { @@ -759,7 +709,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { || windowingMode == WINDOWING_MODE_MULTI_WINDOW; } - if (dragFromStatusBarAllowed && relevantDecor.checkTouchEventInHandle(ev)) { + if (dragFromStatusBarAllowed + && relevantDecor.checkTouchEventInFocusedCaptionHandle(ev)) { mTransitionDragActive = true; } } @@ -798,9 +749,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } if (mTransitionDragActive) { mDesktopTasksController.ifPresent( - c -> c.onDragPositioningMoveThroughStatusBar( + c -> c.updateVisualIndicator( relevantDecor.mTaskInfo, - relevantDecor.mTaskSurface, ev.getY())); + relevantDecor.mTaskSurface, ev.getX(), ev.getY())); final int statusBarHeight = getStatusBarHeight( relevantDecor.mTaskInfo.displayId); if (ev.getY() > statusBarHeight) { @@ -809,20 +760,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mContext, mDragToDesktopAnimationStartBounds, relevantDecor.mTaskInfo, relevantDecor.mTaskSurface); mDesktopTasksController.ifPresent( - c -> { - final int taskId = relevantDecor.mTaskInfo.taskId; - relevantDecor.incrementRelayoutBlock(); - if (isTaskInSplitScreen(taskId)) { - final DesktopModeWindowDecoration otherDecor = - mWindowDecorByTaskId.get( - getOtherSplitTask(taskId).taskId); - if (otherDecor != null) { - otherDecor.incrementRelayoutBlock(); - } - } - c.startDragToDesktop(relevantDecor.mTaskInfo, - mMoveToDesktopAnimator, relevantDecor); - }); + c -> c.startDragToDesktop(relevantDecor.mTaskInfo, + mMoveToDesktopAnimator)); } } if (mMoveToDesktopAnimator != null) { @@ -904,7 +843,18 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { @Nullable private DesktopModeWindowDecoration getRelevantWindowDecor(MotionEvent ev) { - if (mSplitScreenController != null && mSplitScreenController.isSplitScreenVisible()) { + final DesktopModeWindowDecoration focusedDecor = getFocusedDecor(); + if (focusedDecor == null) { + return null; + } + final boolean splitScreenVisible = mSplitScreenController != null + && mSplitScreenController.isSplitScreenVisible(); + // It's possible that split tasks are visible but neither is focused, such as when there's + // a fullscreen translucent window on top of them. In that case, the relevant decor should + // just be that translucent focused window. + final boolean focusedTaskInSplit = mSplitScreenController != null + && mSplitScreenController.isTaskInSplitScreen(focusedDecor.mTaskInfo.taskId); + if (splitScreenVisible && focusedTaskInSplit) { // We can't look at focused task here as only one task will have focus. DesktopModeWindowDecoration splitTaskDecor = getSplitScreenDecor(ev); return splitTaskDecor == null ? getFocusedDecor() : splitTaskDecor; @@ -938,7 +888,10 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { private DesktopModeWindowDecoration getFocusedDecor() { final int size = mWindowDecorByTaskId.size(); DesktopModeWindowDecoration focusedDecor = null; - for (int i = 0; i < size; i++) { + // TODO(b/323251951): We need to iterate this in reverse to avoid potentially getting + // a decor for a closed task. This is a short term fix while the core issue is addressed, + // which involves refactoring the window decor lifecycle to be visibility based. + for (int i = size - 1; i >= 0; i--) { final DesktopModeWindowDecoration decor = mWindowDecorByTaskId.valueAt(i); if (decor != null && decor.isFocused()) { focusedDecor = decor; @@ -1010,8 +963,23 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration); windowDecoration.createResizeVeil(); - final DragPositioningCallback dragPositioningCallback = createDragPositioningCallback( - windowDecoration); + final DragPositioningCallback dragPositioningCallback; + final int transitionAreaHeight = mContext.getResources().getDimensionPixelSize( + R.dimen.desktop_mode_transition_area_height); + if (!DesktopModeStatus.isVeiledResizeEnabled()) { + dragPositioningCallback = new FluidResizeTaskPositioner( + mTaskOrganizer, mTransitions, windowDecoration, mDisplayController, + mDragStartListener, mTransactionFactory, transitionAreaHeight); + windowDecoration.setTaskDragResizer( + (FluidResizeTaskPositioner) dragPositioningCallback); + } else { + dragPositioningCallback = new VeiledResizeTaskPositioner( + mTaskOrganizer, windowDecoration, mDisplayController, + mDragStartListener, mTransitions, transitionAreaHeight); + windowDecoration.setTaskDragResizer( + (VeiledResizeTaskPositioner) dragPositioningCallback); + } + final DesktopModeTouchEventListener touchEventListener = new DesktopModeTouchEventListener(taskInfo, dragPositioningCallback); @@ -1021,23 +989,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { windowDecoration.setDragPositioningCallback(dragPositioningCallback); windowDecoration.setDragDetector(touchEventListener.mDragDetector); windowDecoration.relayout(taskInfo, startT, finishT, - false /* applyStartTransactionOnDraw */); + false /* applyStartTransactionOnDraw */, false /* shouldSetTaskPositionAndCrop */); incrementEventReceiverTasks(taskInfo.displayId); } - private DragPositioningCallback createDragPositioningCallback( - @NonNull DesktopModeWindowDecoration windowDecoration) { - final int transitionAreaHeight = mContext.getResources().getDimensionPixelSize( - R.dimen.desktop_mode_transition_area_height); - if (!DesktopModeStatus.isVeiledResizeEnabled()) { - return new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration, - mDisplayController, mDragStartListener, mTransactionFactory, - transitionAreaHeight); - } else { - return new VeiledResizeTaskPositioner(mTaskOrganizer, windowDecoration, - mDisplayController, mDragStartListener, mTransitions, - transitionAreaHeight); - } - } private RunningTaskInfo getOtherSplitTask(int taskId) { @SplitPosition int remainingTaskPosition = mSplitScreenController @@ -1066,6 +1020,34 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { pw.println(innerPrefix + "mWindowDecorByTaskId=" + mWindowDecorByTaskId); } + private class DeskopModeOnTaskResizeAnimationListener + implements OnTaskResizeAnimationListener { + @Override + public void onAnimationStart(int taskId, Transaction t, Rect bounds) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) { + t.apply(); + return; + } + decoration.showResizeVeil(t, bounds); + } + + @Override + public void onBoundsChange(int taskId, Transaction t, Rect bounds) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) return; + decoration.updateResizeVeil(t, bounds); + } + + @Override + public void onAnimationEnd(int taskId) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) return; + decoration.hideResizeVeil(); + } + } + + private class DragStartListenerImpl implements DragPositioningCallbackUtility.DragStartListener { @Override @@ -1138,7 +1120,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } } } - } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 6ec91e0e28dd..3f0a28118597 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -36,8 +36,6 @@ import android.graphics.Rect; import android.graphics.Region; import android.graphics.drawable.Drawable; import android.os.Handler; -import android.os.IBinder; -import android.util.Log; import android.view.Choreographer; import android.view.MotionEvent; import android.view.SurfaceControl; @@ -46,6 +44,7 @@ import android.view.ViewConfiguration; import android.widget.ImageButton; import android.window.WindowContainerTransaction; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.ScreenDecorationsUtils; import com.android.launcher3.icons.BaseIconFactory; import com.android.launcher3.icons.IconProvider; @@ -61,8 +60,6 @@ import com.android.wm.shell.windowdecor.viewholder.DesktopModeAppControlsWindowD import com.android.wm.shell.windowdecor.viewholder.DesktopModeFocusedWindowDecorationViewHolder; import com.android.wm.shell.windowdecor.viewholder.DesktopModeWindowDecorationViewHolder; -import java.util.HashSet; -import java.util.Set; import java.util.function.Supplier; /** @@ -103,8 +100,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin private ExclusionRegionListener mExclusionRegionListener; - private final Set<IBinder> mTransitionsPausingRelayout = new HashSet<>(); - private int mRelayoutBlock; private final RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer; DesktopModeWindowDecoration( @@ -178,63 +173,34 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin @Override void relayout(ActivityManager.RunningTaskInfo taskInfo) { - // TaskListener callbacks and shell transitions aren't synchronized, so starting a shell - // transition can trigger an onTaskInfoChanged call that updates the task's SurfaceControl - // and interferes with the transition animation that is playing at the same time. - if (mRelayoutBlock > 0) { - return; - } - final SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); + // The crop and position of the task should only be set when a task is fluid resizing. In + // all other cases, it is expected that the transition handler positions and crops the task + // in order to allow the handler time to animate before the task before the final + // position and crop are set. + final boolean shouldSetTaskPositionAndCrop = !DesktopModeStatus.isVeiledResizeEnabled() + && mTaskDragResizer.isResizingOrAnimating(); // Use |applyStartTransactionOnDraw| so that the transaction (that applies task crop) is // synced with the buffer transaction (that draws the View). Both will be shown on screen // at the same, whereas applying them independently causes flickering. See b/270202228. - relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */); + relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */, + shouldSetTaskPositionAndCrop); } void relayout(ActivityManager.RunningTaskInfo taskInfo, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - boolean applyStartTransactionOnDraw) { - final int shadowRadiusID = taskInfo.isFocused - ? R.dimen.freeform_decor_shadow_focused_thickness - : R.dimen.freeform_decor_shadow_unfocused_thickness; - final boolean isFreeform = - taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM; - final boolean isDragResizeable = isFreeform && taskInfo.isResizeable; - + boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) { if (isHandleMenuActive()) { mHandleMenu.relayout(startT); } + updateRelayoutParams(mRelayoutParams, mContext, taskInfo, applyStartTransactionOnDraw, + shouldSetTaskPositionAndCrop); + final WindowDecorLinearLayout oldRootView = mResult.mRootView; final SurfaceControl oldDecorationSurface = mDecorationContainerSurface; final WindowContainerTransaction wct = new WindowContainerTransaction(); - final int windowDecorLayoutId = getDesktopModeWindowDecorLayoutId( - taskInfo.getWindowingMode()); - mRelayoutParams.reset(); - mRelayoutParams.mRunningTaskInfo = taskInfo; - mRelayoutParams.mLayoutResId = windowDecorLayoutId; - mRelayoutParams.mCaptionHeightId = getCaptionHeightId(taskInfo.getWindowingMode()); - mRelayoutParams.mShadowRadiusId = shadowRadiusID; - mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; - // The configuration used to lay out the window decoration. The system context's config is - // used when the task density has been overridden to a custom density so that the resources - // and views of the decoration aren't affected and match the rest of the System UI, if not - // then just use the task's configuration. A copy is made instead of using the original - // reference so that the configuration isn't mutated on config changes and diff checks can - // be made in WindowDecoration#relayout using the pre/post-relayout configuration. - // See b/301119301. - // TODO(b/301119301): consider moving the config data needed for diffs to relayout params - // instead of using a whole Configuration as a parameter. - final Configuration windowDecorConfig = new Configuration(); - windowDecorConfig.setTo(DesktopTasksController.isDesktopDensityOverrideSet() - ? mContext.getResources().getConfiguration() // Use system context. - : mTaskInfo.configuration); // Use task configuration. - mRelayoutParams.mWindowDecorConfig = windowDecorConfig; - - mRelayoutParams.mCornerRadius = - (int) ScreenDecorationsUtils.getWindowCornerRadius(mContext); relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult); // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo @@ -273,6 +239,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin closeMaximizeMenu(); } + final boolean isFreeform = + taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM; + final boolean isDragResizeable = isFreeform && taskInfo.isResizeable; if (!isDragResizeable) { if (!mTaskInfo.positionInParent.equals(mPositionInParent)) { // We still want to track caption bar's exclusion region on a non-resizeable task. @@ -323,6 +292,59 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } } + @VisibleForTesting + static void updateRelayoutParams( + RelayoutParams relayoutParams, + Context context, + ActivityManager.RunningTaskInfo taskInfo, + boolean applyStartTransactionOnDraw, + boolean shouldSetTaskPositionAndCrop) { + relayoutParams.reset(); + relayoutParams.mRunningTaskInfo = taskInfo; + relayoutParams.mLayoutResId = + getDesktopModeWindowDecorLayoutId(taskInfo.getWindowingMode()); + relayoutParams.mCaptionHeightId = getCaptionHeightIdStatic(taskInfo.getWindowingMode()); + relayoutParams.mCaptionWidthId = getCaptionWidthId(relayoutParams.mLayoutResId); + if (DesktopModeStatus.useWindowShadow(/* isFocusedWindow= */ taskInfo.isFocused)) { + relayoutParams.mShadowRadiusId = taskInfo.isFocused + ? R.dimen.freeform_decor_shadow_focused_thickness + : R.dimen.freeform_decor_shadow_unfocused_thickness; + } + relayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; + relayoutParams.mSetTaskPositionAndCrop = shouldSetTaskPositionAndCrop; + // The configuration used to lay out the window decoration. The system context's config is + // used when the task density has been overridden to a custom density so that the resources + // and views of the decoration aren't affected and match the rest of the System UI, if not + // then just use the task's configuration. A copy is made instead of using the original + // reference so that the configuration isn't mutated on config changes and diff checks can + // be made in WindowDecoration#relayout using the pre/post-relayout configuration. + // See b/301119301. + // TODO(b/301119301): consider moving the config data needed for diffs to relayout params + // instead of using a whole Configuration as a parameter. + final Configuration windowDecorConfig = new Configuration(); + windowDecorConfig.setTo(DesktopTasksController.isDesktopDensityOverrideSet() + ? context.getResources().getConfiguration() // Use system context. + : taskInfo.configuration); // Use task configuration. + relayoutParams.mWindowDecorConfig = windowDecorConfig; + + if (DesktopModeStatus.useRoundedCorners()) { + relayoutParams.mCornerRadius = + (int) ScreenDecorationsUtils.getWindowCornerRadius(context); + } + } + + /** + * If task has focused window decor, return the caption id of the fullscreen caption size + * resource. Otherwise, return ID_NULL and caption width be set to task width. + */ + private static int getCaptionWidthId(int layoutResId) { + if (layoutResId == R.layout.desktop_mode_focused_window_decor) { + return R.dimen.desktop_mode_fullscreen_decor_caption_width; + } + return Resources.ID_NULL; + } + + private PointF calculateMaximizeMenuPosition() { final PointF position = new PointF(); final Resources resources = mContext.getResources(); @@ -364,24 +386,21 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin return mHandleMenu != null; } + boolean isHandlingDragResize() { + return mDragResizeListener != null && mDragResizeListener.isHandlingDragResize(); + } + private void loadAppInfo() { - String packageName = mTaskInfo.realActivity.getPackageName(); PackageManager pm = mContext.getApplicationContext().getPackageManager(); - try { - final IconProvider provider = new IconProvider(mContext); - mAppIconDrawable = provider.getIcon(pm.getActivityInfo(mTaskInfo.baseActivity, - PackageManager.ComponentInfoFlags.of(0))); - final Resources resources = mContext.getResources(); - final BaseIconFactory factory = new BaseIconFactory(mContext, - resources.getDisplayMetrics().densityDpi, - resources.getDimensionPixelSize(R.dimen.desktop_mode_caption_icon_radius)); - mAppIconBitmap = factory.createScaledBitmap(mAppIconDrawable, MODE_DEFAULT); - final ApplicationInfo applicationInfo = pm.getApplicationInfo(packageName, - PackageManager.ApplicationInfoFlags.of(0)); - mAppName = pm.getApplicationLabel(applicationInfo); - } catch (PackageManager.NameNotFoundException e) { - Log.w(TAG, "Package not found: " + packageName, e); - } + final IconProvider provider = new IconProvider(mContext); + mAppIconDrawable = provider.getIcon(mTaskInfo.topActivityInfo); + final Resources resources = mContext.getResources(); + final BaseIconFactory factory = new BaseIconFactory(mContext, + resources.getDisplayMetrics().densityDpi, + resources.getDimensionPixelSize(R.dimen.desktop_mode_caption_icon_radius)); + mAppIconBitmap = factory.createScaledBitmap(mAppIconDrawable, MODE_DEFAULT); + final ApplicationInfo applicationInfo = mTaskInfo.topActivityInfo.applicationInfo; + mAppName = pm.getApplicationLabel(applicationInfo); } private void closeDragResizeListener() { @@ -443,6 +462,66 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } /** + * Determine valid drag area for this task based on elements in the app chip. + */ + @Override + Rect calculateValidDragArea() { + final int appTextWidth = ((DesktopModeAppControlsWindowDecorationViewHolder) + mWindowDecorViewHolder).getAppNameTextWidth(); + final int leftButtonsWidth = loadDimensionPixelSize(mContext.getResources(), + R.dimen.desktop_mode_app_details_width_minus_text) + appTextWidth; + final int requiredEmptySpace = loadDimensionPixelSize(mContext.getResources(), + R.dimen.freeform_required_visible_empty_space_in_header); + final int rightButtonsWidth = loadDimensionPixelSize(mContext.getResources(), + R.dimen.desktop_mode_right_edge_buttons_width); + final int taskWidth = mTaskInfo.configuration.windowConfiguration.getBounds().width(); + final DisplayLayout layout = mDisplayController.getDisplayLayout(mTaskInfo.displayId); + final int displayWidth = layout.width(); + final Rect stableBounds = new Rect(); + layout.getStableBounds(stableBounds); + return new Rect( + determineMinX(leftButtonsWidth, rightButtonsWidth, requiredEmptySpace, + taskWidth), + stableBounds.top, + determineMaxX(leftButtonsWidth, rightButtonsWidth, requiredEmptySpace, + taskWidth, displayWidth), + determineMaxY(requiredEmptySpace, stableBounds)); + } + + + /** + * Determine the lowest x coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMinX(int leftButtonsWidth, int rightButtonsWidth, int requiredEmptySpace, + int taskWidth) { + // Do not let apps with < 48dp empty header space go off the left edge at all. + if (leftButtonsWidth + rightButtonsWidth + requiredEmptySpace > taskWidth) { + return 0; + } + return -taskWidth + requiredEmptySpace + rightButtonsWidth; + } + + /** + * Determine the highest x coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMaxX(int leftButtonsWidth, int rightButtonsWidth, int requiredEmptySpace, + int taskWidth, int displayWidth) { + // Do not let apps with < 48dp empty header space go off the right edge at all. + if (leftButtonsWidth + rightButtonsWidth + requiredEmptySpace > taskWidth) { + return displayWidth - taskWidth; + } + return displayWidth - requiredEmptySpace - leftButtonsWidth; + } + + /** + * Determine the highest y coordinate of a freeform task. Used for restricting drag inputs. + */ + private int determineMaxY(int requiredEmptySpace, Rect stableBounds) { + return stableBounds.bottom - requiredEmptySpace; + } + + + /** * Create and display maximize menu window */ void createMaximizeMenu() { @@ -475,7 +554,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin .setOnClickListener(mOnCaptionButtonClickListener) .setOnTouchListener(mOnCaptionTouchListener) .setLayoutId(mRelayoutParams.mLayoutResId) - .setCaptionPosition(mRelayoutParams.mCaptionX, mRelayoutParams.mCaptionY) .setWindowingButtonsVisible(DesktopModeStatus.isEnabled()) .setCaptionHeight(mResult.mCaptionHeight) .build(); @@ -530,8 +608,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin void closeMaximizeMenuIfNeeded(MotionEvent ev) { if (!isMaximizeMenuActive()) return; - final PointF inputPoint = offsetCaptionLocation(ev); - if (!mMaximizeMenu.isValidMenuInput(inputPoint)) { + if (!mMaximizeMenu.isValidMenuInput(ev)) { closeMaximizeMenu(); } } @@ -552,35 +629,39 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mTaskOrganizer.getRunningTaskInfo(mTaskInfo.taskId); if (taskInfo == null) return result; final Point positionInParent = taskInfo.positionInParent; - result.offset(-mRelayoutParams.mCaptionX, -mRelayoutParams.mCaptionY); result.offset(-positionInParent.x, -positionInParent.y); return result; } /** - * Determine if a passed MotionEvent is in a view in caption + * Checks if motion event occurs in the caption handle area of a focused caption (the caption on + * a task in fullscreen or in multi-windowing mode). This should be used in cases where + * onTouchListener will not work (i.e. when caption is in status bar area). * * @param ev the {@link MotionEvent} to check - * @param layoutId the id of the view - * @return {@code true} if event is inside the specified view, {@code false} if not + * @return {@code true} if event is inside caption handle view, {@code false} if not */ - private boolean checkEventInCaptionView(MotionEvent ev, int layoutId) { - if (mResult.mRootView == null) return false; - final PointF inputPoint = offsetCaptionLocation(ev); - final View view = mResult.mRootView.findViewById(layoutId); - return view != null && pointInView(view, inputPoint.x, inputPoint.y); - } + boolean checkTouchEventInFocusedCaptionHandle(MotionEvent ev) { + if (isHandleMenuActive() || !(mWindowDecorViewHolder + instanceof DesktopModeFocusedWindowDecorationViewHolder)) { + return false; + } - boolean checkTouchEventInHandle(MotionEvent ev) { - if (isHandleMenuActive()) return false; - return checkEventInCaptionView(ev, R.id.caption_handle); + return checkTouchEventInCaption(ev); } /** - * Returns true if motion event is within the caption's root view's bounds. + * Checks if touch event occurs in caption. + * + * @param ev the {@link MotionEvent} to check + * @return {@code true} if event is inside caption view, {@code false} if not */ boolean checkTouchEventInCaption(MotionEvent ev) { - return checkEventInCaptionView(ev, getCaptionViewId()); + final PointF inputPoint = offsetCaptionLocation(ev); + return inputPoint.x >= mResult.mCaptionX + && inputPoint.x <= mResult.mCaptionX + mResult.mCaptionWidth + && inputPoint.y >= 0 + && inputPoint.y <= mResult.mCaptionHeight; } /** @@ -593,24 +674,19 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin void checkClickEvent(MotionEvent ev) { if (mResult.mRootView == null) return; if (!isHandleMenuActive()) { + // Click if point in caption handle view final View caption = mResult.mRootView.findViewById(R.id.desktop_mode_caption); final View handle = caption.findViewById(R.id.caption_handle); - clickIfPointInView(new PointF(ev.getX(), ev.getY()), handle); + if (checkTouchEventInFocusedCaptionHandle(ev)) { + mOnCaptionButtonClickListener.onClick(handle); + } } else { mHandleMenu.checkClickEvent(ev); closeHandleMenuIfNeeded(ev); } } - private boolean clickIfPointInView(PointF inputPoint, View v) { - if (pointInView(v, inputPoint.x, inputPoint.y)) { - mOnCaptionButtonClickListener.onClick(v); - return true; - } - return false; - } - - boolean pointInView(View v, float x, float y) { + private boolean pointInView(View v, float x, float y) { return v != null && v.getLeft() <= x && v.getRight() >= x && v.getTop() <= y && v.getBottom() >= y; } @@ -624,7 +700,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin super.close(); } - private int getDesktopModeWindowDecorLayoutId(@WindowingMode int windowingMode) { + private static int getDesktopModeWindowDecorLayoutId(@WindowingMode int windowingMode) { return windowingMode == WINDOWING_MODE_FREEFORM ? R.layout.desktop_mode_app_controls_window_decor : R.layout.desktop_mode_focused_window_decor; @@ -658,18 +734,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin return exclusionRegion; } - /** - * If transition exists in mTransitionsPausingRelayout, remove the transition and decrement - * mRelayoutBlock - */ - void removeTransitionPausingRelayout(IBinder transition) { - if (mTransitionsPausingRelayout.remove(transition)) { - mRelayoutBlock--; - } - } - @Override int getCaptionHeightId(@WindowingMode int windowingMode) { + return getCaptionHeightIdStatic(windowingMode); + } + + private static int getCaptionHeightIdStatic(@WindowingMode int windowingMode) { return windowingMode == WINDOWING_MODE_FULLSCREEN ? R.dimen.desktop_mode_fullscreen_decor_caption_height : R.dimen.desktop_mode_freeform_decor_caption_height; @@ -684,35 +754,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin return R.id.desktop_mode_caption; } - /** - * Add transition to mTransitionsPausingRelayout - */ - void addTransitionPausingRelayout(IBinder transition) { - mTransitionsPausingRelayout.add(transition); - } - - /** - * If two transitions merge and the merged transition is in mTransitionsPausingRelayout, - * remove the merged transition from the set and add the transition it was merged into. - */ - public void mergeTransitionPausingRelayout(IBinder merged, IBinder playing) { - if (mTransitionsPausingRelayout.remove(merged)) { - mTransitionsPausingRelayout.add(playing); - } - } - - /** - * Increase mRelayoutBlock, stopping relayout if mRelayoutBlock is now greater than 0. - */ - public void incrementRelayoutBlock() { - mRelayoutBlock++; - } - @Override public String toString() { return "{" + "mPositionInParent=" + mPositionInParent + ", " - + "mRelayoutBlock=" + mRelayoutBlock + ", " + "taskId=" + mTaskInfo.taskId + ", " + "windowingMode=" + windowingModeToString(mTaskInfo.getWindowingMode()) + ", " + "isFocused=" + isFocused() diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtility.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtility.java index cb0a6c733fe3..5afbd54088d1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtility.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtility.java @@ -26,9 +26,7 @@ import android.graphics.PointF; import android.graphics.Rect; import android.util.DisplayMetrics; import android.view.SurfaceControl; -import android.window.WindowContainerTransaction; -import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; /** @@ -130,8 +128,7 @@ public class DragPositioningCallbackUtility { Rect taskBoundsAtDragStart, PointF repositionStartPoint, SurfaceControl.Transaction t, float x, float y) { updateTaskBounds(repositionTaskBounds, taskBoundsAtDragStart, repositionStartPoint, x, y); - t.setPosition(decoration.mTaskSurface, repositionTaskBounds.left, - repositionTaskBounds.top); + t.setPosition(decoration.mTaskSurface, repositionTaskBounds.left, repositionTaskBounds.top); } private static void updateTaskBounds(Rect repositionTaskBounds, Rect taskBoundsAtDragStart, @@ -162,31 +159,30 @@ public class DragPositioningCallbackUtility { /** * Updates repositionTaskBounds to the final bounds of the task after the drag is finished. If - * the bounds are outside of the stable bounds, they are shifted to place task at the top of the - * stable bounds. + * the bounds are outside of the valid drag area, the task is shifted back onto the edge of the + * valid drag area. */ - static void onDragEnd(Rect repositionTaskBounds, Rect taskBoundsAtDragStart, Rect stableBounds, - PointF repositionStartPoint, float x, float y) { + static void onDragEnd(Rect repositionTaskBounds, Rect taskBoundsAtDragStart, + PointF repositionStartPoint, float x, float y, Rect validDragArea) { updateTaskBounds(repositionTaskBounds, taskBoundsAtDragStart, repositionStartPoint, x, y); - - // If task is outside of stable bounds (in the status bar area), shift the task down. - if (stableBounds.top > repositionTaskBounds.top) { - final int yShift = stableBounds.top - repositionTaskBounds.top; - repositionTaskBounds.offset(0, yShift); - } + snapTaskBoundsIfNecessary(repositionTaskBounds, validDragArea); } - /** - * Apply a bounds change to a task. - * @param windowDecoration decor of task we are changing bounds for - * @param taskBounds new bounds of this task - * @param taskOrganizer applies the provided WindowContainerTransaction - */ - static void applyTaskBoundsChange(WindowContainerTransaction wct, - WindowDecoration windowDecoration, Rect taskBounds, ShellTaskOrganizer taskOrganizer) { - wct.setBounds(windowDecoration.mTaskInfo.token, taskBounds); - taskOrganizer.applyTransaction(wct); + private static void snapTaskBoundsIfNecessary(Rect repositionTaskBounds, Rect validDragArea) { + // If we were never supplied a valid drag area, do not restrict movement. + // Otherwise, we restrict deltas to keep task position inside the Rect. + if (validDragArea.width() == 0) return; + if (repositionTaskBounds.left < validDragArea.left) { + repositionTaskBounds.offset(validDragArea.left - repositionTaskBounds.left, 0); + } else if (repositionTaskBounds.left > validDragArea.right) { + repositionTaskBounds.offset(validDragArea.right - repositionTaskBounds.left, 0); + } + if (repositionTaskBounds.top < validDragArea.top) { + repositionTaskBounds.offset(0, validDragArea.top - repositionTaskBounds.top); + } else if (repositionTaskBounds.top > validDragArea.bottom) { + repositionTaskBounds.offset(0, validDragArea.bottom - repositionTaskBounds.top); + } } private static float getMinWidth(DisplayController displayController, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java index 8511a21d4294..e83e5d1ef5a5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java @@ -49,6 +49,7 @@ import android.view.SurfaceControl; import android.view.View; import android.view.ViewConfiguration; import android.view.WindowManagerGlobal; +import android.window.InputTransferToken; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayLayout; @@ -74,7 +75,7 @@ class DragResizeInputListener implements AutoCloseable { private final IBinder mClientToken; - private final IBinder mFocusGrantToken; + private final InputTransferToken mInputTransferToken; private final SurfaceControl mDecorationSurface; private final InputChannel mInputChannel; private final TaskResizeInputEventReceiver mInputEventReceiver; @@ -121,7 +122,7 @@ class DragResizeInputListener implements AutoCloseable { mDecorationSurface = decorationSurface; mDisplayController = displayController; mClientToken = new Binder(); - mFocusGrantToken = new Binder(); + mInputTransferToken = new InputTransferToken(); mInputChannel = new InputChannel(); try { mWindowSession.grantInputChannel( @@ -134,7 +135,7 @@ class DragResizeInputListener implements AutoCloseable { INPUT_FEATURE_SPY, TYPE_APPLICATION, null /* windowToken */, - mFocusGrantToken, + mInputTransferToken, TAG + " of " + decorationSurface.toString(), mInputChannel); } catch (RemoteException e) { @@ -169,7 +170,7 @@ class DragResizeInputListener implements AutoCloseable { INPUT_FEATURE_NO_INPUT_CHANNEL, TYPE_INPUT_CONSUMER, null /* windowToken */, - mFocusGrantToken, + mInputTransferToken, "TaskInputSink of " + decorationSurface, mSinkInputChannel); } catch (RemoteException e) { @@ -320,6 +321,10 @@ class DragResizeInputListener implements AutoCloseable { } } + boolean isHandlingDragResize() { + return mInputEventReceiver.isHandlingEvents(); + } + @Override public void close() { mInputEventReceiver.dispose(); @@ -349,6 +354,7 @@ class DragResizeInputListener implements AutoCloseable { private boolean mShouldHandleEvents; private int mLastCursorType = PointerIcon.TYPE_DEFAULT; private Rect mDragStartTaskBounds; + private final Rect mTmpRect = new Rect(); private TaskResizeInputEventReceiver( InputChannel inputChannel, Handler handler, Choreographer choreographer) { @@ -386,6 +392,10 @@ class DragResizeInputListener implements AutoCloseable { finishInputEvent(inputEvent, handleInputEvent(inputEvent)); } + boolean isHandlingEvents() { + return mShouldHandleEvents; + } + private boolean handleInputEvent(InputEvent inputEvent) { if (!(inputEvent instanceof MotionEvent)) { return false; @@ -409,7 +419,6 @@ class DragResizeInputListener implements AutoCloseable { mShouldHandleEvents = isInResizeHandleBounds(x, y); } if (mShouldHandleEvents) { - mInputManager.pilferPointers(mInputChannel.getToken()); mDragPointerId = e.getPointerId(0); float rawX = e.getRawX(0); float rawY = e.getRawY(0); @@ -427,6 +436,7 @@ class DragResizeInputListener implements AutoCloseable { if (!mShouldHandleEvents) { break; } + mInputManager.pilferPointers(mInputChannel.getToken()); int dragPointerIndex = e.findPointerIndex(mDragPointerId); float rawX = e.getRawX(dragPointerIndex); float rawY = e.getRawY(dragPointerIndex); @@ -437,6 +447,7 @@ class DragResizeInputListener implements AutoCloseable { } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { + mInputManager.pilferPointers(mInputChannel.getToken()); if (mShouldHandleEvents) { int dragPointerIndex = e.findPointerIndex(mDragPointerId); final Rect taskBounds = mCallback.onDragPositioningEnd( @@ -468,14 +479,15 @@ class DragResizeInputListener implements AutoCloseable { } private void updateInputSinkRegionForDrag(Rect taskBounds) { + mTmpRect.set(taskBounds); final DisplayLayout layout = mDisplayController.getDisplayLayout(mDisplayId); final Region dragTouchRegion = new Region(-taskBounds.left, -taskBounds.top, -taskBounds.left + layout.width(), -taskBounds.top + layout.height()); // Remove the localized task bounds from the touch region. - taskBounds.offsetTo(0, 0); - dragTouchRegion.op(taskBounds, Region.Op.DIFFERENCE); + mTmpRect.offsetTo(0, 0); + dragTouchRegion.op(mTmpRect, Region.Op.DIFFERENCE); updateSinkInputChannel(dragTouchRegion); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java index 3a1ea0e201b2..6bfc7cdcb33e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java @@ -16,23 +16,42 @@ package com.android.wm.shell.windowdecor; +import static android.view.WindowManager.TRANSIT_CHANGE; + import android.graphics.PointF; import android.graphics.Rect; +import android.os.IBinder; import android.view.Surface; import android.view.SurfaceControl; +import android.window.TransitionInfo; +import android.window.TransitionRequestInfo; import android.window.WindowContainerTransaction; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; +import com.android.wm.shell.transition.Transitions; import java.util.function.Supplier; /** * A task positioner that resizes/relocates task contents as it is dragged. * Utilizes {@link DragPositioningCallbackUtility} to determine new task bounds. + * + * This positioner applies the final bounds after a resize or drag using a shell transition in order + * to utilize the startAnimation callback to set the final task position and crop. In most cases, + * the transition will be aborted since the final bounds are usually the same bounds set in the + * final {@link #onDragPositioningMove} call. In this case, the cropping and positioning would be + * set by {@link WindowDecoration#relayout} due to the final bounds change; however, it is important + * that we send the final shell transition since we still utilize the {@link #onTransitionConsumed} + * callback. */ -class FluidResizeTaskPositioner implements DragPositioningCallback { +class FluidResizeTaskPositioner implements DragPositioningCallback, + TaskDragResizer, Transitions.TransitionHandler { private final ShellTaskOrganizer mTaskOrganizer; + private final Transitions mTransitions; private final WindowDecoration mWindowDecoration; private final Supplier<SurfaceControl.Transaction> mTransactionSupplier; private DisplayController mDisplayController; @@ -45,21 +64,28 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { // finalize the bounds there using WCT#setBounds private final int mDisallowedAreaForEndBoundsHeight; private boolean mHasDragResized; + private boolean mIsResizingOrAnimatingResize; private int mCtrlType; + private IBinder mDragResizeEndTransition; @Surface.Rotation private int mRotation; - FluidResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, WindowDecoration windowDecoration, - DisplayController displayController, int disallowedAreaForEndBoundsHeight) { - this(taskOrganizer, windowDecoration, displayController, dragStartListener -> {}, - SurfaceControl.Transaction::new, disallowedAreaForEndBoundsHeight); + FluidResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, Transitions transitions, + WindowDecoration windowDecoration, DisplayController displayController, + int disallowedAreaForEndBoundsHeight) { + this(taskOrganizer, transitions, windowDecoration, displayController, + dragStartListener -> {}, SurfaceControl.Transaction::new, + disallowedAreaForEndBoundsHeight); } - FluidResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, WindowDecoration windowDecoration, + FluidResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, + Transitions transitions, + WindowDecoration windowDecoration, DisplayController displayController, DragPositioningCallbackUtility.DragStartListener dragStartListener, Supplier<SurfaceControl.Transaction> supplier, int disallowedAreaForEndBoundsHeight) { mTaskOrganizer = taskOrganizer; + mTransitions = transitions; mWindowDecoration = windowDecoration; mDisplayController = displayController; mDragStartListener = dragStartListener; @@ -103,9 +129,10 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { // This is the first bounds change since drag resize operation started. wct.setDragResizing(mWindowDecoration.mTaskInfo.token, true /* dragResizing */); } - DragPositioningCallbackUtility.applyTaskBoundsChange(wct, mWindowDecoration, - mRepositionTaskBounds, mTaskOrganizer); + wct.setBounds(mWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); + mTaskOrganizer.applyTransaction(wct); mHasDragResized = true; + mIsResizingOrAnimatingResize = true; } else if (mCtrlType == CTRL_TYPE_UNDEFINED) { final SurfaceControl.Transaction t = mTransactionSupplier.get(); DragPositioningCallbackUtility.setPositionOnDrag(mWindowDecoration, @@ -129,16 +156,17 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { mWindowDecoration)) { wct.setBounds(mWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); } - mTaskOrganizer.applyTransaction(wct); + mDragResizeEndTransition = mTransitions.startTransition(TRANSIT_CHANGE, wct, this); } else if (mCtrlType == CTRL_TYPE_UNDEFINED && DragPositioningCallbackUtility.isBelowDisallowedArea( mDisallowedAreaForEndBoundsHeight, mTaskBoundsAtDragStart, mRepositionStartPoint, y)) { final WindowContainerTransaction wct = new WindowContainerTransaction(); DragPositioningCallbackUtility.onDragEnd(mRepositionTaskBounds, - mTaskBoundsAtDragStart, mStableBounds, mRepositionStartPoint, x, y); + mTaskBoundsAtDragStart, mRepositionStartPoint, x, y, + mWindowDecoration.calculateValidDragArea()); wct.setBounds(mWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); - mTaskOrganizer.applyTransaction(wct); + mTransitions.startTransition(TRANSIT_CHANGE, wct, this); } mTaskBoundsAtDragStart.setEmpty(); @@ -153,4 +181,51 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { || (mCtrlType & CTRL_TYPE_LEFT) != 0 || (mCtrlType & CTRL_TYPE_RIGHT) != 0; } + @Override + public boolean startAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + for (TransitionInfo.Change change: info.getChanges()) { + final SurfaceControl sc = change.getLeash(); + final Rect endBounds = change.getEndAbsBounds(); + startTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) + .setPosition(sc, endBounds.left, endBounds.top); + finishTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) + .setPosition(sc, endBounds.left, endBounds.top); + } + + startTransaction.apply(); + if (transition.equals(mDragResizeEndTransition)) { + mIsResizingOrAnimatingResize = false; + mDragResizeEndTransition = null; + } + finishCallback.onTransitionFinished(null); + return true; + } + + /** + * We should never reach this as this handler's transitions are only started from shell + * explicitly. + */ + @Nullable + @Override + public WindowContainerTransaction handleRequest(@NonNull IBinder transition, + @NonNull TransitionRequestInfo request) { + return null; + } + + @Override + public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted, + @Nullable SurfaceControl.Transaction finishTransaction) { + if (transition.equals(mDragResizeEndTransition)) { + mIsResizingOrAnimatingResize = false; + mDragResizeEndTransition = null; + } + } + + @Override + public boolean isResizingOrAnimating() { + return mIsResizingOrAnimatingResize; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java index 652a2ed39c67..b37dd0d6fd2d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.java @@ -64,8 +64,6 @@ class HandleMenu { private final View.OnTouchListener mOnTouchListener; private final RunningTaskInfo mTaskInfo; private final int mLayoutResId; - private final int mCaptionX; - private final int mCaptionY; private int mMarginMenuTop; private int mMarginMenuStart; private int mMenuHeight; @@ -74,16 +72,13 @@ class HandleMenu { private HandleMenuAnimator mHandleMenuAnimator; - HandleMenu(WindowDecoration parentDecor, int layoutResId, int captionX, int captionY, - View.OnClickListener onClickListener, View.OnTouchListener onTouchListener, - Bitmap appIcon, CharSequence appName, boolean shouldShowWindowingPill, - int captionHeight) { + HandleMenu(WindowDecoration parentDecor, int layoutResId, View.OnClickListener onClickListener, + View.OnTouchListener onTouchListener, Bitmap appIcon, CharSequence appName, + boolean shouldShowWindowingPill, int captionHeight) { mParentDecor = parentDecor; mContext = mParentDecor.mDecorWindowContext; mTaskInfo = mParentDecor.mTaskInfo; mLayoutResId = layoutResId; - mCaptionX = captionX; - mCaptionY = captionY; mOnClickListener = onClickListener; mOnTouchListener = onTouchListener; mAppIconBitmap = appIcon; @@ -225,12 +220,12 @@ class HandleMenu { if (mLayoutResId == R.layout.desktop_mode_app_controls_window_decor) { // Align the handle menu to the left of the caption. - menuX = mCaptionX + mMarginMenuStart; - menuY = mCaptionY + mMarginMenuTop; + menuX = mMarginMenuStart; + menuY = mMarginMenuTop; } else { // Position the handle menu at the center of the caption. - menuX = mCaptionX + (captionWidth / 2) - (mMenuWidth / 2); - menuY = mCaptionY + mMarginMenuStart; + menuX = (captionWidth / 2) - (mMenuWidth / 2); + menuY = mMarginMenuStart; } // Handle Menu position setup. @@ -346,8 +341,6 @@ class HandleMenu { private View.OnClickListener mOnClickListener; private View.OnTouchListener mOnTouchListener; private int mLayoutId; - private int mCaptionX; - private int mCaptionY; private boolean mShowWindowingPill; private int mCaptionHeight; @@ -381,12 +374,6 @@ class HandleMenu { return this; } - Builder setCaptionPosition(int captionX, int captionY) { - mCaptionX = captionX; - mCaptionY = captionY; - return this; - } - Builder setWindowingButtonsVisible(boolean windowingButtonsVisible) { mShowWindowingPill = windowingButtonsVisible; return this; @@ -398,8 +385,8 @@ class HandleMenu { } HandleMenu build() { - return new HandleMenu(mParent, mLayoutId, mCaptionX, mCaptionY, mOnClickListener, - mOnTouchListener, mAppIcon, mName, mShowWindowingPill, mCaptionHeight); + return new HandleMenu(mParent, mLayoutId, mOnClickListener, mOnTouchListener, + mAppIcon, mName, mShowWindowingPill, mCaptionHeight); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt index 921708faab16..794b357c9f16 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt @@ -22,10 +22,10 @@ import android.content.res.Resources import android.graphics.PixelFormat import android.graphics.PointF import android.view.LayoutInflater +import android.view.MotionEvent import android.view.SurfaceControl import android.view.SurfaceControl.Transaction import android.view.SurfaceControlViewHost -import android.view.View import android.view.View.OnClickListener import android.view.WindowManager import android.view.WindowlessWindowManager @@ -62,6 +62,8 @@ class MaximizeMenu( private val cornerRadius = loadDimensionPixelSize( R.dimen.desktop_mode_maximize_menu_corner_radius ).toFloat() + private val menuWidth = loadDimensionPixelSize(R.dimen.desktop_mode_maximize_menu_width) + private val menuHeight = loadDimensionPixelSize(R.dimen.desktop_mode_maximize_menu_height) /** Position the menu relative to the caption's position. */ fun positionMenu(position: PointF, t: Transaction) { @@ -95,8 +97,6 @@ class MaximizeMenu( .setName("Maximize Menu") .setContainerLayer() .build() - val menuWidth = loadDimensionPixelSize(R.dimen.desktop_mode_maximize_menu_width) - val menuHeight = loadDimensionPixelSize(R.dimen.desktop_mode_maximize_menu_height) val lp = WindowManager.LayoutParams( menuWidth, menuHeight, @@ -160,14 +160,11 @@ class MaximizeMenu( * * @param inputPoint the input to compare against. */ - fun isValidMenuInput(inputPoint: PointF): Boolean { - val menuView = maximizeMenu?.mWindowViewHost?.view ?: return true - return !viewsLaidOut() || pointInView(menuView, inputPoint.x - menuPosition.x, - inputPoint.y - menuPosition.y) - } - - private fun pointInView(v: View, x: Float, y: Float): Boolean { - return v.left <= x && v.right >= x && v.top <= y && v.bottom >= y + fun isValidMenuInput(ev: MotionEvent): Boolean { + val x = ev.rawX + val y = ev.rawY + return !viewsLaidOut() || (menuPosition.x <= x && menuPosition.x + menuWidth >= x && + menuPosition.y <= y && menuPosition.y + menuHeight >= y) } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt new file mode 100644 index 000000000000..09c62bfc9da2 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 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.graphics.Rect +import android.view.SurfaceControl + +import com.android.wm.shell.transition.Transitions.TransitionHandler +/** + * Listener that allows implementations of [TransitionHandler] to notify when an + * animation that is resizing a task is starting, updating, and finishing the animation. + */ +interface OnTaskResizeAnimationListener { + /** + * Notifies that a transition animation is about to be started with the given bounds. + */ + fun onAnimationStart(taskId: Int, t: SurfaceControl.Transaction, bounds: Rect) + + /** + * Notifies that a transition animation is expanding or shrinking the task to the given bounds. + */ + fun onBoundsChange(taskId: Int, t: SurfaceControl.Transaction, bounds: Rect) + + /** + * Notifies that a transition animation is about to be finished. + */ + fun onAnimationEnd(taskId: Int) +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java index 368231e2d7f0..b0d3b5090ef0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java @@ -125,6 +125,7 @@ public class ResizeVeil { relayout(taskBounds, t); if (fadeIn) { + cancelAnimation(); mVeilAnimator = new ValueAnimator(); mVeilAnimator.setFloatValues(0f, 1f); mVeilAnimator.setDuration(RESIZE_ALPHA_DURATION); @@ -210,15 +211,16 @@ public class ResizeVeil { * Animate veil's alpha to 0, fading it out. */ public void hideVeil() { - final ValueAnimator animator = new ValueAnimator(); - animator.setFloatValues(1, 0); - animator.setDuration(RESIZE_ALPHA_DURATION); - animator.addUpdateListener(animation -> { + cancelAnimation(); + mVeilAnimator = new ValueAnimator(); + mVeilAnimator.setFloatValues(1, 0); + mVeilAnimator.setDuration(RESIZE_ALPHA_DURATION); + mVeilAnimator.addUpdateListener(animation -> { SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); - t.setAlpha(mVeilSurface, 1 - animator.getAnimatedFraction()); + t.setAlpha(mVeilSurface, 1 - mVeilAnimator.getAnimatedFraction()); t.apply(); }); - animator.addListener(new AnimatorListenerAdapter() { + mVeilAnimator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); @@ -226,7 +228,7 @@ public class ResizeVeil { t.apply(); } }); - animator.start(); + mVeilAnimator.start(); } @ColorRes @@ -240,10 +242,20 @@ public class ResizeVeil { } } + private void cancelAnimation() { + if (mVeilAnimator != null) { + mVeilAnimator.removeAllUpdateListeners(); + mVeilAnimator.cancel(); + } + } + /** * Dispose of veil when it is no longer needed, likely on close of its container decor. */ void dispose() { + cancelAnimation(); + mVeilAnimator = null; + if (mViewHost != null) { mViewHost.release(); mViewHost = null; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskDragResizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskDragResizer.java new file mode 100644 index 000000000000..40421b599889 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskDragResizer.java @@ -0,0 +1,29 @@ +/* + * 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; + +/** + * Holds the state of a drag resize. + */ +interface TaskDragResizer { + + /** + * Returns true if task is currently being resized or animating the final transition after + * a resize is complete. + */ + boolean isResizingOrAnimating(); +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java index 4b55a0caaca5..7c6e69eb1ec9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java @@ -43,7 +43,7 @@ import java.util.function.Supplier; * If the drag is repositioning, we update in the typical manner. */ public class VeiledResizeTaskPositioner implements DragPositioningCallback, - Transitions.TransitionHandler { + TaskDragResizer, Transitions.TransitionHandler { private DesktopModeWindowDecoration mDesktopWindowDecoration; private ShellTaskOrganizer mTaskOrganizer; @@ -59,10 +59,13 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, private final int mDisallowedAreaForEndBoundsHeight; private final Supplier<SurfaceControl.Transaction> mTransactionSupplier; private int mCtrlType; + private boolean mIsResizingOrAnimatingResize; @Surface.Rotation private int mRotation; + private boolean mVeilIsVisible; public VeiledResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, - DesktopModeWindowDecoration windowDecoration, DisplayController displayController, + DesktopModeWindowDecoration windowDecoration, + DisplayController displayController, DragPositioningCallbackUtility.DragStartListener dragStartListener, Transitions transitions, int disallowedAreaForEndBoundsHeight) { @@ -71,12 +74,13 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, } public VeiledResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, - DesktopModeWindowDecoration windowDecoration, DisplayController displayController, + DesktopModeWindowDecoration windowDecoration, + DisplayController displayController, DragPositioningCallbackUtility.DragStartListener dragStartListener, Supplier<SurfaceControl.Transaction> supplier, Transitions transitions, int disallowedAreaForEndBoundsHeight) { - mTaskOrganizer = taskOrganizer; mDesktopWindowDecoration = windowDecoration; + mTaskOrganizer = taskOrganizer; mDisplayController = displayController; mDragStartListener = dragStartListener; mTransactionSupplier = supplier; @@ -91,7 +95,6 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, mDesktopWindowDecoration.mTaskInfo.configuration.windowConfiguration.getBounds()); mRepositionStartPoint.set(x, y); if (isResizing()) { - mDesktopWindowDecoration.showResizeVeil(mTaskBoundsAtDragStart); if (!mDesktopWindowDecoration.mTaskInfo.isFocused) { WindowContainerTransaction wct = new WindowContainerTransaction(); wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true); @@ -116,7 +119,13 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, if (isResizing() && DragPositioningCallbackUtility.changeBounds(mCtrlType, mRepositionTaskBounds, mTaskBoundsAtDragStart, mStableBounds, delta, mDisplayController, mDesktopWindowDecoration)) { - mDesktopWindowDecoration.updateResizeVeil(mRepositionTaskBounds); + mIsResizingOrAnimatingResize = true; + if (!mVeilIsVisible) { + mDesktopWindowDecoration.showResizeVeil(mRepositionTaskBounds); + mVeilIsVisible = true; + } else { + mDesktopWindowDecoration.updateResizeVeil(mRepositionTaskBounds); + } } else if (mCtrlType == CTRL_TYPE_UNDEFINED) { final SurfaceControl.Transaction t = mTransactionSupplier.get(); DragPositioningCallbackUtility.setPositionOnDrag(mDesktopWindowDecoration, @@ -138,28 +147,28 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, mDesktopWindowDecoration.updateResizeVeil(mRepositionTaskBounds); final WindowContainerTransaction wct = new WindowContainerTransaction(); wct.setBounds(mDesktopWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); - if (Transitions.ENABLE_SHELL_TRANSITIONS) { - mTransitions.startTransition(TRANSIT_CHANGE, wct, this); - } else { - mTaskOrganizer.applyTransaction(wct); - } - } else { + mTransitions.startTransition(TRANSIT_CHANGE, wct, this); + } else if (mVeilIsVisible) { // If bounds haven't changed, perform necessary veil reset here as startAnimation // won't be called. mDesktopWindowDecoration.hideResizeVeil(); + mIsResizingOrAnimatingResize = false; } } else if (DragPositioningCallbackUtility.isBelowDisallowedArea( mDisallowedAreaForEndBoundsHeight, mTaskBoundsAtDragStart, mRepositionStartPoint, y)) { + final WindowContainerTransaction wct = new WindowContainerTransaction(); DragPositioningCallbackUtility.onDragEnd(mRepositionTaskBounds, - mTaskBoundsAtDragStart, mStableBounds, mRepositionStartPoint, x, y); - DragPositioningCallbackUtility.applyTaskBoundsChange(new WindowContainerTransaction(), - mDesktopWindowDecoration, mRepositionTaskBounds, mTaskOrganizer); + mTaskBoundsAtDragStart, mRepositionStartPoint, x, y, + mDesktopWindowDecoration.calculateValidDragArea()); + wct.setBounds(mDesktopWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); + mTransitions.startTransition(TRANSIT_CHANGE, wct, this); } mCtrlType = CTRL_TYPE_UNDEFINED; mTaskBoundsAtDragStart.setEmpty(); mRepositionStartPoint.set(0, 0); + mVeilIsVisible = false; return new Rect(mRepositionTaskBounds); } @@ -173,10 +182,20 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback) { + for (TransitionInfo.Change change: info.getChanges()) { + final SurfaceControl sc = change.getLeash(); + final Rect endBounds = change.getEndAbsBounds(); + startTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) + .setPosition(sc, endBounds.left, endBounds.top); + finishTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) + .setPosition(sc, endBounds.left, endBounds.top); + } + startTransaction.apply(); mDesktopWindowDecoration.hideResizeVeil(); mCtrlType = CTRL_TYPE_UNDEFINED; finishCallback.onTransitionFinished(null); + mIsResizingOrAnimatingResize = false; return true; } @@ -190,4 +209,9 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, @NonNull TransitionRequestInfo request) { return null; } + + @Override + public boolean isResizingOrAnimating() { + return mIsResizingOrAnimatingResize; + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java index ae1a3d914be3..01a6012ea314 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java @@ -17,9 +17,7 @@ package com.android.wm.shell.windowdecor; import android.app.ActivityManager; -import android.os.IBinder; import android.view.SurfaceControl; -import android.window.TransitionInfo; import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; import com.android.wm.shell.splitscreen.SplitScreenController; @@ -103,34 +101,4 @@ public interface WindowDecorViewModel { * @param taskInfo the info of the task */ void destroyWindowDecoration(ActivityManager.RunningTaskInfo taskInfo); - - /** - * Notifies that a shell transition is about to start. If the transition is of type - * TRANSIT_ENTER_DESKTOP, it will save that transition to unpause relayout for the transitioning - * task after the transition has ended. - * - * @param transition the ready transaction - * @param info of Transition to check if relayout needs to be paused for a task - * @param change a change in the given transition - */ - default void onTransitionReady(IBinder transition, TransitionInfo info, - TransitionInfo.Change change) {} - - /** - * Notifies that a shell transition is about to merge with another to give the window - * decoration a chance to prepare for this merge. - * - * @param merged the transaction being merged - * @param playing the transaction being merged into - */ - default void onTransitionMerged(IBinder merged, IBinder playing) {} - - /** - * Notifies that a shell transition is about to finish to give the window decoration a chance - * to clean up. - * - * @param transaction - */ - default void onTransitionFinished(IBinder transaction) {} - }
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index 634b7558c7d8..35d59401ac1a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -21,6 +21,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.view.WindowInsets.Type.statusBars; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.ActivityManager.RunningTaskInfo; import android.app.WindowConfiguration.WindowingMode; import android.content.Context; @@ -123,6 +124,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> private WindowlessWindowManager mCaptionWindowManager; private SurfaceControlViewHost mViewHost; private Configuration mWindowDecorConfig; + TaskDragResizer mTaskDragResizer; private boolean mIsCaptionVisible; private final Binder mOwner = new Binder(); @@ -178,6 +180,13 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> */ abstract void relayout(RunningTaskInfo taskInfo); + /** + * Used by the {@link DragPositioningCallback} associated with the implementing class to + * enforce drags ending in a valid position. A null result means no restriction. + */ + @Nullable + abstract Rect calculateValidDragArea(); + void relayout(RelayoutParams params, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, WindowContainerTransaction wct, T rootView, RelayoutResult<T> outResult) { @@ -270,9 +279,13 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } outResult.mCaptionHeight = loadDimensionPixelSize(resources, params.mCaptionHeightId); - final int captionWidth = taskBounds.width(); + outResult.mCaptionWidth = params.mCaptionWidthId != Resources.ID_NULL + ? loadDimensionPixelSize(resources, params.mCaptionWidthId) : taskBounds.width(); + outResult.mCaptionX = (outResult.mWidth - outResult.mCaptionWidth) / 2; - startT.setWindowCrop(mCaptionContainerSurface, captionWidth, outResult.mCaptionHeight) + startT.setWindowCrop(mCaptionContainerSurface, outResult.mCaptionWidth, + outResult.mCaptionHeight) + .setPosition(mCaptionContainerSurface, outResult.mCaptionX, 0 /* y */) .setLayer(mCaptionContainerSurface, CAPTION_LAYER_Z_ORDER) .show(mCaptionContainerSurface); @@ -283,12 +296,13 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCaptionInsetsRect.set(taskBounds); if (mIsCaptionVisible) { mCaptionInsetsRect.bottom = - mCaptionInsetsRect.top + outResult.mCaptionHeight + params.mCaptionY; + mCaptionInsetsRect.top + outResult.mCaptionHeight; wct.addInsetsSource(mTaskInfo.token, - mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect); + mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect, + null /* boundingRects */); wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures(), - mCaptionInsetsRect); + mCaptionInsetsRect, null /* boundingRects */); } else { wct.removeInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar()); @@ -303,25 +317,21 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> float shadowRadius; final Point taskPosition = mTaskInfo.positionInParent; if (isFullscreen) { - // Setting the task crop to the width/height stops input events from being sent to - // some regions of the app window. See b/300324920 - // TODO(b/296921174): investigate whether crop/position needs to be set by window - // decorations at all when transition handlers are already taking ownership of the task - // surface placement/crop, especially when in fullscreen where tasks cannot be - // drag-resized by the window decoration. - startT.setWindowCrop(mTaskSurface, null); - finishT.setWindowCrop(mTaskSurface, null); // Shadow is not needed for fullscreen tasks shadowRadius = 0; } else { - startT.setWindowCrop(mTaskSurface, outResult.mWidth, outResult.mHeight); - finishT.setWindowCrop(mTaskSurface, outResult.mWidth, outResult.mHeight); shadowRadius = loadDimension(resources, params.mShadowRadiusId); } + + if (params.mSetTaskPositionAndCrop) { + startT.setWindowCrop(mTaskSurface, outResult.mWidth, outResult.mHeight); + finishT.setWindowCrop(mTaskSurface, outResult.mWidth, outResult.mHeight) + .setPosition(mTaskSurface, taskPosition.x, taskPosition.y); + } + startT.setShadowRadius(mTaskSurface, shadowRadius) .show(mTaskSurface); - finishT.setPosition(mTaskSurface, taskPosition.x, taskPosition.y) - .setShadowRadius(mTaskSurface, shadowRadius); + finishT.setShadowRadius(mTaskSurface, shadowRadius); if (mTaskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) { if (!DesktopModeStatus.isVeiledResizeEnabled()) { // When fluid resize is enabled, add a background to freeform tasks @@ -348,7 +358,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> // Caption view mCaptionWindowManager.setConfiguration(taskConfig); final WindowManager.LayoutParams lp = - new WindowManager.LayoutParams(captionWidth, outResult.mCaptionHeight, + new WindowManager.LayoutParams(outResult.mCaptionWidth, outResult.mCaptionHeight, WindowManager.LayoutParams.TYPE_APPLICATION, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSPARENT); lp.setTitle("Caption of Task=" + mTaskInfo.taskId); @@ -386,6 +396,10 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } } + void setTaskDragResizer(TaskDragResizer taskDragResizer) { + mTaskDragResizer = taskDragResizer; + } + private void setCaptionVisibility(View rootView, boolean visible) { if (rootView == null) { return; @@ -533,7 +547,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> final int captionHeight = loadDimensionPixelSize(mContext.getResources(), captionHeightId); final Rect captionInsets = new Rect(0, 0, 0, captionHeight); wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar(), - captionInsets); + captionInsets, null /* boundingRects */); } static class RelayoutParams { @@ -545,12 +559,10 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> int mCornerRadius; - int mCaptionX; - int mCaptionY; - Configuration mWindowDecorConfig; boolean mApplyStartTransactionOnDraw; + boolean mSetTaskPositionAndCrop; void reset() { mLayoutResId = Resources.ID_NULL; @@ -560,16 +572,16 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCornerRadius = 0; - mCaptionX = 0; - mCaptionY = 0; - mApplyStartTransactionOnDraw = false; + mSetTaskPositionAndCrop = false; mWindowDecorConfig = null; } } static class RelayoutResult<T extends View & TaskFocusStateConsumer> { int mCaptionHeight; + int mCaptionWidth; + int mCaptionX; int mWidth; int mHeight; T mRootView; @@ -578,6 +590,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mWidth = 0; mHeight = 0; mCaptionHeight = 0; + mCaptionWidth = 0; + mCaptionX = 0; mRootView = null; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt index 589a8134c2d3..144373f3550e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt @@ -42,6 +42,8 @@ internal class DesktopModeAppControlsWindowDecorationViewHolder( private val maximizeWindowButton: ImageButton = rootView.requireViewById(R.id.maximize_window) private val appNameTextView: TextView = rootView.requireViewById(R.id.application_name) private val appIconImageView: ImageView = rootView.requireViewById(R.id.application_icon) + val appNameTextWidth: Int + get() = appNameTextView.width init { captionView.setOnTouchListener(onCaptionTouchListener) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt index 4930cb721336..6dcae2776847 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeFocusedWindowDecorationViewHolder.kt @@ -35,9 +35,6 @@ internal class DesktopModeFocusedWindowDecorationViewHolder( } override fun bindData(taskInfo: RunningTaskInfo) { - taskInfo.taskDescription?.statusBarColor?.let { captionColor -> - captionView.setBackgroundColor(captionColor) - } captionHandle.imageTintList = ColorStateList.valueOf(getCaptionHandleBarColor(taskInfo)) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt index 690b4e4be122..81bc34c876b6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt @@ -17,9 +17,9 @@ internal abstract class DesktopModeWindowDecorationViewHolder(rootView: View) { */ abstract fun bindData(taskInfo: RunningTaskInfo) - /** Callback when the handle menu is opened. */ - abstract fun onHandleMenuOpened() + /** Callback when the handle menu is opened. */ + abstract fun onHandleMenuOpened() - /** Callback when the handle menu is closed. */ - abstract fun onHandleMenuClosed() + /** Callback when the handle menu is closed. */ + abstract fun onHandleMenuClosed() } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/Android.bp b/libs/WindowManager/Shell/tests/flicker/pip/Android.bp index e61f7629f4fd..faeb342a44be 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/Android.bp +++ b/libs/WindowManager/Shell/tests/flicker/pip/Android.bp @@ -30,6 +30,7 @@ filegroup { "src/**/B*.kt", "src/**/C*.kt", "src/**/D*.kt", + "src/**/F*.kt", "src/**/S*.kt", ], } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientation.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientation.kt index 8207b85c3e0c..07cd68261083 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientation.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientation.kt @@ -86,6 +86,8 @@ class EnterPipToOtherOrientation(flicker: LegacyFlickerTest) : PipTransition(fli .withNavOrTaskBarVisible() .withStatusBarVisible() .waitForAndVerify() + + pipApp.tapPipToShowMenu(wmHelper) } } @@ -194,6 +196,16 @@ class EnterPipToOtherOrientation(flicker: LegacyFlickerTest) : PipTransition(fli } } + @Postsubmit + @Test + fun menuOverlayMatchesTaskSurface() { + flicker.assertLayersEnd { + val pipAppRegion = visibleRegion(pipApp) + val pipMenuRegion = visibleRegion(ComponentNameMatcher.PIP_MENU_OVERLAY) + pipAppRegion.coversExactly(pipMenuRegion.region) + } + } + /** {@inheritDoc} */ @FlakyTest(bugId = 267424412) @Test diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/AutoEnterPipFromSplitScreenOnGoToHomeTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenAutoEnterPipOnGoToHomeTest.kt index a5c2c8988e70..27922988038c 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/AutoEnterPipFromSplitScreenOnGoToHomeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenAutoEnterPipOnGoToHomeTest.kt @@ -17,7 +17,6 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.Presubmit -import android.tools.common.NavBar import android.tools.common.Rotation import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder @@ -62,7 +61,7 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : +class FromSplitScreenAutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : AutoEnterPipOnGoToHomeTest(flicker) { private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0) /** Second app used to enter split screen mode */ @@ -120,9 +119,7 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : @Presubmit @Test override fun pipAppLayerAlwaysVisible() { - // pip layer in gesture nav will disappear during transition with alpha animation - Assume.assumeFalse(flicker.scenario.isGesturalNavigation) - super.pipAppLayerAlwaysVisible() + // pip layer in should disappear during transition with alpha animation } @Presubmit @@ -151,8 +148,7 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : @JvmStatic fun getParams() = LegacyFlickerTestFactory.nonRotationTests( - // TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy. - supportedNavigationModes = listOf(NavBar.MODE_GESTURAL) + supportedRotations = listOf(Rotation.ROTATION_0) ) } } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt new file mode 100644 index 000000000000..4c2315324eca --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2022 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.flicker.pip + +import android.platform.test.annotations.Presubmit +import android.tools.common.Rotation +import android.tools.device.flicker.junit.FlickerParametersRunnerFactory +import android.tools.device.flicker.legacy.FlickerBuilder +import android.tools.device.flicker.legacy.LegacyFlickerTest +import android.tools.device.flicker.legacy.LegacyFlickerTestFactory +import android.tools.device.helpers.WindowUtils +import android.tools.device.traces.parsers.toFlickerComponent +import androidx.test.filters.RequiresDevice +import com.android.server.wm.flicker.helpers.SimpleAppHelper +import com.android.server.wm.flicker.testapp.ActivityOptions +import com.android.wm.shell.flicker.pip.common.EnterPipTransition +import com.android.wm.shell.flicker.utils.SplitScreenUtils +import org.junit.Assume +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters +import org.junit.runners.Parameterized + +/** + * Test entering pip from an app via auto-enter property when navigating to home from split screen. + * + * To run this test: `atest WMShellFlickerTests:AutoEnterPipOnGoToHomeTest` + * + * Actions: + * ``` + * Launch an app in full screen + * Select "Auto-enter PiP" radio button + * Open all apps and drag another app icon to enter split screen + * Press Home button or swipe up to go Home and put [pipApp] in pip mode + * ``` + * + * Notes: + * ``` + * 1. All assertions are inherited from [EnterPipTest] + * 2. Part of the test setup occurs automatically via + * [android.tools.device.flicker.legacy.runner.TransitionRunner], + * including configuring navigation mode, initial orientation and ensuring no + * apps are running before setup + * ``` + */ +@RequiresDevice +@RunWith(Parameterized::class) +@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : + EnterPipTransition(flicker) { + private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0) + /** Second app used to enter split screen mode */ + private val secondAppForSplitScreen = + SimpleAppHelper( + instrumentation, + ActivityOptions.SplitScreen.Primary.LABEL, + ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent() + ) + + /** Defines the transition used to run the test */ + override val transition: FlickerBuilder.() -> Unit + get() = { + setup { + secondAppForSplitScreen.launchViaIntent(wmHelper) + pipApp.launchViaIntent(wmHelper) + tapl.goHome() + SplitScreenUtils.enterSplit( + wmHelper, + tapl, + device, + pipApp, + secondAppForSplitScreen, + flicker.scenario.startRotation + ) + pipApp.enableEnterPipOnUserLeaveHint() + } + teardown { + pipApp.exit(wmHelper) + secondAppForSplitScreen.exit(wmHelper) + } + transitions { tapl.goHome() } + } + + @Presubmit + @Test + override fun pipOverlayLayerAppearThenDisappear() { + // when entering from split screen we use alpha animation, without overlay + } + + @Presubmit + @Test + override fun pipLayerOrOverlayRemainInsideVisibleBounds() { + // when entering from split screen we use alpha animation, without overlay + } + + @Presubmit + @Test + override fun pipLayerReduces() { + // when entering from split screen we use alpha animation, so there is no size change + Assume.assumeFalse(flicker.scenario.isGesturalNavigation) + super.pipLayerReduces() + } + + @Presubmit + @Test + override fun pipAppLayerAlwaysVisible() { + // pip layer in should disappear during transition with alpha animation + } + + @Presubmit + @Test + override fun focusChanges() { + // in gestural nav the focus goes to different activity on swipe up + Assume.assumeFalse(flicker.scenario.isGesturalNavigation) + super.focusChanges() + } + + @Presubmit + @Test + fun pipAppWindowVisibleChanges() { + // TODO(b/322394235) this method comes from EnterPipOnUserLeaveHintTest, but due to how + // it is being packaged in Android.bp we cannot inherit from it. Needs to be refactored. + Assume.assumeTrue(flicker.scenario.isGesturalNavigation) + flicker.assertWm { + this.isAppWindowVisible(pipApp) + .then() + .isAppWindowInvisible(pipApp, isOptional = true) + .then() + .isAppWindowVisible(pipApp, isOptional = true) + } + } + + @Presubmit + @Test + override fun pipAppWindowAlwaysVisible() { + // TODO(b/322394235) this method comes from EnterPipOnUserLeaveHintTest, but due to how + // it is being packaged in Android.bp we cannot inherit from it. Needs to be refactored. + // In gestural nav the pip will first move behind home and then above home. The visual + // appearance visible->invisible->visible is asserted by pipAppLayerAlwaysVisible(). + // But the internal states of activity don't need to follow that, such as a temporary + // visibility state can be changed quickly outside a transaction so the test doesn't + // detect that. Hence, skip the case to avoid restricting the internal implementation. + Assume.assumeFalse(flicker.scenario.isGesturalNavigation) + super.pipAppWindowAlwaysVisible() + } + + @Presubmit + @Test + override fun pipWindowRemainInsideVisibleBounds() { + if (tapl.isTablet) { + flicker.assertWmVisibleRegion(pipApp) { coversAtMost(displayBounds) } + } else { + // on phones home screen does not rotate in landscape, PiP enters back to portrait + // orientation - if we go from landscape to portrait it should switch between the bounds + // otherwise it should be the same as tablet (i.e. portrait to portrait) + if (flicker.scenario.isLandscapeOrSeascapeAtStart) { + flicker.assertWmVisibleRegion(pipApp) { + // first check against landscape bounds then against portrait bounds + coversAtMost(displayBounds).then().coversAtMost(portraitDisplayBounds) + } + } else { + // always check against the display bounds which do not change during transition + flicker.assertWmVisibleRegion(pipApp) { coversAtMost(displayBounds) } + } + } + } + + companion object { + @Parameterized.Parameters(name = "{0}") + @JvmStatic + fun getParams() = LegacyFlickerTestFactory.nonRotationTests( + supportedRotations = listOf(Rotation.ROTATION_0) + ) + } +} diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt index 182a9089d040..be771712834f 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt @@ -101,7 +101,8 @@ abstract class AppsEnterPipTransition(flicker: LegacyFlickerTest) : EnterPipTran override fun pipLayerReduces() { flicker.assertLayers { val pipLayerList = - this.layers { standardAppHelper.layerMatchesAnyOf(it) && it.isVisible } + this.layers { standardAppHelper.packageNameMatcher.layerMatchesAnyOf(it) + && it.isVisible } pipLayerList.zipWithNext { previous, current -> current.visibleRegion.notBiggerThan(previous.visibleRegion.region) } diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/MapsEnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/MapsEnterPipTest.kt index e272958d78f8..4c2eff3b6ce4 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/MapsEnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/MapsEnterPipTest.kt @@ -137,6 +137,16 @@ open class MapsEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransition override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } } + /** Checks [standardAppHelper] layer remains visible throughout the animation */ + @Postsubmit + @Test + override fun pipAppLayerAlwaysVisible() { + // For Maps the transition goes through the UI mode change that adds a snapshot overlay so + // we assert only start/end layers matching the app instead. + flicker.assertLayersStart { this.isVisible(standardAppHelper.packageNameMatcher) } + flicker.assertLayersEnd { this.isVisible(standardAppHelper.packageNameMatcher) } + } + @Postsubmit @Test override fun focusChanges() { diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt index 32f12592135d..143f7a726ed3 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt @@ -69,7 +69,7 @@ open class NetflixEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransit setup { standardAppHelper.launchViaIntent( wmHelper, - NetflixAppHelper.getNetflixWatchVideoIntent("70184207"), + NetflixAppHelper.getNetflixWatchVideoIntent("81605060"), ComponentNameMatcher(NetflixAppHelper.PACKAGE_NAME, NetflixAppHelper.WATCH_ACTIVITY) ) standardAppHelper.waitForVideoPlaying() diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt index 47bff8de377e..0d1853534927 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt @@ -78,6 +78,14 @@ abstract class TvPipTestBase : PipTestBase(rotationToString(ROTATION_0), ROTATIO uiAutomation.dropShellPermissionIdentity() } + override fun onProcessStarted( + pid: Int, + processUid: Int, + packageUid: Int, + packageName: String, + processName: String + ) {} + override fun onForegroundActivitiesChanged(pid: Int, uid: Int, foreground: Boolean) {} override fun onForegroundServicesChanged(pid: Int, uid: Int, serviceTypes: Int) {} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index 771876f7ce5d..9ded6ea1d187 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -63,6 +63,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.util.test.FakeSettingsProvider; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestShellExecutor; +import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.sysui.ShellSharedConstants; @@ -110,6 +111,8 @@ public class BackAnimationControllerTest extends ShellTestCase { @Mock private InputManager mInputManager; + @Mock + private ShellCommandHandler mShellCommandHandler; private BackAnimationController mController; private TestableContentResolver mContentResolver; @@ -145,7 +148,8 @@ public class BackAnimationControllerTest extends ShellTestCase { mContext, mContentResolver, mAnimationBackground, - mShellBackAnimationRegistry); + mShellBackAnimationRegistry, + mShellCommandHandler); mShellInit.init(); mShellExecutor.flushAll(); } @@ -298,7 +302,8 @@ public class BackAnimationControllerTest extends ShellTestCase { mContext, mContentResolver, mAnimationBackground, - mShellBackAnimationRegistry); + mShellBackAnimationRegistry, + mShellCommandHandler); shellInit.init(); registerAnimation(BackNavigationInfo.TYPE_RETURN_TO_HOME); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java index 874ef80c29f0..91503b1c3619 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java @@ -53,6 +53,7 @@ public class BackProgressAnimatorTest { /* progress = */ progress, /* velocityX = */ 0, /* velocityY = */ 0, + /* triggerBack = */ false, /* swipeEdge = */ BackEvent.EDGE_LEFT, /* departingAnimationTarget = */ null); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/TouchTrackerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/TouchTrackerTest.kt index bf07dccd0658..6dbb1e2b8d92 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/TouchTrackerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/TouchTrackerTest.kt @@ -170,6 +170,71 @@ class TouchTrackerTest { nonLinearTracker.assertProgress((touchX - INITIAL_X_LEFT_EDGE) / nonLinearTarget) } + @Test + fun restartingGesture_resetsInitialTouchX_leftEdge() { + val linearTracker = linearTouchTracker() + linearTracker.setGestureStartLocation(INITIAL_X_LEFT_EDGE, 0f, BackEvent.EDGE_LEFT) + var touchX = 100f + val velocityX = 0f + val velocityY = 0f + + // assert that progress is increased when increasing touchX + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress((touchX - INITIAL_X_LEFT_EDGE) / MAX_DISTANCE) + + // assert that progress is reset to 0 when start location is updated + linearTracker.updateStartLocation() + linearTracker.assertProgress(0f) + + // assert that progress remains 0 when touchX is decreased + touchX -= 50 + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress(0f) + + // assert that progress uses new minimal touchX for progress calculation + val newInitialTouchX = touchX + touchX += 100 + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress((touchX - newInitialTouchX) / MAX_DISTANCE) + + // assert the same for triggerBack==true + linearTracker.triggerBack = true + linearTracker.assertProgress((touchX - newInitialTouchX) / MAX_DISTANCE) + } + + @Test + fun restartingGesture_resetsInitialTouchX_rightEdge() { + val linearTracker = linearTouchTracker() + linearTracker.setGestureStartLocation(INITIAL_X_RIGHT_EDGE, 0f, BackEvent.EDGE_RIGHT) + + var touchX = INITIAL_X_RIGHT_EDGE - 100f + val velocityX = 0f + val velocityY = 0f + + // assert that progress is increased when decreasing touchX + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress((INITIAL_X_RIGHT_EDGE - touchX) / MAX_DISTANCE) + + // assert that progress is reset to 0 when start location is updated + linearTracker.updateStartLocation() + linearTracker.assertProgress(0f) + + // assert that progress remains 0 when touchX is increased + touchX += 50 + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress(0f) + + // assert that progress uses new maximal touchX for progress calculation + val newInitialTouchX = touchX + touchX -= 100 + linearTracker.update(touchX, 0f, velocityX, velocityY) + linearTracker.assertProgress((newInitialTouchX - touchX) / MAX_DISTANCE) + + // assert the same for triggerBack==true + linearTracker.triggerBack = true + linearTracker.assertProgress((newInitialTouchX - touchX) / MAX_DISTANCE) + } + companion object { private const val MAX_DISTANCE = 500f private const val LINEAR_DISTANCE = 400f diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java index dab762f233e2..fa0aba5a6ee9 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java @@ -1190,6 +1190,23 @@ public class BubbleDataTest extends ShellTestCase { assertThat(mBubbleData.getBubbleInStackWithKey(appBubbleKey)).isNull(); } + @Test + public void test_removeOverflowBubble() { + sendUpdatedEntryAtTime(mEntryA1, 2000); + mBubbleData.setListener(mListener); + + mBubbleData.dismissBubbleWithKey(mEntryA1.getKey(), Bubbles.DISMISS_USER_GESTURE); + verifyUpdateReceived(); + assertOverflowChangedTo(ImmutableList.of(mBubbleA1)); + + mBubbleData.removeOverflowBubble(mBubbleA1); + verifyUpdateReceived(); + + BubbleData.Update update = mUpdateCaptor.getValue(); + assertThat(update.removedOverflowBubble).isEqualTo(mBubbleA1); + assertOverflowChangedTo(ImmutableList.of()); + } + private void verifyUpdateReceived() { verify(mListener).applyUpdate(mUpdateCaptor.capture()); reset(mListener); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleOverflowTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleOverflowTest.java index f5b0174642d1..094af9652ea3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleOverflowTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleOverflowTest.java @@ -18,7 +18,6 @@ package com.android.wm.shell.bubbles; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.testing.AndroidTestingRunner; @@ -45,18 +44,22 @@ public class BubbleOverflowTest extends ShellTestCase { private TestableBubblePositioner mPositioner; private BubbleOverflow mOverflow; + private BubbleExpandedViewManager mExpandedViewManager; @Mock private BubbleController mBubbleController; + @Mock + private BubbleStackView mBubbleStackView; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); + mExpandedViewManager = BubbleExpandedViewManager.fromBubbleController(mBubbleController); mPositioner = new TestableBubblePositioner(mContext, mContext.getSystemService(WindowManager.class)); when(mBubbleController.getPositioner()).thenReturn(mPositioner); - when(mBubbleController.getStackView()).thenReturn(mock(BubbleStackView.class)); + when(mBubbleController.getStackView()).thenReturn(mBubbleStackView); mOverflow = new BubbleOverflow(mContext, mPositioner); } @@ -65,7 +68,7 @@ public class BubbleOverflowTest extends ShellTestCase { public void test_initialize_forStack() { assertThat(mOverflow.getExpandedView()).isNull(); - mOverflow.initialize(mBubbleController, /* forBubbleBar= */ false); + mOverflow.initialize(mExpandedViewManager, mBubbleStackView, mPositioner); assertThat(mOverflow.getExpandedView()).isNotNull(); assertThat(mOverflow.getExpandedView().getBubbleKey()).isEqualTo(BubbleOverflow.KEY); @@ -74,7 +77,7 @@ public class BubbleOverflowTest extends ShellTestCase { @Test public void test_initialize_forBubbleBar() { - mOverflow.initialize(mBubbleController, /* forBubbleBar= */ true); + mOverflow.initializeForBubbleBar(mExpandedViewManager, mPositioner); assertThat(mOverflow.getBubbleBarExpandedView()).isNotNull(); assertThat(mOverflow.getExpandedView()).isNull(); @@ -82,11 +85,10 @@ public class BubbleOverflowTest extends ShellTestCase { @Test public void test_cleanUpExpandedState() { - mOverflow.initialize(mBubbleController, /* forBubbleBar= */ false); + mOverflow.initialize(mExpandedViewManager, mBubbleStackView, mPositioner); assertThat(mOverflow.getExpandedView()).isNotNull(); mOverflow.cleanUpExpandedState(); assertThat(mOverflow.getExpandedView()).isNull(); } - } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubblePositionerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubblePositionerTest.java deleted file mode 100644 index 6ebee730756e..000000000000 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubblePositionerTest.java +++ /dev/null @@ -1,602 +0,0 @@ -/* - * 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.bubbles; - -import static com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT; - -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.util.concurrent.MoreExecutors.directExecutor; - -import static org.mockito.Mockito.mock; - -import android.content.Intent; -import android.content.pm.ShortcutInfo; -import android.graphics.Insets; -import android.graphics.PointF; -import android.graphics.Rect; -import android.graphics.RectF; -import android.os.UserHandle; -import android.testing.AndroidTestingRunner; -import android.view.WindowManager; - -import androidx.test.filters.SmallTest; - -import com.android.wm.shell.R; -import com.android.wm.shell.ShellTestCase; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Tests operations and the resulting state managed by {@link BubblePositioner}. - */ -@SmallTest -@RunWith(AndroidTestingRunner.class) -public class BubblePositionerTest extends ShellTestCase { - - private BubblePositioner mPositioner; - - @Before - public void setUp() { - WindowManager windowManager = mContext.getSystemService(WindowManager.class); - mPositioner = new BubblePositioner(mContext, windowManager); - } - - @Test - public void testUpdate() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1000, 1200); - Rect availableRect = new Rect(screenBounds); - availableRect.inset(insets); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.getAvailableRect()).isEqualTo(availableRect); - assertThat(mPositioner.isLandscape()).isFalse(); - assertThat(mPositioner.isLargeScreen()).isFalse(); - assertThat(mPositioner.getInsets()).isEqualTo(insets); - } - - @Test - public void testShowBubblesVertically_phonePortrait() { - DeviceConfig deviceConfig = new ConfigBuilder().build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.showBubblesVertically()).isFalse(); - } - - @Test - public void testShowBubblesVertically_phoneLandscape() { - DeviceConfig deviceConfig = new ConfigBuilder().setLandscape().build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.isLandscape()).isTrue(); - assertThat(mPositioner.showBubblesVertically()).isTrue(); - } - - @Test - public void testShowBubblesVertically_tablet() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.showBubblesVertically()).isTrue(); - } - - /** If a resting position hasn't been set, calling it will return the default position. */ - @Test - public void testGetRestingPosition_returnsDefaultPosition() { - DeviceConfig deviceConfig = new ConfigBuilder().build(); - mPositioner.update(deviceConfig); - - PointF restingPosition = mPositioner.getRestingPosition(); - PointF defaultPosition = mPositioner.getDefaultStartPosition(); - - assertThat(restingPosition).isEqualTo(defaultPosition); - } - - /** If a resting position has been set, it'll return that instead of the default position. */ - @Test - public void testGetRestingPosition_returnsRestingPosition() { - DeviceConfig deviceConfig = new ConfigBuilder().build(); - mPositioner.update(deviceConfig); - - PointF restingPosition = new PointF(100, 100); - mPositioner.setRestingPosition(restingPosition); - - assertThat(mPositioner.getRestingPosition()).isEqualTo(restingPosition); - } - - /** Test that the default resting position on phone is in upper left. */ - @Test - public void testGetRestingPosition_bubble_onPhone() { - DeviceConfig deviceConfig = new ConfigBuilder().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF restingPosition = mPositioner.getRestingPosition(); - - assertThat(restingPosition.x).isEqualTo(allowableStackRegion.left); - assertThat(restingPosition.y).isEqualTo(getDefaultYPosition()); - } - - @Test - public void testGetRestingPosition_bubble_onPhone_RTL() { - DeviceConfig deviceConfig = new ConfigBuilder().setRtl().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF restingPosition = mPositioner.getRestingPosition(); - - assertThat(restingPosition.x).isEqualTo(allowableStackRegion.right); - assertThat(restingPosition.y).isEqualTo(getDefaultYPosition()); - } - - /** Test that the default resting position on tablet is middle left. */ - @Test - public void testGetRestingPosition_chatBubble_onTablet() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF restingPosition = mPositioner.getRestingPosition(); - - assertThat(restingPosition.x).isEqualTo(allowableStackRegion.left); - assertThat(restingPosition.y).isEqualTo(getDefaultYPosition()); - } - - @Test - public void testGetRestingPosition_chatBubble_onTablet_RTL() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().setRtl().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF restingPosition = mPositioner.getRestingPosition(); - - assertThat(restingPosition.x).isEqualTo(allowableStackRegion.right); - assertThat(restingPosition.y).isEqualTo(getDefaultYPosition()); - } - - /** Test that the default resting position on tablet is middle right. */ - @Test - public void testGetDefaultPosition_appBubble_onTablet() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF startPosition = mPositioner.getDefaultStartPosition(true /* isAppBubble */); - - assertThat(startPosition.x).isEqualTo(allowableStackRegion.right); - assertThat(startPosition.y).isEqualTo(getDefaultYPosition()); - } - - @Test - public void testGetRestingPosition_appBubble_onTablet_RTL() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().setRtl().build(); - mPositioner.update(deviceConfig); - - RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - PointF startPosition = mPositioner.getDefaultStartPosition(true /* isAppBubble */); - - assertThat(startPosition.x).isEqualTo(allowableStackRegion.left); - assertThat(startPosition.y).isEqualTo(getDefaultYPosition()); - } - - @Test - public void testHasUserModifiedDefaultPosition_false() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().setRtl().build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.hasUserModifiedDefaultPosition()).isFalse(); - - mPositioner.setRestingPosition(mPositioner.getDefaultStartPosition()); - - assertThat(mPositioner.hasUserModifiedDefaultPosition()).isFalse(); - } - - @Test - public void testHasUserModifiedDefaultPosition_true() { - DeviceConfig deviceConfig = new ConfigBuilder().setLargeScreen().setRtl().build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.hasUserModifiedDefaultPosition()).isFalse(); - - mPositioner.setRestingPosition(new PointF(0, 100)); - - assertThat(mPositioner.hasUserModifiedDefaultPosition()).isTrue(); - } - - @Test - public void testGetExpandedViewHeight_max() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - assertThat(mPositioner.getExpandedViewHeight(bubble)).isEqualTo(MAX_HEIGHT); - } - - @Test - public void testGetExpandedViewHeight_customHeight_valid() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - final int minHeight = mContext.getResources().getDimensionPixelSize( - R.dimen.bubble_expanded_default_height); - Bubble bubble = new Bubble("key", - mock(ShortcutInfo.class), - minHeight + 100 /* desiredHeight */, - 0 /* desiredHeightResId */, - "title", - 0 /* taskId */, - null /* locus */, - true /* isDismissable */, - directExecutor(), - mock(Bubbles.BubbleMetadataFlagListener.class)); - - // Ensure the height is the same as the desired value - assertThat(mPositioner.getExpandedViewHeight(bubble)).isEqualTo( - bubble.getDesiredHeight(mContext)); - } - - - @Test - public void testGetExpandedViewHeight_customHeight_tooSmall() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Bubble bubble = new Bubble("key", - mock(ShortcutInfo.class), - 10 /* desiredHeight */, - 0 /* desiredHeightResId */, - "title", - 0 /* taskId */, - null /* locus */, - true /* isDismissable */, - directExecutor(), - mock(Bubbles.BubbleMetadataFlagListener.class)); - - // Ensure the height is the same as the minimum value - final int minHeight = mContext.getResources().getDimensionPixelSize( - R.dimen.bubble_expanded_default_height); - assertThat(mPositioner.getExpandedViewHeight(bubble)).isEqualTo(minHeight); - } - - @Test - public void testGetMaxExpandedViewHeight_onLargeTablet() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - int manageButtonHeight = - mContext.getResources().getDimensionPixelSize(R.dimen.bubble_manage_button_height); - int pointerWidth = mContext.getResources().getDimensionPixelSize( - R.dimen.bubble_pointer_width); - int expandedViewPadding = mContext.getResources().getDimensionPixelSize(R - .dimen.bubble_expanded_view_padding); - float expectedHeight = 1800 - 2 * 20 - manageButtonHeight - pointerWidth - - expandedViewPadding * 2; - assertThat(((float) mPositioner.getMaxExpandedViewHeight(false /* isOverflow */))) - .isWithin(0.1f).of(expectedHeight); - } - - @Test - public void testAreBubblesBottomAligned_largeScreen_true() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.areBubblesBottomAligned()).isTrue(); - } - - @Test - public void testAreBubblesBottomAligned_largeScreen_false() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setLandscape() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.areBubblesBottomAligned()).isFalse(); - } - - @Test - public void testAreBubblesBottomAligned_smallTablet_false() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setSmallTablet() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.areBubblesBottomAligned()).isFalse(); - } - - @Test - public void testAreBubblesBottomAligned_phone_false() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - assertThat(mPositioner.areBubblesBottomAligned()).isFalse(); - } - - @Test - public void testExpandedViewY_phoneLandscape() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLandscape() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - // This bubble will have max height so it'll always be top aligned - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(mPositioner.getExpandedViewYTopAligned()); - } - - @Test - public void testExpandedViewY_phonePortrait() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - // Always top aligned in phone portrait - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(mPositioner.getExpandedViewYTopAligned()); - } - - @Test - public void testExpandedViewY_smallTabletLandscape() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setSmallTablet() - .setLandscape() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - // This bubble will have max height which is always top aligned on small tablets - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(mPositioner.getExpandedViewYTopAligned()); - } - - @Test - public void testExpandedViewY_smallTabletPortrait() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setSmallTablet() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - // This bubble will have max height which is always top aligned on small tablets - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(mPositioner.getExpandedViewYTopAligned()); - } - - @Test - public void testExpandedViewY_largeScreenLandscape() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setLandscape() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - // This bubble will have max height which is always top aligned on landscape, large tablet - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(mPositioner.getExpandedViewYTopAligned()); - } - - @Test - public void testExpandedViewY_largeScreenPortrait() { - Insets insets = Insets.of(10, 20, 5, 15); - Rect screenBounds = new Rect(0, 0, 1800, 2600); - - DeviceConfig deviceConfig = new ConfigBuilder() - .setLargeScreen() - .setInsets(insets) - .setScreenBounds(screenBounds) - .build(); - mPositioner.update(deviceConfig); - - Intent intent = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName()); - Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1), null, directExecutor()); - - int manageButtonHeight = - mContext.getResources().getDimensionPixelSize(R.dimen.bubble_manage_button_height); - int manageButtonPlusMargin = manageButtonHeight + 2 - * mContext.getResources().getDimensionPixelSize( - R.dimen.bubble_manage_button_margin); - int pointerWidth = mContext.getResources().getDimensionPixelSize( - R.dimen.bubble_pointer_width); - - final float expectedExpandedViewY = mPositioner.getAvailableRect().bottom - - manageButtonPlusMargin - - mPositioner.getExpandedViewHeightForLargeScreen() - - pointerWidth; - - // Bubbles are bottom aligned on portrait, large tablet - assertThat(mPositioner.getExpandedViewY(bubble, 0f /* bubblePosition */)) - .isEqualTo(expectedExpandedViewY); - } - - /** - * Calculates the Y position bubbles should be placed based on the config. Based on - * the calculations in {@link BubblePositioner#getDefaultStartPosition()} and - * {@link BubbleStackView.RelativeStackPosition}. - */ - private float getDefaultYPosition() { - final boolean isTablet = mPositioner.isLargeScreen(); - - // On tablet the position is centered, on phone it is an offset from the top. - final float desiredY = isTablet - ? mPositioner.getScreenRect().height() / 2f - (mPositioner.getBubbleSize() / 2f) - : mContext.getResources().getDimensionPixelOffset( - R.dimen.bubble_stack_starting_offset_y); - // Since we're visually centering the bubbles on tablet, use total screen height rather - // than the available height. - final float height = isTablet - ? mPositioner.getScreenRect().height() - : mPositioner.getAvailableRect().height(); - float offsetPercent = desiredY / height; - offsetPercent = Math.max(0f, Math.min(1f, offsetPercent)); - final RectF allowableStackRegion = - mPositioner.getAllowableStackPositionRegion(1 /* bubbleCount */); - return allowableStackRegion.top + allowableStackRegion.height() * offsetPercent; - } - - /** - * Sets up window manager to return config values based on what you need for the test. - * By default it sets up a portrait phone without any insets. - */ - private static class ConfigBuilder { - private Rect mScreenBounds = new Rect(0, 0, 1000, 2000); - private boolean mIsLargeScreen = false; - private boolean mIsSmallTablet = false; - private boolean mIsLandscape = false; - private boolean mIsRtl = false; - private Insets mInsets = Insets.of(0, 0, 0, 0); - - public ConfigBuilder setScreenBounds(Rect screenBounds) { - mScreenBounds = screenBounds; - return this; - } - - public ConfigBuilder setLargeScreen() { - mIsLargeScreen = true; - return this; - } - - public ConfigBuilder setSmallTablet() { - mIsSmallTablet = true; - return this; - } - - public ConfigBuilder setLandscape() { - mIsLandscape = true; - return this; - } - - public ConfigBuilder setRtl() { - mIsRtl = true; - return this; - } - - public ConfigBuilder setInsets(Insets insets) { - mInsets = insets; - return this; - } - - private DeviceConfig build() { - return new DeviceConfig(mIsLargeScreen, mIsSmallTablet, mIsLandscape, mIsRtl, - mScreenBounds, mInsets); - } - } -} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleViewInfoTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleViewInfoTest.kt index f58332198696..ae39fbcb4eed 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleViewInfoTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleViewInfoTest.kt @@ -44,6 +44,7 @@ import com.android.wm.shell.common.TaskStackListenerImpl import com.android.wm.shell.sysui.ShellCommandHandler import com.android.wm.shell.sysui.ShellController import com.android.wm.shell.sysui.ShellInit +import com.android.wm.shell.taskview.TaskView import com.android.wm.shell.taskview.TaskViewTransitions import com.android.wm.shell.transition.Transitions import com.google.common.truth.Truth.assertThat @@ -55,10 +56,9 @@ import org.mockito.kotlin.doThrow import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.whenever +import java.util.concurrent.Executor -/** - * Tests for loading / inflating views & icons for a bubble. - */ +/** Tests for loading / inflating views & icons for a bubble. */ @SmallTest @RunWith(AndroidTestingRunner::class) @RunWithLooper(setAsMainLooper = true) @@ -67,34 +67,47 @@ class BubbleViewInfoTest : ShellTestCase() { private lateinit var metadataFlagListener: Bubbles.BubbleMetadataFlagListener private lateinit var iconFactory: BubbleIconFactory private lateinit var bubble: Bubble - private lateinit var bubbleController: BubbleController private lateinit var mainExecutor: ShellExecutor private lateinit var bubbleStackView: BubbleStackView private lateinit var bubbleBarLayerView: BubbleBarLayerView + private lateinit var bubblePositioner: BubblePositioner + private lateinit var expandedViewManager: BubbleExpandedViewManager + + private val bubbleTaskViewFactory = BubbleTaskViewFactory { + BubbleTaskView(mock<TaskView>(), mock<Executor>()) + } @Before fun setup() { metadataFlagListener = Bubbles.BubbleMetadataFlagListener {} - iconFactory = BubbleIconFactory(context, + iconFactory = + BubbleIconFactory( + context, 60, 30, Color.RED, - mContext.resources.getDimensionPixelSize( - R.dimen.importance_ring_stroke_width)) + mContext.resources.getDimensionPixelSize(R.dimen.importance_ring_stroke_width) + ) mainExecutor = TestShellExecutor() val windowManager = context.getSystemService(WindowManager::class.java) val shellInit = ShellInit(mainExecutor) val shellCommandHandler = ShellCommandHandler() - val shellController = ShellController(context, shellInit, shellCommandHandler, - mainExecutor) - val bubblePositioner = BubblePositioner(context, windowManager) - val bubbleData = BubbleData(context, mock<BubbleLogger>(), bubblePositioner, - BubbleEducationController(context), mainExecutor) + val shellController = ShellController(context, shellInit, shellCommandHandler, mainExecutor) + bubblePositioner = BubblePositioner(context, windowManager) + val bubbleData = + BubbleData( + context, + mock<BubbleLogger>(), + bubblePositioner, + BubbleEducationController(context), + mainExecutor + ) val surfaceSynchronizer = { obj: Runnable -> obj.run() } - bubbleController = BubbleController( + bubbleController = + BubbleController( context, shellInit, shellCommandHandler, @@ -122,18 +135,39 @@ class BubbleViewInfoTest : ShellTestCase() { mock<Transitions>(), mock<SyncTransactionQueue>(), mock<IWindowManager>(), - mock<BubbleProperties>()) + mock<BubbleProperties>() + ) - bubbleStackView = BubbleStackView(context, bubbleController, bubbleData, - surfaceSynchronizer, FloatingContentCoordinator(), mainExecutor) - bubbleBarLayerView = BubbleBarLayerView(context, bubbleController) + val bubbleStackViewManager = BubbleStackViewManager.fromBubbleController(bubbleController) + bubbleStackView = + BubbleStackView( + context, + bubbleStackViewManager, + bubblePositioner, + bubbleData, + surfaceSynchronizer, + FloatingContentCoordinator(), + bubbleController, + mainExecutor + ) + expandedViewManager = BubbleExpandedViewManager.fromBubbleController(bubbleController) + bubbleBarLayerView = BubbleBarLayerView(context, bubbleController, bubbleData) } @Test fun testPopulate() { bubble = createBubbleWithShortcut() - val info = BubbleViewInfoTask.BubbleViewInfo.populate(context, - bubbleController, bubbleStackView, iconFactory, bubble, false /* skipInflation */) + val info = + BubbleViewInfoTask.BubbleViewInfo.populate( + context, + expandedViewManager, + bubbleTaskViewFactory, + bubblePositioner, + bubbleStackView, + iconFactory, + bubble, + false /* skipInflation */ + ) assertThat(info!!).isNotNull() assertThat(info.imageView).isNotNull() @@ -151,9 +185,17 @@ class BubbleViewInfoTest : ShellTestCase() { @Test fun testPopulateForBubbleBar() { bubble = createBubbleWithShortcut() - val info = BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar(context, - bubbleController, bubbleBarLayerView, iconFactory, bubble, - false /* skipInflation */) + val info = + BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar( + context, + expandedViewManager, + bubbleTaskViewFactory, + bubblePositioner, + bubbleBarLayerView, + iconFactory, + bubble, + false /* skipInflation */ + ) assertThat(info!!).isNotNull() assertThat(info.imageView).isNull() @@ -176,12 +218,20 @@ class BubbleViewInfoTest : ShellTestCase() { // exception here if the app has an issue loading the shortcut icon; we default to // the app icon in that case / none of the icons will be null. val mockIconFactory = mock<BubbleIconFactory>() - whenever(mockIconFactory.getBubbleDrawable(eq(context), eq(bubble.shortcutInfo), - any())).doThrow(RuntimeException()) + whenever(mockIconFactory.getBubbleDrawable(eq(context), eq(bubble.shortcutInfo), any())) + .doThrow(RuntimeException()) - val info = BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar(context, - bubbleController, bubbleBarLayerView, iconFactory, bubble, - true /* skipInflation */) + val info = + BubbleViewInfoTask.BubbleViewInfo.populateForBubbleBar( + context, + expandedViewManager, + bubbleTaskViewFactory, + bubblePositioner, + bubbleBarLayerView, + iconFactory, + bubble, + true /* skipInflation */ + ) assertThat(info).isNotNull() assertThat(info?.shortcutInfo).isNotNull() @@ -194,8 +244,17 @@ class BubbleViewInfoTest : ShellTestCase() { private fun createBubbleWithShortcut(): Bubble { val shortcutInfo = ShortcutInfo.Builder(mContext, "mockShortcutId").build() - return Bubble("mockKey", shortcutInfo, 1000, Resources.ID_NULL, - "mockTitle", 0 /* taskId */, "mockLocus", true /* isDismissible */, - mainExecutor, metadataFlagListener) + return Bubble( + "mockKey", + shortcutInfo, + 1000, + Resources.ID_NULL, + "mockTitle", + 0 /* taskId */, + "mockLocus", + true /* isDismissible */, + mainExecutor, + metadataFlagListener + ) } -}
\ No newline at end of file +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationControllerTest.java index c1ff260836b8..60f1d271c3af 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationControllerTest.java @@ -16,52 +16,51 @@ package com.android.wm.shell.bubbles.animation; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.annotation.SuppressLint; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Insets; import android.graphics.PointF; import android.graphics.Rect; -import android.testing.AndroidTestingRunner; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; import androidx.dynamicanimation.animation.DynamicAnimation; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.wm.shell.R; import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubbleStackView; +import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; + @SmallTest -@RunWith(AndroidTestingRunner.class) +@RunWith(AndroidJUnit4.class) public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestCase { - private int mDisplayWidth = 500; - private int mDisplayHeight = 1000; - - private Runnable mOnBubbleAnimatedOutAction = mock(Runnable.class); + private final Semaphore mBubbleRemovedSemaphore = new Semaphore(0); + private final Runnable mOnBubbleAnimatedOutAction = mBubbleRemovedSemaphore::release; ExpandedAnimationController mExpandedController; private int mStackOffset; private PointF mExpansionPoint; private BubblePositioner mPositioner; - private BubbleStackView.StackViewState mStackViewState = new BubbleStackView.StackViewState(); + private final BubbleStackView.StackViewState mStackViewState = + new BubbleStackView.StackViewState(); - @SuppressLint("VisibleForTests") @Before public void setUp() throws Exception { super.setUp(); @@ -70,15 +69,13 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC getContext().getSystemService(WindowManager.class)); mPositioner.updateInternal(Configuration.ORIENTATION_PORTRAIT, Insets.of(0, 0, 0, 0), - new Rect(0, 0, mDisplayWidth, mDisplayHeight)); + new Rect(0, 0, 500, 1000)); BubbleStackView stackView = mock(BubbleStackView.class); - when(stackView.getState()).thenReturn(getStackViewState()); mExpandedController = new ExpandedAnimationController(mPositioner, mOnBubbleAnimatedOutAction, stackView); - spyOn(mExpandedController); addOneMoreThanBubbleLimitBubbles(); mLayout.setActiveController(mExpandedController); @@ -86,9 +83,18 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC Resources res = mLayout.getResources(); mStackOffset = res.getDimensionPixelSize(R.dimen.bubble_stack_offset); mExpansionPoint = new PointF(100, 100); + + getStackViewState(); + when(stackView.getState()).thenAnswer(i -> getStackViewState()); + waitForMainThread(); } - public BubbleStackView.StackViewState getStackViewState() { + @After + public void tearDown() { + waitForMainThread(); + } + + private BubbleStackView.StackViewState getStackViewState() { mStackViewState.numberOfBubbles = mLayout.getChildCount(); mStackViewState.selectedIndex = 0; mStackViewState.onLeft = mPositioner.isStackOnLeft(mExpansionPoint); @@ -96,68 +102,71 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC } @Test - @Ignore - public void testExpansionAndCollapse() throws InterruptedException { - Runnable afterExpand = mock(Runnable.class); - mExpandedController.expandFromStack(afterExpand); - waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); - + public void testExpansionAndCollapse() throws Exception { + expand(); testBubblesInCorrectExpandedPositions(); - verify(afterExpand).run(); + waitForMainThread(); - Runnable afterCollapse = mock(Runnable.class); + final Semaphore semaphore = new Semaphore(0); + Runnable afterCollapse = semaphore::release; mExpandedController.collapseBackToStack(mExpansionPoint, false, afterCollapse); - waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); - - testStackedAtPosition(mExpansionPoint.x, mExpansionPoint.y, -1); - verify(afterExpand).run(); + assertThat(semaphore.tryAcquire(1, 2, TimeUnit.SECONDS)).isTrue(); + waitForAnimation(); + testStackedAtPosition(mExpansionPoint.x, mExpansionPoint.y); } @Test - @Ignore - public void testOnChildAdded() throws InterruptedException { + public void testOnChildAdded() throws Exception { expand(); + waitForMainThread(); // Add another new view and wait for its animation. final View newView = new FrameLayout(getContext()); mLayout.addView(newView, 0); - waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); + waitForAnimation(); testBubblesInCorrectExpandedPositions(); } @Test - @Ignore - public void testOnChildRemoved() throws InterruptedException { + public void testOnChildRemoved() throws Exception { expand(); + waitForMainThread(); - // Remove some views and see if the remaining child views still pass the expansion test. + // Remove some views and verify the remaining child views still pass the expansion test. mLayout.removeView(mViews.get(0)); mLayout.removeView(mViews.get(3)); - waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); + + // Removing a view will invoke onBubbleAnimatedOutAction. Block until it gets called twice. + assertThat(mBubbleRemovedSemaphore.tryAcquire(2, 2, TimeUnit.SECONDS)).isTrue(); + + waitForAnimation(); testBubblesInCorrectExpandedPositions(); } @Test - public void testDragBubbleOutDoesntNPE() throws InterruptedException { + public void testDragBubbleOutDoesntNPE() { mExpandedController.onGestureFinished(); mExpandedController.dragBubbleOut(mViews.get(0), 1, 1); } /** Expand the stack and wait for animations to finish. */ private void expand() throws InterruptedException { - mExpandedController.expandFromStack(mock(Runnable.class)); - waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); + final Semaphore semaphore = new Semaphore(0); + Runnable afterExpand = semaphore::release; + + mExpandedController.expandFromStack(afterExpand); + assertThat(semaphore.tryAcquire(1, TimeUnit.SECONDS)).isTrue(); } /** Check that children are in the correct positions for being stacked. */ - private void testStackedAtPosition(float x, float y, int offsetMultiplier) { + private void testStackedAtPosition(float x, float y) { // Make sure the rest of the stack moved again, including the first bubble not moving, and // is stacked to the right now that we're on the right side of the screen. for (int i = 0; i < mLayout.getChildCount(); i++) { - assertEquals(x + i * offsetMultiplier * mStackOffset, - mLayout.getChildAt(i).getTranslationX(), 2f); - assertEquals(y, mLayout.getChildAt(i).getTranslationY(), 2f); + assertEquals(x, mLayout.getChildAt(i).getTranslationX(), 2f); + assertEquals(y + Math.min(i, 1) * mStackOffset, mLayout.getChildAt(i).getTranslationY(), + 2f); assertEquals(1f, mLayout.getChildAt(i).getAlpha(), .01f); } } @@ -175,4 +184,22 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC mLayout.getChildAt(i).getTranslationY(), 2f); } } + + private void waitForAnimation() throws Exception { + final Semaphore semaphore = new Semaphore(0); + boolean[] animating = new boolean[]{ true }; + for (int i = 0; i < 4; i++) { + if (animating[0]) { + mMainThreadHandler.post(() -> { + if (!mExpandedController.isAnimating()) { + animating[0] = false; + semaphore.release(); + } + }); + Thread.sleep(500); + } + } + assertThat(semaphore.tryAcquire(1, 2, TimeUnit.SECONDS)).isTrue(); + waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayoutTestCase.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayoutTestCase.java index 48ae2961b4be..2ed5addd900c 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayoutTestCase.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayoutTestCase.java @@ -164,11 +164,17 @@ public class PhysicsAnimationLayoutTestCase extends ShellTestCase { @Override public void cancelAllAnimations() { + if (mLayout.getChildCount() == 0) { + return; + } mMainThreadHandler.post(super::cancelAllAnimations); } @Override public void cancelAnimationsOnView(View view) { + if (mLayout.getChildCount() == 0) { + return; + } mMainThreadHandler.post(() -> super.cancelAnimationsOnView(view)); } @@ -221,6 +227,9 @@ public class PhysicsAnimationLayoutTestCase extends ShellTestCase { @Override protected void startPathAnimation() { + if (mLayout.getChildCount() == 0) { + return; + } mMainThreadHandler.post(super::startPathAnimation); } } @@ -322,4 +331,9 @@ public class PhysicsAnimationLayoutTestCase extends ShellTestCase { e.printStackTrace(); } } + + /** Waits for the main thread to finish processing all pending runnables. */ + public void waitForMainThread() { + runOnMainThreadAndBlock(() -> {}); + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt index 9f1ee6c92700..a9f054ec2b2f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt @@ -30,6 +30,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers +import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyFloat import org.mockito.Mockito import org.mockito.Mockito.`when` @@ -97,7 +98,7 @@ class MagnetizedObjectTest : ShellTestCase() { // The mock target view will pretend that it's 200x200, and at (400, 800). This means it's // occupying the bounds (400, 800, 600, 1000) and it has a center of (500, 900). - `when`(targetView.width).thenReturn(targetSize) // width = 200 + `when`(targetView.width).thenReturn(targetSize) // width = 200 `when`(targetView.height).thenReturn(targetSize) // height = 200 doAnswer { invocation -> (invocation.arguments[0] as IntArray).also { location -> @@ -275,11 +276,11 @@ class MagnetizedObjectTest : ShellTestCase() { // Forcefully fling the object towards the target (but never touch the magnetic field). dispatchMotionEvents( getMotionEvent( - x = targetCenterX, + x = 0, y = 0, action = MotionEvent.ACTION_DOWN), getMotionEvent( - x = targetCenterX, + x = targetCenterX / 2, y = targetCenterY / 2), getMotionEvent( x = targetCenterX, @@ -405,15 +406,78 @@ class MagnetizedObjectTest : ShellTestCase() { verify(magnetListener).onStuckToTarget(magneticTarget) } + @Test + fun testMagneticTargetHasScreenOffset_moveIntoAndReleaseInTarget() { + magneticTarget.screenVerticalOffset = 500 + + dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY)) + // Moved into the target location, but it should be shifted due to screen offset. + // Should not get stuck. + verify(magnetListener, never()).onStuckToTarget(magneticTarget) + + dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY + 500)) + verify(magnetListener).onStuckToTarget(magneticTarget) + + dispatchMotionEvents( + getMotionEvent( + x = targetCenterX, + y = targetCenterY + 500, + action = MotionEvent.ACTION_UP + ) + ) + + verify(magnetListener).onReleasedInTarget(magneticTarget) + verifyNoMoreInteractions(magnetListener) + } + + @Test + fun testMagneticTargetHasScreenOffset_screenOffsetUpdates() { + magneticTarget.screenVerticalOffset = 500 + val adjustedTargetCenter = targetCenterY + 500 + + dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = adjustedTargetCenter)) + dispatchMotionEvents(getMotionEvent(x = 0, y = 0)) + verify(magnetListener).onStuckToTarget(magneticTarget) + verify(magnetListener) + .onUnstuckFromTarget(eq(magneticTarget), anyFloat(), anyFloat(), anyBoolean()) + + // Offset if removed, we should now get stuck at the target location + magneticTarget.screenVerticalOffset = 0 + dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY)) + verify(magnetListener, times(2)).onStuckToTarget(magneticTarget) + } + + @Test + fun testMagneticTargetHasScreenOffset_flingTowardsTarget() { + timeStep = 10 + + magneticTarget.screenVerticalOffset = 500 + val adjustedTargetCenter = targetCenterY + 500 + + // Forcefully fling the object towards the target (but never touch the magnetic field). + dispatchMotionEvents( + getMotionEvent(x = 0, y = 0, action = MotionEvent.ACTION_DOWN), + getMotionEvent(x = targetCenterX / 2, y = adjustedTargetCenter / 2), + getMotionEvent( + x = targetCenterX, + y = adjustedTargetCenter - magneticFieldRadius * 2, + action = MotionEvent.ACTION_UP + ) + ) + + // Nevertheless it should have ended up stuck to the target. + verify(magnetListener, times(1)).onStuckToTarget(magneticTarget) + } + private fun getSecondMagneticTarget(): MagnetizedObject.MagneticTarget { // The first target view is at bounds (400, 800, 600, 1000) and it has a center of // (500, 900). We'll add a second one at bounds (0, 800, 200, 1000) with center (100, 900). val secondTargetView = mock(View::class.java) - var secondTargetCenterX = 100 - var secondTargetCenterY = 900 + val secondTargetCenterX = 100 + val secondTargetCenterY = 900 `when`(secondTargetView.context).thenReturn(context) - `when`(secondTargetView.width).thenReturn(targetSize) // width = 200 + `when`(secondTargetView.width).thenReturn(targetSize) // width = 200 `when`(secondTargetView.height).thenReturn(targetSize) // height = 200 doAnswer { invocation -> (invocation.arguments[0] as Runnable).run() diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitScreenUtilsTests.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitScreenUtilsTests.kt new file mode 100644 index 000000000000..955660c396d0 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitScreenUtilsTests.kt @@ -0,0 +1,69 @@ +/* + * 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.common.split + +import android.content.ComponentName +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.wm.shell.ShellTestCase +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.any +import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` + +@RunWith(AndroidJUnit4::class) +class SplitScreenUtilsTests : ShellTestCase() { + + @Test + fun getShortcutComponent_nullShortcuts() { + val launcherApps = mock(LauncherApps::class.java).also { + `when`(it.getShortcuts(any(), any())).thenReturn(null) + } + assertEquals(null, SplitScreenUtils.getShortcutComponent(TEST_PACKAGE, + TEST_SHORTCUT_ID, UserHandle.CURRENT, launcherApps)) + } + + @Test + fun getShortcutComponent_noShortcuts() { + val launcherApps = mock(LauncherApps::class.java).also { + `when`(it.getShortcuts(any(), any())).thenReturn(ArrayList<ShortcutInfo>()) + } + assertEquals(null, SplitScreenUtils.getShortcutComponent(TEST_PACKAGE, + TEST_SHORTCUT_ID, UserHandle.CURRENT, launcherApps)) + } + + @Test + fun getShortcutComponent_validShortcut() { + val component = ComponentName(TEST_PACKAGE, TEST_ACTIVITY) + val shortcutInfo = ShortcutInfo.Builder(context, "id").setActivity(component).build() + val launcherApps = mock(LauncherApps::class.java).also { + `when`(it.getShortcuts(any(), any())).thenReturn(arrayListOf(shortcutInfo)) + } + assertEquals(component, SplitScreenUtils.getShortcutComponent(TEST_PACKAGE, + TEST_SHORTCUT_ID, UserHandle.CURRENT, launcherApps)) + } + + companion object { + val TEST_PACKAGE = "com.android.wm.shell.common.split" + val TEST_ACTIVITY = "TestActivity"; + val TEST_SHORTCUT_ID = "test_shortcut_1" + } +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUILayoutTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUILayoutTest.java index 23a4e3956289..dd358e757fde 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUILayoutTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUILayoutTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import android.app.ActivityManager; import android.app.AppCompatTaskInfo.CameraCompatControlState; import android.app.TaskInfo; +import android.graphics.Rect; import android.testing.AndroidTestingRunner; import android.util.Pair; import android.view.LayoutInflater; @@ -83,6 +84,7 @@ public class CompatUILayoutTest extends ShellTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); + doReturn(100).when(mCompatUIConfiguration).getHideSizeCompatRestartButtonTolerance(); mTaskInfo = createTaskInfo(/* hasSizeCompat= */ false, CAMERA_COMPAT_CONTROL_HIDDEN); mWindowManager = new CompatUIWindowManager(mContext, mTaskInfo, mSyncTransactionQueue, mCallback, mTaskListener, new DisplayLayout(), new CompatUIHintsState(), @@ -221,6 +223,9 @@ public class CompatUILayoutTest extends ShellTestCase { taskInfo.taskId = TASK_ID; taskInfo.appCompatTaskInfo.topActivityInSizeCompat = hasSizeCompat; taskInfo.appCompatTaskInfo.cameraCompatControlState = cameraCompatControlState; + taskInfo.appCompatTaskInfo.topActivityLetterboxHeight = 1000; + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = 1000; + taskInfo.configuration.windowConfiguration.setBounds(new Rect(0, 0, 2000, 2000)); return taskInfo; } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java index d4b97ed55192..4f261cd79d39 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIWindowManagerTest.java @@ -20,6 +20,7 @@ import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_DISMISSED; import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_HIDDEN; import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_APPLIED; import static android.app.AppCompatTaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_SUGGESTED; +import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT; import static android.view.WindowInsets.Type.navigationBars; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; @@ -27,6 +28,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doReturn; @@ -39,6 +41,7 @@ import android.app.AppCompatTaskInfo; import android.app.TaskInfo; import android.content.res.Configuration; import android.graphics.Rect; +import android.platform.test.flag.junit.SetFlagsRule; import android.testing.AndroidTestingRunner; import android.util.Pair; import android.view.DisplayInfo; @@ -50,6 +53,7 @@ import android.view.View; import androidx.test.filters.SmallTest; +import com.android.window.flags.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.DisplayLayout; @@ -59,6 +63,7 @@ import com.android.wm.shell.compatui.CompatUIController.CompatUIHintsState; import junit.framework.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -76,8 +81,12 @@ import java.util.function.Consumer; @RunWith(AndroidTestingRunner.class) @SmallTest public class CompatUIWindowManagerTest extends ShellTestCase { + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT); private static final int TASK_ID = 1; + private static final int TASK_WIDTH = 2000; + private static final int TASK_HEIGHT = 2000; @Mock private SyncTransactionQueue mSyncTransactionQueue; @Mock private CompatUIController.CompatUICallback mCallback; @@ -93,6 +102,7 @@ public class CompatUIWindowManagerTest extends ShellTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); + doReturn(100).when(mCompatUIConfiguration).getHideSizeCompatRestartButtonTolerance(); mTaskInfo = createTaskInfo(/* hasSizeCompat= */ false, CAMERA_COMPAT_CONTROL_HIDDEN); mWindowManager = new CompatUIWindowManager(mContext, mTaskInfo, mSyncTransactionQueue, mCallback, mTaskListener, new DisplayLayout(), new CompatUIHintsState(), @@ -138,6 +148,13 @@ public class CompatUIWindowManagerTest extends ShellTestCase { mWindowManager.mHasSizeCompat = false; assertFalse(mWindowManager.createLayout(/* canShow= */ true)); + // Returns false and doesn't create layout if restart button should be hidden. + clearInvocations(mWindowManager); + mWindowManager.mHasSizeCompat = true; + mTaskInfo.appCompatTaskInfo.topActivityLetterboxWidth = TASK_WIDTH; + mTaskInfo.appCompatTaskInfo.topActivityLetterboxHeight = TASK_HEIGHT; + assertFalse(mWindowManager.createLayout(/* canShow= */ true)); + verify(mWindowManager, never()).inflateLayout(); } @@ -199,6 +216,7 @@ public class CompatUIWindowManagerTest extends ShellTestCase { // No diff clearInvocations(mWindowManager); TaskInfo taskInfo = createTaskInfo(/* hasSizeCompat= */ true, CAMERA_COMPAT_CONTROL_HIDDEN); + doReturn(true).when(mWindowManager).shouldShowSizeCompatRestartButton(any()); assertTrue(mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true)); verify(mWindowManager, never()).updateSurfacePosition(); @@ -283,7 +301,6 @@ public class CompatUIWindowManagerTest extends ShellTestCase { @Test public void testUpdateCompatInfoLayoutNotInflatedYet() { - mWindowManager.mHasSizeCompat = true; mWindowManager.createLayout(/* canShow= */ false); verify(mWindowManager, never()).inflateLayout(); @@ -303,6 +320,15 @@ public class CompatUIWindowManagerTest extends ShellTestCase { mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true); verify(mWindowManager).inflateLayout(); + + // Change shouldShowSizeCompatRestartButton to false and pass canShow true, layout + // shouldn't be inflated + clearInvocations(mWindowManager); + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = TASK_WIDTH; + taskInfo.appCompatTaskInfo.topActivityLetterboxHeight = TASK_HEIGHT; + mWindowManager.updateCompatInfo(taskInfo, mTaskListener, /* canShow= */ true); + + verify(mWindowManager, never()).inflateLayout(); } @Test @@ -464,6 +490,36 @@ public class CompatUIWindowManagerTest extends ShellTestCase { Assert.assertTrue(mWindowManager.needsToBeRecreated(newTaskInfo, mTaskListener)); } + @Test + public void testShouldShowSizeCompatRestartButton() { + mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_HIDE_SCM_BUTTON); + + doReturn(86).when(mCompatUIConfiguration).getHideSizeCompatRestartButtonTolerance(); + mWindowManager = new CompatUIWindowManager(mContext, mTaskInfo, mSyncTransactionQueue, + mCallback, mTaskListener, new DisplayLayout(), new CompatUIHintsState(), + mCompatUIConfiguration, mOnRestartButtonClicked); + + // Simulate rotation of activity in square display + TaskInfo taskInfo = createTaskInfo(true, CAMERA_COMPAT_CONTROL_HIDDEN); + taskInfo.configuration.windowConfiguration.setBounds(new Rect(0, 0, 2000, 2000)); + taskInfo.appCompatTaskInfo.topActivityLetterboxHeight = 2000; + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = 1850; + + assertFalse(mWindowManager.shouldShowSizeCompatRestartButton(taskInfo)); + + // Simulate exiting split screen/folding + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = 1000; + assertTrue(mWindowManager.shouldShowSizeCompatRestartButton(taskInfo)); + + // Simulate folding + taskInfo.configuration.windowConfiguration.setBounds(new Rect(0, 0, 1000, 2000)); + assertFalse(mWindowManager.shouldShowSizeCompatRestartButton(taskInfo)); + + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = 1000; + taskInfo.appCompatTaskInfo.topActivityLetterboxHeight = 500; + assertTrue(mWindowManager.shouldShowSizeCompatRestartButton(taskInfo)); + } + private static TaskInfo createTaskInfo(boolean hasSizeCompat, @AppCompatTaskInfo.CameraCompatControlState int cameraCompatControlState) { ActivityManager.RunningTaskInfo taskInfo = new ActivityManager.RunningTaskInfo(); @@ -471,6 +527,11 @@ public class CompatUIWindowManagerTest extends ShellTestCase { taskInfo.appCompatTaskInfo.topActivityInSizeCompat = hasSizeCompat; taskInfo.appCompatTaskInfo.cameraCompatControlState = cameraCompatControlState; taskInfo.configuration.uiMode &= ~Configuration.UI_MODE_TYPE_DESK; + // Letterboxed activity that takes half the screen should show size compat restart button + taskInfo.configuration.windowConfiguration.setBounds( + new Rect(0, 0, TASK_WIDTH, TASK_HEIGHT)); + taskInfo.appCompatTaskInfo.topActivityLetterboxHeight = 1000; + taskInfo.appCompatTaskInfo.topActivityLetterboxWidth = 1000; return taskInfo; } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt index 3fe78efdf2b1..445f74a52b0d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt @@ -124,7 +124,7 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.addVisibleTasksListener(listener, executor) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isTrue() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(1) assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(1) } @@ -148,7 +148,7 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.addVisibleTasksListener(listener, executor) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isFalse() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(0) // One call as adding listener notifies it assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(0) } @@ -162,8 +162,8 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = true) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isTrue() - assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(1) + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(2) + assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(2) } @Test @@ -175,16 +175,16 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isTrue() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(1) assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(1) - assertThat(listener.hasVisibleTasksOnSecondaryDisplay).isFalse() + assertThat(listener.visibleTasksCountOnSecondaryDisplay).isEqualTo(0) assertThat(listener.visibleChangesOnSecondaryDisplay).isEqualTo(0) repo.updateVisibleFreeformTasks(displayId = 1, taskId = 2, visible = true) executor.flushAll() // Listener for secondary display is notified - assertThat(listener.hasVisibleTasksOnSecondaryDisplay).isTrue() + assertThat(listener.visibleTasksCountOnSecondaryDisplay).isEqualTo(1) assertThat(listener.visibleChangesOnSecondaryDisplay).isEqualTo(1) // No changes to listener for default display assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(1) @@ -198,7 +198,7 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isTrue() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(1) // Mark task 1 visible on secondary display repo.updateVisibleFreeformTasks(displayId = 1, taskId = 1, visible = true) @@ -208,11 +208,11 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { // 1 - visible task added // 2 - visible task removed assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(2) - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isFalse() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(0) // Secondary display should have 1 call for visible task added assertThat(listener.visibleChangesOnSecondaryDisplay).isEqualTo(1) - assertThat(listener.hasVisibleTasksOnSecondaryDisplay).isTrue() + assertThat(listener.visibleTasksCountOnSecondaryDisplay).isEqualTo(1) } @Test @@ -224,17 +224,17 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = true) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isTrue() + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(2) repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = false) executor.flushAll() - assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(1) + assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(3) repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = false) executor.flushAll() - assertThat(listener.hasVisibleTasksOnDefaultDisplay).isFalse() - assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(2) + assertThat(listener.visibleTasksCountOnDefaultDisplay).isEqualTo(0) + assertThat(listener.visibleChangesOnDefaultDisplay).isEqualTo(4) } @Test @@ -397,8 +397,8 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { } class TestVisibilityListener : DesktopModeTaskRepository.VisibleTasksListener { - var hasVisibleTasksOnDefaultDisplay = false - var hasVisibleTasksOnSecondaryDisplay = false + var visibleTasksCountOnDefaultDisplay = 0 + var visibleTasksCountOnSecondaryDisplay = 0 var visibleChangesOnDefaultDisplay = 0 var visibleChangesOnSecondaryDisplay = 0 @@ -409,14 +409,14 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { var stashedChangesOnDefaultDisplay = 0 var stashedChangesOnSecondaryDisplay = 0 - override fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) { + override fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) { when (displayId) { DEFAULT_DISPLAY -> { - hasVisibleTasksOnDefaultDisplay = hasVisibleFreeformTasks + visibleTasksCountOnDefaultDisplay = visibleTasksCount visibleChangesOnDefaultDisplay++ } SECOND_DISPLAY -> { - hasVisibleTasksOnSecondaryDisplay = hasVisibleFreeformTasks + visibleTasksCountOnSecondaryDisplay = visibleTasksCount visibleChangesOnSecondaryDisplay++ } else -> fail("Visible task listener received unexpected display id: $displayId") diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index 94c862bd7a4f..79634e6040c4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -303,7 +303,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToDesktop_displayFullscreen_windowingModeSetToFreeform() { val task = setUpFullscreenTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -313,7 +313,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToDesktop_displayFreeform_windowingModeSetToUndefined() { val task = setUpFullscreenTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_UNDEFINED) @@ -321,7 +321,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_nonExistentTask_doesNothing() { - controller.moveToDesktop(desktopModeWindowDecoration, 999) + controller.moveToDesktop(999) verifyWCTNotExecuted() } @@ -332,7 +332,7 @@ class DesktopTasksControllerTest : ShellTestCase() { val fullscreenTask = setUpFullscreenTask() markTaskHidden(freeformTask) - controller.moveToDesktop(desktopModeWindowDecoration, fullscreenTask) + controller.moveToDesktop(fullscreenTask) with(getLatestMoveToDesktopWct()) { // Operations should include home task, freeform task @@ -354,7 +354,7 @@ class DesktopTasksControllerTest : ShellTestCase() { val freeformTaskSecond = setUpFreeformTask(displayId = SECOND_DISPLAY) markTaskHidden(freeformTaskSecond) - controller.moveToDesktop(desktopModeWindowDecoration, fullscreenTaskDefault) + controller.moveToDesktop(fullscreenTaskDefault) with(getLatestMoveToDesktopWct()) { // Check that hierarchy operations do not include tasks from second display @@ -368,7 +368,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_splitTaskExitsSplit() { val task = setUpSplitScreenTask() - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -380,7 +380,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_fullscreenTaskDoesNotExitSplit() { val task = setUpFullscreenTask() - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -393,7 +393,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToFullscreen_displayFullscreen_windowingModeSetToUndefined() { val task = setUpFreeformTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN - controller.moveToFullscreen(task.taskId, desktopModeWindowDecoration) + controller.moveToFullscreen(task.taskId) val wct = getLatestExitDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_UNDEFINED) @@ -403,7 +403,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToFullscreen_displayFreeform_windowingModeSetToFullscreen() { val task = setUpFreeformTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM - controller.moveToFullscreen(task.taskId, desktopModeWindowDecoration) + controller.moveToFullscreen(task.taskId) val wct = getLatestExitDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FULLSCREEN) @@ -411,7 +411,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToFullscreen_nonExistentTask_doesNothing() { - controller.moveToFullscreen(999, desktopModeWindowDecoration) + controller.moveToFullscreen(999) verifyWCTNotExecuted() } @@ -420,7 +420,7 @@ class DesktopTasksControllerTest : ShellTestCase() { val taskDefaultDisplay = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val taskSecondDisplay = setUpFreeformTask(displayId = SECOND_DISPLAY) - controller.moveToFullscreen(taskDefaultDisplay.taskId, desktopModeWindowDecoration) + controller.moveToFullscreen(taskDefaultDisplay.taskId) with(getLatestExitDesktopWct()) { assertThat(changes.keys).contains(taskDefaultDisplay.token.asBinder()) @@ -802,7 +802,7 @@ class DesktopTasksControllerTest : ShellTestCase() { private fun getLatestMoveToDesktopWct(): WindowContainerTransaction { val arg = ArgumentCaptor.forClass(WindowContainerTransaction::class.java) if (ENABLE_SHELL_TRANSITIONS) { - verify(enterDesktopTransitionHandler).moveToDesktop(arg.capture(), any()) + verify(enterDesktopTransitionHandler).moveToDesktop(arg.capture()) } else { verify(shellTaskOrganizer).applyTransaction(arg.capture()) } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt index 3bc90ade898e..98e90d60b3b6 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt @@ -24,7 +24,6 @@ import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_CANCEL_D import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP import com.android.wm.shell.windowdecor.MoveToDesktopAnimator -import java.util.function.Supplier import junit.framework.Assert.assertFalse import org.junit.Before import org.junit.Test @@ -34,9 +33,11 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.kotlin.mock import org.mockito.kotlin.never +import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.verifyZeroInteractions import org.mockito.kotlin.whenever +import java.util.function.Supplier /** Tests of [DragToDesktopTransitionHandler]. */ @SmallTest @@ -150,6 +151,23 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { } @Test + fun startDragToDesktop_anotherTransitionInProgress_startDropped() { + val task = createTask() + val dragAnimator = mock<MoveToDesktopAnimator>() + + // Simulate attempt to start two drag to desktop transitions. + startDragToDesktopTransition(task, dragAnimator) + startDragToDesktopTransition(task, dragAnimator) + + // Verify transition only started once. + verify(transitions, times(1)).startTransition( + eq(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP), + any(), + eq(handler) + ) + } + + @Test fun cancelDragToDesktop_startWasReady_cancel() { val task = createTask() val dragAnimator = mock<MoveToDesktopAnimator>() @@ -189,6 +207,32 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { verifyZeroInteractions(dragAnimator) } + @Test + fun cancelDragToDesktop_transitionNotInProgress_dropCancel() { + // Then cancel is called before the transition was started. + handler.cancelDragToDesktopTransition() + + // Verify cancel is dropped. + verify(transitions, never()).startTransition( + eq(TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP), + any(), + eq(handler) + ) + } + + @Test + fun finishDragToDesktop_transitionNotInProgress_dropFinish() { + // Then finish is called before the transition was started. + handler.finishDragToDesktopTransition(WindowContainerTransaction()) + + // Verify finish is dropped. + verify(transitions, never()).startTransition( + eq(TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP), + any(), + eq(handler) + ) + } + private fun startDragToDesktopTransition( task: RunningTaskInfo, dragAnimator: MoveToDesktopAnimator @@ -202,7 +246,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { ) ) .thenReturn(token) - handler.startDragToDesktopTransition(task.taskId, dragAnimator, mock()) + handler.startDragToDesktopTransition(task.taskId, dragAnimator) return token } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.kt new file mode 100644 index 000000000000..522f05233f3a --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2024 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.draganddrop + +import android.os.RemoteException +import android.view.DragEvent +import android.view.DragEvent.ACTION_DROP +import android.view.IWindowManager +import android.view.SurfaceControl +import android.window.IUnhandledDragCallback +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.draganddrop.UnhandledDragController.UnhandledDragAndDropCallback +import java.util.function.Consumer +import junit.framework.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.mock +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +/** + * Tests for the unhandled drag controller. + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class UnhandledDragControllerTest : ShellTestCase() { + @Mock + private lateinit var mIWindowManager: IWindowManager + + @Mock + private lateinit var mMainExecutor: ShellExecutor + + private lateinit var mController: UnhandledDragController + + @Before + @Throws(RemoteException::class) + fun setUp() { + MockitoAnnotations.initMocks(this) + mController = UnhandledDragController(mIWindowManager, mMainExecutor) + } + + @Test + fun setListener_registersUnregistersWithWM() { + mController.setListener(object : UnhandledDragAndDropCallback {}) + mController.setListener(object : UnhandledDragAndDropCallback {}) + mController.setListener(object : UnhandledDragAndDropCallback {}) + verify(mIWindowManager, Mockito.times(1)) + .setUnhandledDragListener(ArgumentMatchers.any()) + + reset(mIWindowManager) + mController.setListener(null) + mController.setListener(null) + mController.setListener(null) + verify(mIWindowManager, Mockito.times(1)) + .setUnhandledDragListener(ArgumentMatchers.isNull()) + } + + @Test + fun onUnhandledDrop_noListener_expectNotifyUnhandled() { + // Simulate an unhandled drop + val dropEvent = DragEvent.obtain(ACTION_DROP, 0f, 0f, 0f, 0f, null, null, null, + null, null, false) + val wmCallback = mock(IUnhandledDragCallback::class.java) + mController.onUnhandledDrop(dropEvent, wmCallback) + + verify(wmCallback).notifyUnhandledDropComplete(ArgumentMatchers.eq(false)) + } + + @Test + fun onUnhandledDrop_withListener_expectNotifyHandled() { + val lastDragEvent = arrayOfNulls<DragEvent>(1) + + // Set a listener to listen for unhandled drops + mController.setListener(object : UnhandledDragAndDropCallback { + override fun onUnhandledDrop(dragEvent: DragEvent, + onFinishedCallback: Consumer<Boolean>) { + lastDragEvent[0] = dragEvent + onFinishedCallback.accept(true) + dragEvent.dragSurface.release() + } + }) + + // Simulate an unhandled drop + val dragSurface = mock(SurfaceControl::class.java) + val dropEvent = DragEvent.obtain(ACTION_DROP, 0f, 0f, 0f, 0f, null, null, null, + dragSurface, null, false) + val wmCallback = mock(IUnhandledDragCallback::class.java) + mController.onUnhandledDrop(dropEvent, wmCallback) + + verify(wmCallback).notifyUnhandledDropComplete(ArgumentMatchers.eq(true)) + verify(dragSurface).release() + assertEquals(lastDragEvent.get(0), dropEvent) + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipDoubleTapHelperTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipDoubleTapHelperTest.java index 0f8db85dcef4..b583acda1c9a 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipDoubleTapHelperTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipDoubleTapHelperTest.java @@ -16,10 +16,10 @@ package com.android.wm.shell.pip.phone; -import static com.android.wm.shell.pip.phone.PipDoubleTapHelper.SIZE_SPEC_CUSTOM; -import static com.android.wm.shell.pip.phone.PipDoubleTapHelper.SIZE_SPEC_DEFAULT; -import static com.android.wm.shell.pip.phone.PipDoubleTapHelper.SIZE_SPEC_MAX; -import static com.android.wm.shell.pip.phone.PipDoubleTapHelper.nextSizeSpec; +import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_CUSTOM; +import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_DEFAULT; +import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_MAX; +import static com.android.wm.shell.common.pip.PipDoubleTapHelper.nextSizeSpec; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,6 +30,7 @@ import android.testing.AndroidTestingRunner; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.pip.PipBoundsState; +import com.android.wm.shell.common.pip.PipDoubleTapHelper; import org.junit.Assert; import org.junit.Before; @@ -38,7 +39,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; /** - * Unit test against {@link PipDoubleTapHelper}. + * Unit test against {@link com.android.wm.shell.common.pip.PipDoubleTapHelper}. */ @RunWith(AndroidTestingRunner.class) public class PipDoubleTapHelperTest extends ShellTestCase { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipResizeGestureHandlerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipResizeGestureHandlerTest.java index 9719ba89b4bb..cc726cb0adcf 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipResizeGestureHandlerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipResizeGestureHandlerTest.java @@ -121,7 +121,7 @@ public class PipResizeGestureHandlerTest extends ShellTestCase { mPipResizeGestureHandler = new PipResizeGestureHandler(mContext, pipBoundsAlgorithm, mPipBoundsState, motionHelper, mPipTouchState, mPipTaskOrganizer, mPipDismissTargetHandler, - (Rect bounds) -> new Rect(), () -> {}, mPipUiEventLogger, mPhonePipMenuController, + () -> {}, mPipUiEventLogger, mPhonePipMenuController, mMainExecutor) { @Override public void pilferPointers() { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java index 855b7ee04702..7f3bfbb0e81d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java @@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION; +import static android.view.WindowManager.PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; @@ -36,6 +37,8 @@ import static org.mockito.ArgumentMatchers.isA; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -46,8 +49,10 @@ import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.app.PendingIntent; import android.content.ComponentName; +import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; import android.os.Bundle; import androidx.test.annotation.UiThreadTest; @@ -55,6 +60,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.launcher3.icons.IconProvider; +import com.android.wm.shell.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; @@ -91,6 +97,10 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class SplitScreenControllerTests extends ShellTestCase { + private static final String TEST_PACKAGE = "com.android.wm.shell.splitscreen"; + private static final String TEST_NOT_ALLOWED_PACKAGE = "com.android.wm.shell.splitscreen.fake"; + private static final String TEST_ACTIVITY = "TestActivity"; + @Mock ShellInit mShellInit; @Mock ShellCommandHandler mShellCommandHandler; @Mock ShellTaskOrganizer mTaskOrganizer; @@ -118,6 +128,8 @@ public class SplitScreenControllerTests extends ShellTestCase { public void setup() { assumeTrue(ActivityTaskManager.supportsSplitScreenMultiWindow(mContext)); MockitoAnnotations.initMocks(this); + String[] appsSupportingMultiInstance = mContext.getResources() + .getStringArray(R.array.config_appsSupportMultiInstancesSplit); mShellController = spy(new ShellController(mContext, mShellInit, mShellCommandHandler, mMainExecutor)); mSplitScreenController = spy(new SplitScreenController(mContext, mShellInit, @@ -125,7 +137,8 @@ public class SplitScreenControllerTests extends ShellTestCase { mRootTDAOrganizer, mDisplayController, mDisplayImeController, mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, - mDesktopTasksController, mMainExecutor, mStageCoordinator)); + mDesktopTasksController, mMainExecutor, mStageCoordinator, + appsSupportingMultiInstance)); } @Test @@ -200,7 +213,7 @@ public class SplitScreenControllerTests extends ShellTestCase { @Test public void startIntent_multiInstancesSupported_appendsMultipleTaskFag() { - doReturn(true).when(mSplitScreenController).supportMultiInstancesSplit(any()); + doReturn(true).when(mSplitScreenController).supportsMultiInstanceSplit(any()); Intent startIntent = createStartIntent("startActivity"); PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, startIntent, FLAG_IMMUTABLE); @@ -237,12 +250,13 @@ public class SplitScreenControllerTests extends ShellTestCase { verify(mStageCoordinator).startTask(anyInt(), eq(SPLIT_POSITION_TOP_OR_LEFT), isNull()); - verify(mSplitScreenController, never()).supportMultiInstancesSplit(any()); + verify(mSplitScreenController, never()).supportsMultiInstanceSplit(any()); verify(mStageCoordinator, never()).switchSplitPosition(any()); } @Test public void startIntent_multiInstancesSupported_startTaskInBackgroundAfterSplitActivated() { + doReturn(true).when(mSplitScreenController).supportsMultiInstanceSplit(any()); doNothing().when(mSplitScreenController).startTask(anyInt(), anyInt(), any()); Intent startIntent = createStartIntent("startActivity"); PendingIntent pendingIntent = @@ -259,14 +273,14 @@ public class SplitScreenControllerTests extends ShellTestCase { mSplitScreenController.startIntent(pendingIntent, mContext.getUserId(), null, SPLIT_POSITION_TOP_OR_LEFT, null); - verify(mSplitScreenController, never()).supportMultiInstancesSplit(any()); + verify(mSplitScreenController, never()).supportsMultiInstanceSplit(any()); verify(mStageCoordinator).startTask(anyInt(), eq(SPLIT_POSITION_TOP_OR_LEFT), isNull()); } @Test public void startIntent_multiInstancesNotSupported_switchesPositionAfterSplitActivated() { - doReturn(false).when(mSplitScreenController).supportMultiInstancesSplit(any()); + doReturn(false).when(mSplitScreenController).supportsMultiInstanceSplit(any()); Intent startIntent = createStartIntent("startActivity"); PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, startIntent, FLAG_IMMUTABLE); @@ -283,6 +297,139 @@ public class SplitScreenControllerTests extends ShellTestCase { verify(mStageCoordinator).switchSplitPosition(anyString()); } + @Test + public void supportsMultiInstanceSplit_inStaticAllowList() { + String[] allowList = { TEST_PACKAGE }; + SplitScreenController controller = new SplitScreenController(mContext, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + allowList); + ComponentName component = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); + assertEquals(true, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void supportsMultiInstanceSplit_notInStaticAllowList() { + String[] allowList = { TEST_PACKAGE }; + SplitScreenController controller = new SplitScreenController(mContext, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + allowList); + ComponentName component = new ComponentName(TEST_NOT_ALLOWED_PACKAGE, TEST_ACTIVITY); + assertEquals(false, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void supportsMultiInstanceSplit_activityPropertyTrue() + throws PackageManager.NameNotFoundException { + Context context = spy(mContext); + ComponentName component = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); + PackageManager pm = mock(PackageManager.class); + doReturn(pm).when(context).getPackageManager(); + PackageManager.Property activityProp = new PackageManager.Property("", true, "", ""); + doReturn(activityProp).when(pm).getProperty(eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), + eq(component)); + PackageManager.Property appProp = new PackageManager.Property("", false, "", ""); + doReturn(appProp).when(pm).getProperty(eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), + eq(component.getPackageName())); + + SplitScreenController controller = new SplitScreenController(context, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + new String[0]); + // Expect activity property to override application property + assertEquals(true, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void supportsMultiInstanceSplit_activityPropertyFalseApplicationPropertyTrue() + throws PackageManager.NameNotFoundException { + Context context = spy(mContext); + ComponentName component = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); + PackageManager pm = mock(PackageManager.class); + doReturn(pm).when(context).getPackageManager(); + PackageManager.Property activityProp = new PackageManager.Property("", false, "", ""); + doReturn(activityProp).when(pm).getProperty(eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), + eq(component)); + PackageManager.Property appProp = new PackageManager.Property("", true, "", ""); + doReturn(appProp).when(pm).getProperty(eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), + eq(component.getPackageName())); + + SplitScreenController controller = new SplitScreenController(context, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + new String[0]); + // Expect activity property to override application property + assertEquals(false, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void supportsMultiInstanceSplit_noActivityPropertyApplicationPropertyTrue() + throws PackageManager.NameNotFoundException { + Context context = spy(mContext); + ComponentName component = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); + PackageManager pm = mock(PackageManager.class); + doReturn(pm).when(context).getPackageManager(); + doThrow(PackageManager.NameNotFoundException.class).when(pm).getProperty( + eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), eq(component)); + PackageManager.Property appProp = new PackageManager.Property("", true, "", ""); + doReturn(appProp).when(pm).getProperty(eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), + eq(component.getPackageName())); + + SplitScreenController controller = new SplitScreenController(context, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + new String[0]); + // Expect fall through to app property + assertEquals(true, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void supportsMultiInstanceSplit_noActivityOrAppProperty() + throws PackageManager.NameNotFoundException { + Context context = spy(mContext); + ComponentName component = new ComponentName(TEST_PACKAGE, TEST_ACTIVITY); + PackageManager pm = mock(PackageManager.class); + doReturn(pm).when(context).getPackageManager(); + doThrow(PackageManager.NameNotFoundException.class).when(pm).getProperty( + eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), eq(component)); + doThrow(PackageManager.NameNotFoundException.class).when(pm).getProperty( + eq(PROPERTY_SUPPORTS_MULTI_INSTANCE_SYSTEM_UI), eq(component.getPackageName())); + + SplitScreenController controller = new SplitScreenController(context, mShellInit, + mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue, + mRootTDAOrganizer, mDisplayController, mDisplayImeController, + mDisplayInsetsController, mDragAndDropController, mTransitions, mTransactionPool, + mIconProvider, mRecentTasks, mLaunchAdjacentController, mWindowDecorViewModel, + mDesktopTasksController, mMainExecutor, mStageCoordinator, + new String[0]); + assertEquals(false, controller.supportsMultiInstanceSplit(component)); + } + + @Test + public void testSwitchSplitPosition_checksIsSplitScreenVisible() { + final String reason = "test"; + when(mSplitScreenController.isSplitScreenVisible()).thenReturn(true, false); + mSplitScreenController.switchSplitPosition(reason); + mSplitScreenController.switchSplitPosition(reason); + verify(mStageCoordinator, times(1)).switchSplitPosition(reason); + } + private Intent createStartIntent(String activityName) { Intent intent = new Intent(); intent.setComponent(new ComponentName(mContext, activityName)); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java index e22bf3de30e4..e9da25813510 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java @@ -64,6 +64,7 @@ import static org.mockito.Mockito.verify; import android.app.ActivityManager.RunningTaskInfo; import android.app.IApplicationThread; import android.app.PendingIntent; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Binder; @@ -420,6 +421,30 @@ public class ShellTransitionTests extends ShellTestCase { } @Test + public void testTransitionFilterActivityComponent() { + TransitionFilter filter = new TransitionFilter(); + ComponentName cmpt = new ComponentName("testpak", "testcls"); + filter.mRequirements = + new TransitionFilter.Requirement[]{new TransitionFilter.Requirement()}; + filter.mRequirements[0].mTopActivity = cmpt; + filter.mRequirements[0].mModes = new int[]{TRANSIT_OPEN, TRANSIT_TO_FRONT}; + + final RunningTaskInfo taskInf = createTaskInfo(1); + final TransitionInfo openTask = new TransitionInfoBuilder(TRANSIT_OPEN) + .addChange(TRANSIT_OPEN, taskInf).build(); + assertFalse(filter.matches(openTask)); + + taskInf.topActivity = cmpt; + final TransitionInfo openTaskCmpt = new TransitionInfoBuilder(TRANSIT_OPEN) + .addChange(TRANSIT_OPEN, taskInf).build(); + assertTrue(filter.matches(openTaskCmpt)); + + final TransitionInfo openAct = new TransitionInfoBuilder(TRANSIT_OPEN) + .addChange(TRANSIT_OPEN, cmpt).build(); + assertTrue(filter.matches(openAct)); + } + + @Test public void testRegisteredRemoteTransition() { Transitions transitions = createTestTransitions(); transitions.replaceDefaultHandlerForTest(mDefaultHandler); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/TransitionInfoBuilder.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/TransitionInfoBuilder.java index 834385832e4a..b8939e6ff623 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/TransitionInfoBuilder.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/TransitionInfoBuilder.java @@ -21,6 +21,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static org.mockito.Mockito.mock; import android.app.ActivityManager; +import android.content.ComponentName; import android.view.SurfaceControl; import android.view.WindowManager; import android.window.TransitionInfo; @@ -50,20 +51,34 @@ public class TransitionInfoBuilder { } public TransitionInfoBuilder addChange(@WindowManager.TransitionType int mode, - @TransitionInfo.ChangeFlags int flags, ActivityManager.RunningTaskInfo taskInfo) { + @TransitionInfo.ChangeFlags int flags, ActivityManager.RunningTaskInfo taskInfo, + ComponentName activityComponent) { final TransitionInfo.Change change = new TransitionInfo.Change( taskInfo != null ? taskInfo.token : null, createMockSurface(true /* valid */)); change.setMode(mode); change.setFlags(flags); change.setTaskInfo(taskInfo); + change.setActivityComponent(activityComponent); return addChange(change); } + /** Add a change to the TransitionInfo */ + public TransitionInfoBuilder addChange(@WindowManager.TransitionType int mode, + @TransitionInfo.ChangeFlags int flags, ActivityManager.RunningTaskInfo taskInfo) { + return addChange(mode, flags, taskInfo, null /* activityComponent */); + } + public TransitionInfoBuilder addChange(@WindowManager.TransitionType int mode, ActivityManager.RunningTaskInfo taskInfo) { return addChange(mode, TransitionInfo.FLAG_NONE, taskInfo); } + /** Add a change to the TransitionInfo */ + public TransitionInfoBuilder addChange(@WindowManager.TransitionType int mode, + ComponentName activityComponent) { + return addChange(mode, TransitionInfo.FLAG_NONE, null /* taskinfo */, activityComponent); + } + public TransitionInfoBuilder addChange(@WindowManager.TransitionType int mode) { return addChange(mode, TransitionInfo.FLAG_NONE, null /* taskInfo */); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt index 883c24e78076..f84685a92b57 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt @@ -27,7 +27,6 @@ import android.graphics.Rect import android.hardware.display.DisplayManager import android.hardware.display.VirtualDisplay import android.os.Handler -import android.os.IBinder import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import android.view.Choreographer @@ -40,8 +39,6 @@ import android.view.SurfaceControl import android.view.SurfaceView import android.view.WindowInsets.Type.navigationBars import android.view.WindowInsets.Type.statusBars -import android.view.WindowManager -import android.window.TransitionInfo import androidx.test.filters.SmallTest import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.ShellTaskOrganizer @@ -53,8 +50,6 @@ import com.android.wm.shell.common.DisplayLayout import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue import com.android.wm.shell.desktopmode.DesktopTasksController -import com.android.wm.shell.recents.RecentsTransitionHandler -import com.android.wm.shell.recents.RecentsTransitionStateListener import com.android.wm.shell.sysui.KeyguardChangeListener import com.android.wm.shell.sysui.ShellCommandHandler import com.android.wm.shell.sysui.ShellController @@ -100,7 +95,6 @@ class DesktopModeWindowDecorViewModelTests : ShellTestCase() { @Mock private lateinit var mockShellController: ShellController @Mock private lateinit var mockShellExecutor: ShellExecutor @Mock private lateinit var mockRootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer - @Mock private lateinit var mockRecentsTransitionHandler: RecentsTransitionHandler @Mock private lateinit var mockShellCommandHandler: ShellCommandHandler private val transactionFactory = Supplier<SurfaceControl.Transaction> { @@ -127,7 +121,6 @@ class DesktopModeWindowDecorViewModelTests : ShellTestCase() { mockSyncQueue, mockTransitions, Optional.of(mockDesktopTasksController), - mockRecentsTransitionHandler, mockDesktopModeWindowDecorFactory, mockInputMonitorFactory, transactionFactory, @@ -275,48 +268,6 @@ class DesktopModeWindowDecorViewModelTests : ShellTestCase() { } @Test - fun testRelayoutBlockedDuringRecentsTransition() { - val recentsCaptor = argumentCaptor<RecentsTransitionStateListener>() - verify(mockRecentsTransitionHandler).addTransitionStateListener(recentsCaptor.capture()) - - val transition = mock(IBinder::class.java) - val task = createTask(windowingMode = WINDOWING_MODE_FREEFORM) - val decoration = setUpMockDecorationForTask(task) - - // Make sure a window decorations exists first by launching a freeform task. - onTaskOpening(task) - // Now call back when a Recents transition starts. - recentsCaptor.firstValue.onTransitionStarted(transition) - - verify(decoration).incrementRelayoutBlock() - verify(decoration).addTransitionPausingRelayout(transition) - } - - @Test - fun testRelayoutBlockedDuringKeyguardTransition() { - val transition = mock(IBinder::class.java) - val task = createTask(windowingMode = WINDOWING_MODE_FREEFORM) - val decoration = setUpMockDecorationForTask(task) - val transitionInfo = mock(TransitionInfo::class.java) - val transitionChange = mock(TransitionInfo.Change::class.java) - val taskInfo = mock(RunningTaskInfo()::class.java) - - // Replicate a keyguard going away transition for a task - whenever(transitionInfo.getFlags()) - .thenReturn(WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY) - whenever(transitionChange.getMode()).thenReturn(WindowManager.TRANSIT_TO_FRONT) - whenever(transitionChange.getTaskInfo()).thenReturn(taskInfo) - - // Make sure a window decorations exists first by launching a freeform task. - onTaskOpening(task) - // OnTransition ready is called when a keyguard going away transition happens - desktopModeWindowDecorViewModel - .onTransitionReady(transition, transitionInfo, transitionChange) - - verify(decoration).incrementRelayoutBlock() - verify(decoration).addTransitionPausingRelayout(transition) - } - @Test fun testRelayoutRunsWhenStatusBarsInsetsSourceVisibilityChanges() { val task = createTask(windowingMode = WINDOWING_MODE_FREEFORM, focused = true) val decoration = setUpMockDecorationForTask(task) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java index 18fcdd00df9d..40e61dd95f51 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java @@ -16,16 +16,26 @@ package com.android.wm.shell.windowdecor; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.content.ComponentName; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; import android.content.res.Configuration; +import android.content.res.Resources; +import android.content.res.TypedArray; import android.os.Handler; +import android.os.SystemProperties; import android.testing.AndroidTestingRunner; +import android.testing.TestableContext; import android.view.Choreographer; import android.view.Display; import android.view.SurfaceControl; @@ -34,14 +44,17 @@ import android.window.WindowContainerTransaction; import androidx.test.filters.SmallTest; +import com.android.internal.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestRunningTaskInfoBuilder; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.SyncTransactionQueue; +import com.android.wm.shell.windowdecor.WindowDecoration.RelayoutParams; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -57,6 +70,13 @@ import java.util.function.Supplier; @SmallTest @RunWith(AndroidTestingRunner.class) public class DesktopModeWindowDecorationTests extends ShellTestCase { + private static final String USE_WINDOW_SHADOWS_SYSPROP_KEY = + "persist.wm.debug.desktop_use_window_shadows"; + private static final String FOCUSED_USE_WINDOW_SHADOWS_SYSPROP_KEY = + "persist.wm.debug.desktop_use_window_shadows_focused_window"; + private static final String USE_ROUNDED_CORNERS_SYSPROP_KEY = + "persist.wm.debug.desktop_use_rounded_corners"; + @Mock private DisplayController mMockDisplayController; @Mock @@ -79,14 +99,29 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { private SurfaceControlViewHost mMockSurfaceControlViewHost; @Mock private WindowDecoration.SurfaceControlViewHostFactory mMockSurfaceControlViewHostFactory; + @Mock + private TypedArray mMockRoundedCornersRadiusArray; private final Configuration mConfiguration = new Configuration(); + private TestableContext mTestableContext; + + /** Set up run before test class. */ + @BeforeClass + public static void setUpClass() { + // Reset the sysprop settings before running the test. + SystemProperties.set(USE_WINDOW_SHADOWS_SYSPROP_KEY, ""); + SystemProperties.set(FOCUSED_USE_WINDOW_SHADOWS_SYSPROP_KEY, ""); + SystemProperties.set(USE_ROUNDED_CORNERS_SYSPROP_KEY, ""); + } + @Before public void setUp() { doReturn(mMockSurfaceControlViewHost).when(mMockSurfaceControlViewHostFactory).create( any(), any(), any()); doReturn(mMockTransaction).when(mMockTransactionSupplier).get(); + mTestableContext = new TestableContext(mContext); + mTestableContext.ensureTestableResources(); } @Test @@ -105,6 +140,52 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { } + @Test + public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreEnabled() { + final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); + RelayoutParams relayoutParams = new RelayoutParams(); + + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, mContext, taskInfo, /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop */ false); + + assertThat(relayoutParams.mShadowRadiusId).isNotEqualTo(Resources.ID_NULL); + } + + @Test + public void updateRelayoutParams_noSysPropFlagsSet_roundedCornersAreEnabled() { + final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); + fillRoundedCornersResources(/* fillValue= */ 30); + RelayoutParams relayoutParams = new RelayoutParams(); + + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, + mTestableContext, + taskInfo, + /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop */ false); + + assertThat(relayoutParams.mCornerRadius).isGreaterThan(0); + } + + private void fillRoundedCornersResources(int fillValue) { + when(mMockRoundedCornersRadiusArray.getDimensionPixelSize(anyInt(), anyInt())) + .thenReturn(fillValue); + mTestableContext.getOrCreateTestableResources().addOverride( + R.array.config_roundedCornerRadiusArray, mMockRoundedCornersRadiusArray); + mTestableContext.getOrCreateTestableResources().addOverride( + R.dimen.rounded_corner_radius, fillValue); + mTestableContext.getOrCreateTestableResources().addOverride( + R.array.config_roundedCornerTopRadiusArray, mMockRoundedCornersRadiusArray); + mTestableContext.getOrCreateTestableResources().addOverride( + R.dimen.rounded_corner_radius_top, fillValue); + mTestableContext.getOrCreateTestableResources().addOverride( + R.array.config_roundedCornerBottomRadiusArray, mMockRoundedCornersRadiusArray); + mTestableContext.getOrCreateTestableResources().addOverride( + R.dimen.rounded_corner_radius_bottom, fillValue); + } + + private DesktopModeWindowDecoration createWindowDecoration( ActivityManager.RunningTaskInfo taskInfo) { return new DesktopModeWindowDecoration(mContext, mMockDisplayController, @@ -123,6 +204,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { .setTaskDescriptionBuilder(taskDescriptionBuilder) .setVisible(visible) .build(); + taskInfo.topActivityInfo = new ActivityInfo(); + taskInfo.topActivityInfo.applicationInfo = new ApplicationInfo(); taskInfo.realActivity = new ComponentName("com.android.wm.shell.windowdecor", "DesktopModeWindowDecorationTests"); taskInfo.baseActivity = new ComponentName("com.android.wm.shell.windowdecor", diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtilityTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtilityTest.kt index 5c0e04aecf6c..e60be7186b1e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtilityTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DragPositioningCallbackUtilityTest.kt @@ -181,6 +181,26 @@ class DragPositioningCallbackUtilityTest { } @Test + fun testDragEndSnapsTaskBoundsWhenOutsideValidDragArea() { + val startingPoint = PointF(STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.top.toFloat()) + val repositionTaskBounds = Rect(STARTING_BOUNDS) + val validDragArea = Rect(DISPLAY_BOUNDS.left - 100, + STABLE_BOUNDS.top, + DISPLAY_BOUNDS.right - 100, + DISPLAY_BOUNDS.bottom - 100) + + DragPositioningCallbackUtility.onDragEnd(repositionTaskBounds, STARTING_BOUNDS, + startingPoint, startingPoint.x - 1000, (DISPLAY_BOUNDS.bottom + 1000).toFloat(), + validDragArea) + assertThat(repositionTaskBounds.left).isEqualTo(validDragArea.left) + assertThat(repositionTaskBounds.top).isEqualTo(validDragArea.bottom) + assertThat(repositionTaskBounds.right) + .isEqualTo(validDragArea.left + STARTING_BOUNDS.width()) + assertThat(repositionTaskBounds.bottom) + .isEqualTo(validDragArea.bottom + STARTING_BOUNDS.height()) + } + + @Test fun testChangeBounds_toDisallowedBounds_freezesAtLimit() { var hasMoved = false val startingPoint = PointF(STARTING_BOUNDS.right.toFloat(), diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt index add78b2ee8b3..de6903d9a06a 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt @@ -10,6 +10,7 @@ import android.view.Surface import android.view.Surface.ROTATION_270 import android.view.Surface.ROTATION_90 import android.view.SurfaceControl +import android.view.WindowManager import android.window.WindowContainerToken import android.window.WindowContainerTransaction import android.window.WindowContainerTransaction.Change.CHANGE_DRAG_RESIZING @@ -18,13 +19,17 @@ import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.ShellTestCase import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayLayout +import com.android.wm.shell.transition.Transitions import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_BOTTOM import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_RIGHT import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_TOP import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_UNDEFINED +import junit.framework.Assert.assertFalse +import junit.framework.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito @@ -34,6 +39,7 @@ import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations +import org.mockito.kotlin.doReturn import java.util.function.Supplier import org.mockito.Mockito.`when` as whenever @@ -50,6 +56,8 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { @Mock private lateinit var mockShellTaskOrganizer: ShellTaskOrganizer @Mock + private lateinit var mockTransitions: Transitions + @Mock private lateinit var mockWindowDecoration: WindowDecoration<*> @Mock private lateinit var mockDragStartListener: DragPositioningCallbackUtility.DragStartListener @@ -69,6 +77,8 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { private lateinit var mockTransactionFactory: Supplier<SurfaceControl.Transaction> @Mock private lateinit var mockTransaction: SurfaceControl.Transaction + @Mock + private lateinit var mockTransitionBinder: IBinder private lateinit var taskPositioner: FluidResizeTaskPositioner @@ -103,11 +113,15 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { configuration.windowConfiguration.setBounds(STARTING_BOUNDS) configuration.windowConfiguration.displayRotation = ROTATION_90 } + `when`(mockWindowDecoration.calculateValidDragArea()).thenReturn(VALID_DRAG_AREA) mockWindowDecoration.mDisplay = mockDisplay whenever(mockDisplay.displayId).thenAnswer { DISPLAY_ID } + whenever(mockTransitions.startTransition(anyInt(), any(), any())) + .doReturn(mockTransitionBinder) taskPositioner = FluidResizeTaskPositioner( mockShellTaskOrganizer, + mockTransitions, mockWindowDecoration, mockDisplayController, mockDragStartListener, @@ -117,7 +131,7 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { } @Test - fun testDragResize_notMove_skipsTransactionOnEnd() { + fun testDragResize_notMove_skipsTransitionOnEnd() { taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), @@ -129,16 +143,16 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { STARTING_BOUNDS.top.toFloat() + 10 ) - verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> + verify(mockTransitions, never()).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && ((change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0) - } - }) + }}, eq(taskPositioner)) } @Test - fun testDragResize_noEffectiveMove_skipsTransactionOnMoveAndEnd() { + fun testDragResize_noEffectiveMove_skipsTransitionOnMoveAndEnd() { taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), @@ -150,21 +164,28 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { STARTING_BOUNDS.top.toFloat() ) + verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + ((change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0) + } + }) + taskPositioner.onDragPositioningEnd( STARTING_BOUNDS.left.toFloat() + 10, STARTING_BOUNDS.top.toFloat() + 10 ) - verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> + verify(mockTransitions, never()).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && ((change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0) - } - }) + }}, eq(taskPositioner)) } @Test - fun testDragResize_hasEffectiveMove_issuesTransactionOnMoveAndEnd() { + fun testDragResize_hasEffectiveMove_issuesTransitionOnMoveAndEnd() { taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), @@ -191,13 +212,13 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { ) val rectAfterEnd = Rect(rectAfterMove) rectAfterEnd.top += 10 - verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> - return@argThat wct.changes.any { (token, change) -> - token == taskBinder && - (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && - change.configuration.windowConfiguration.bounds == rectAfterEnd - } - }) + verify(mockTransitions).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds == rectAfterEnd + }}, eq(taskPositioner)) } @Test @@ -225,6 +246,13 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { change.dragResizing } }) + verify(mockTransitions, never()).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + ((change.changeMask and CHANGE_DRAG_RESIZING) != 0) && + change.dragResizing + }}, eq(taskPositioner)) } @Test @@ -252,13 +280,13 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { change.dragResizing } }) - verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + verify(mockTransitions).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && ((change.changeMask and CHANGE_DRAG_RESIZING) != 0) && !change.dragResizing - } - }) + }}, eq(taskPositioner)) } @Test @@ -269,7 +297,7 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { STARTING_BOUNDS.top.toFloat() ) - // Resize to width of 95px and height of 5px with min width of 10px + // Resize to width of 95px and height of 5px with min height of 10px val newX = STARTING_BOUNDS.right.toFloat() - 5 val newY = STARTING_BOUNDS.top.toFloat() + 95 taskPositioner.onDragPositioningMove( @@ -565,12 +593,12 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { taskPositioner.onDragPositioningEnd(newX, newY) - verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> + verify(mockTransitions, never()).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && ((change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0) - } - }) + }}, eq(taskPositioner)) } private fun WindowContainerTransaction.Change.ofBounds(bounds: Rect): Boolean { @@ -649,14 +677,46 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { ) // Verify task's top bound is set to stable bounds top since dragged outside stable bounds // but not in disallowed end bounds area. - verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + verify(mockTransitions).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && change.configuration.windowConfiguration.bounds.top == STABLE_BOUNDS_LANDSCAPE.top - } - }) + }}, eq(taskPositioner)) + } + + @Test + fun testDragResize_drag_taskPositionedInValidDragArea() { + taskPositioner.onDragPositioningStart( + CTRL_TYPE_UNDEFINED, // drag + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + val newX = VALID_DRAG_AREA.left - 500f + val newY = VALID_DRAG_AREA.bottom + 500f + taskPositioner.onDragPositioningMove( + newX, + newY + ) + verify(mockTransaction).setPosition(any(), eq(newX), eq(newY)) + + taskPositioner.onDragPositioningEnd( + newX, + newY + ) + verify(mockTransitions).startTransition( + eq(WindowManager.TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds.top == + VALID_DRAG_AREA.bottom && + change.configuration.windowConfiguration.bounds.left == + VALID_DRAG_AREA.left + }}, eq(taskPositioner)) } @Test @@ -708,6 +768,59 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { verify(mockDisplayLayout, Mockito.times(2)).getStableBounds(any()) } + @Test + fun testIsResizingOrAnimatingResizeSet() { + assertFalse(taskPositioner.isResizingOrAnimating) + + taskPositioner.onDragPositioningStart( + CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + taskPositioner.onDragPositioningMove( + STARTING_BOUNDS.left.toFloat() - 20, + STARTING_BOUNDS.top.toFloat() - 20 + ) + + // isResizingOrAnimating should be set to true after move during a resize + assertTrue(taskPositioner.isResizingOrAnimating) + + taskPositioner.onDragPositioningEnd( + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + // isResizingOrAnimating should be not be set till false until after transition animation + assertTrue(taskPositioner.isResizingOrAnimating) + } + + @Test + fun testIsResizingOrAnimatingResizeResetAfterAbortedTransition() { + performDrag(STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat(), STARTING_BOUNDS.left.toFloat() - 20, + STARTING_BOUNDS.top.toFloat() - 20, CTRL_TYPE_TOP or CTRL_TYPE_RIGHT) + + taskPositioner.onTransitionConsumed(mockTransitionBinder, true /* aborted */, + mockTransaction) + + // isResizingOrAnimating should be set to false until after transition successfully consumed + assertFalse(taskPositioner.isResizingOrAnimating) + } + + @Test + fun testIsResizingOrAnimatingResizeResetAfterNonAbortedTransition() { + performDrag(STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat(), STARTING_BOUNDS.left.toFloat() - 20, + STARTING_BOUNDS.top.toFloat() - 20, CTRL_TYPE_TOP or CTRL_TYPE_RIGHT) + + taskPositioner.onTransitionConsumed(mockTransitionBinder, false /* aborted */, + mockTransaction) + + // isResizingOrAnimating should be set to false until after transition successfully consumed + assertFalse(taskPositioner.isResizingOrAnimating) + } + private fun performDrag( startX: Float, startY: Float, @@ -761,5 +874,11 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { DISPLAY_BOUNDS.bottom, DISPLAY_BOUNDS.right - NAVBAR_HEIGHT ) + private val VALID_DRAG_AREA = Rect( + DISPLAY_BOUNDS.left - 100, + STABLE_BOUNDS_LANDSCAPE.top, + DISPLAY_BOUNDS.right - 100, + DISPLAY_BOUNDS.bottom - 100 + ) } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt index a70ebf14324a..86253f35a51d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt @@ -26,6 +26,7 @@ import android.view.Surface.ROTATION_270 import android.view.Surface.ROTATION_90 import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CHANGE +import android.window.TransitionInfo import android.window.WindowContainerToken import androidx.test.filters.SmallTest import com.android.wm.shell.ShellTaskOrganizer @@ -33,10 +34,12 @@ import com.android.wm.shell.ShellTestCase import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayLayout import com.android.wm.shell.transition.Transitions +import com.android.wm.shell.transition.Transitions.TransitionFinishCallback import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_BOTTOM import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_RIGHT import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_TOP import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_UNDEFINED +import junit.framework.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -85,6 +88,12 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { @Mock private lateinit var mockTransaction: SurfaceControl.Transaction @Mock + private lateinit var mockTransitionBinder: IBinder + @Mock + private lateinit var mockTransitionInfo: TransitionInfo + @Mock + private lateinit var mockFinishCallback: TransitionFinishCallback + @Mock private lateinit var mockTransitions: Transitions private lateinit var taskPositioner: VeiledResizeTaskPositioner @@ -118,6 +127,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { configuration.windowConfiguration.setBounds(STARTING_BOUNDS) configuration.windowConfiguration.displayRotation = ROTATION_90 } + `when`(mockDesktopWindowDecoration.calculateValidDragArea()).thenReturn(VALID_DRAG_AREA) mockDesktopWindowDecoration.mDisplay = mockDisplay whenever(mockDisplay.displayId).thenAnswer { DISPLAY_ID } @@ -134,13 +144,13 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { } @Test - fun testDragResize_noMove_showsResizeVeil() { + fun testDragResize_noMove_doesNotShowResizeVeil() { taskPositioner.onDragPositioningStart( CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - verify(mockDesktopWindowDecoration).showResizeVeil(STARTING_BOUNDS) + verify(mockDesktopWindowDecoration, never()).showResizeVeil(STARTING_BOUNDS) taskPositioner.onDragPositioningEnd( STARTING_BOUNDS.left.toFloat(), @@ -152,7 +162,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && change.configuration.windowConfiguration.bounds == STARTING_BOUNDS}}, eq(taskPositioner)) - verify(mockDesktopWindowDecoration).hideResizeVeil() + verify(mockDesktopWindowDecoration, never()).hideResizeVeil() } @Test @@ -187,13 +197,12 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { verify(mockDesktopWindowDecoration, never()).createResizeVeil() verify(mockDesktopWindowDecoration, never()).hideResizeVeil() - verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && - change.configuration.windowConfiguration.bounds == rectAfterEnd - } - }) + change.configuration.windowConfiguration.bounds == rectAfterEnd }}, + eq(taskPositioner)) } @Test @@ -203,7 +212,6 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.top.toFloat() ) - verify(mockDesktopWindowDecoration).showResizeVeil(STARTING_BOUNDS) taskPositioner.onDragPositioningMove( STARTING_BOUNDS.right.toFloat() + 10, @@ -213,6 +221,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { val rectAfterMove = Rect(STARTING_BOUNDS) rectAfterMove.right += 10 rectAfterMove.top += 10 + verify(mockDesktopWindowDecoration).showResizeVeil(rectAfterMove) verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && @@ -228,7 +237,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { val rectAfterEnd = Rect(rectAfterMove) rectAfterEnd.right += 10 rectAfterEnd.top += 10 - verify(mockDesktopWindowDecoration, times(2)).updateResizeVeil(any()) + verify(mockDesktopWindowDecoration).updateResizeVeil(any()) verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && @@ -244,7 +253,6 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat() ) - verify(mockDesktopWindowDecoration).showResizeVeil(STARTING_BOUNDS) taskPositioner.onDragPositioningMove( STARTING_BOUNDS.left.toFloat(), @@ -368,14 +376,44 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { ) // Verify task's top bound is set to stable bounds top since dragged outside stable bounds // but not in disallowed end bounds area. - verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> return@argThat wct.changes.any { (token, change) -> token == taskBinder && (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && change.configuration.windowConfiguration.bounds.top == - STABLE_BOUNDS_LANDSCAPE.top - } - }) + STABLE_BOUNDS_LANDSCAPE.top }}, + eq(taskPositioner)) + } + + @Test + fun testDragResize_drag_taskPositionedInValidDragArea() { + taskPositioner.onDragPositioningStart( + CTRL_TYPE_UNDEFINED, // drag + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + val newX = VALID_DRAG_AREA.left - 500f + val newY = VALID_DRAG_AREA.bottom + 500f + taskPositioner.onDragPositioningMove( + newX, + newY + ) + verify(mockTransaction).setPosition(any(), eq(newX), eq(newY)) + + taskPositioner.onDragPositioningEnd( + newX, + newY + ) + verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds.top == + VALID_DRAG_AREA.bottom && + change.configuration.windowConfiguration.bounds.left == + VALID_DRAG_AREA.left }}, + eq(taskPositioner)) } @Test @@ -423,6 +461,47 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { verify(mockDisplayLayout, times(2)).getStableBounds(any()) } + @Test + fun testIsResizingOrAnimatingResizeSet() { + Assert.assertFalse(taskPositioner.isResizingOrAnimating) + + taskPositioner.onDragPositioningStart( + CTRL_TYPE_TOP or CTRL_TYPE_RIGHT, + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + taskPositioner.onDragPositioningMove( + STARTING_BOUNDS.left.toFloat() - 20, + STARTING_BOUNDS.top.toFloat() - 20 + ) + + // isResizingOrAnimating should be set to true after move during a resize + Assert.assertTrue(taskPositioner.isResizingOrAnimating) + + taskPositioner.onDragPositioningEnd( + STARTING_BOUNDS.left.toFloat(), + STARTING_BOUNDS.top.toFloat() + ) + + // isResizingOrAnimating should be not be set till false until after transition animation + Assert.assertTrue(taskPositioner.isResizingOrAnimating) + } + + @Test + fun testIsResizingOrAnimatingResizeResetAfterStartAnimation() { + performDrag( + STARTING_BOUNDS.left.toFloat(), STARTING_BOUNDS.top.toFloat(), + STARTING_BOUNDS.left.toFloat() - 20, STARTING_BOUNDS.top.toFloat() - 20, + CTRL_TYPE_TOP or CTRL_TYPE_RIGHT) + + taskPositioner.startAnimation(mockTransitionBinder, mockTransitionInfo, mockTransaction, + mockTransaction, mockFinishCallback) + + // isResizingOrAnimating should be set to false until after transition successfully consumed + Assert.assertFalse(taskPositioner.isResizingOrAnimating) + } + private fun performDrag( startX: Float, startY: Float, @@ -470,5 +549,11 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { DISPLAY_BOUNDS.bottom, DISPLAY_BOUNDS.right - NAVBAR_HEIGHT ) + private val VALID_DRAG_AREA = Rect( + DISPLAY_BOUNDS.left - 100, + STABLE_BOUNDS_LANDSCAPE.top, + DISPLAY_BOUNDS.right - 100, + DISPLAY_BOUNDS.bottom - 100 + ) } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 8e42f74b8d17..228b25ccb1ba 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -32,6 +32,7 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.argThat; @@ -258,14 +259,10 @@ public class WindowDecorationTests extends ShellTestCase { any(), eq(0 /* index */), eq(WindowInsets.Type.captionBar()), - eq(new Rect(100, 300, 400, 364))); + eq(new Rect(100, 300, 400, 364)), + any()); } - verify(mMockSurfaceControlFinishT) - .setPosition(mMockTaskSurface, TASK_POSITION_IN_PARENT.x, - TASK_POSITION_IN_PARENT.y); - verify(mMockSurfaceControlFinishT) - .setWindowCrop(mMockTaskSurface, 300, 100); verify(mMockSurfaceControlStartT).setCornerRadius(mMockTaskSurface, CORNER_RADIUS); verify(mMockSurfaceControlFinishT).setCornerRadius(mMockTaskSurface, CORNER_RADIUS); verify(mMockSurfaceControlStartT) @@ -573,9 +570,9 @@ public class WindowDecorationTests extends ShellTestCase { windowDecor.relayout(taskInfo); verify(mMockWindowContainerTransaction).addInsetsSource(eq(taskInfo.token), any(), - eq(0) /* index */, eq(captionBar()), any()); + eq(0) /* index */, eq(captionBar()), any(), any()); verify(mMockWindowContainerTransaction).addInsetsSource(eq(taskInfo.token), any(), - eq(0) /* index */, eq(mandatorySystemGestures()), any()); + eq(0) /* index */, eq(mandatorySystemGestures()), any(), any()); } @Test @@ -642,6 +639,66 @@ public class WindowDecorationTests extends ShellTestCase { eq(0) /* index */, eq(mandatorySystemGestures())); } + @Test + public void testTaskPositionAndCropNotSetWhenFalse() { + final Display defaultDisplay = mock(Display.class); + doReturn(defaultDisplay).when(mMockDisplayController) + .getDisplay(Display.DEFAULT_DISPLAY); + + final ActivityManager.RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() + .setDisplayId(Display.DEFAULT_DISPLAY) + .setBounds(TASK_BOUNDS) + .setPositionInParent(TASK_POSITION_IN_PARENT.x, TASK_POSITION_IN_PARENT.y) + .setVisible(true) + .setWindowingMode(WINDOWING_MODE_FREEFORM) + .build(); + taskInfo.isFocused = true; + // Density is 2. Shadow radius is 10px. Caption height is 64px. + taskInfo.configuration.densityDpi = DisplayMetrics.DENSITY_DEFAULT * 2; + final TestWindowDecoration windowDecor = createWindowDecoration(taskInfo); + + + mRelayoutParams.mSetTaskPositionAndCrop = false; + windowDecor.relayout(taskInfo); + + verify(mMockSurfaceControlStartT, never()).setWindowCrop( + eq(mMockTaskSurface), anyInt(), anyInt()); + verify(mMockSurfaceControlFinishT, never()).setPosition( + eq(mMockTaskSurface), anyFloat(), anyFloat()); + verify(mMockSurfaceControlFinishT, never()).setWindowCrop( + eq(mMockTaskSurface), anyInt(), anyInt()); + } + + @Test + public void testTaskPositionAndCropSetWhenSetTrue() { + final Display defaultDisplay = mock(Display.class); + doReturn(defaultDisplay).when(mMockDisplayController) + .getDisplay(Display.DEFAULT_DISPLAY); + + final ActivityManager.RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() + .setDisplayId(Display.DEFAULT_DISPLAY) + .setBounds(TASK_BOUNDS) + .setPositionInParent(TASK_POSITION_IN_PARENT.x, TASK_POSITION_IN_PARENT.y) + .setVisible(true) + .setWindowingMode(WINDOWING_MODE_FREEFORM) + .build(); + taskInfo.isFocused = true; + // Density is 2. Shadow radius is 10px. Caption height is 64px. + taskInfo.configuration.densityDpi = DisplayMetrics.DENSITY_DEFAULT * 2; + final TestWindowDecoration windowDecor = createWindowDecoration(taskInfo); + + mRelayoutParams.mSetTaskPositionAndCrop = true; + windowDecor.relayout(taskInfo); + + verify(mMockSurfaceControlStartT).setWindowCrop( + eq(mMockTaskSurface), anyInt(), anyInt()); + verify(mMockSurfaceControlFinishT).setPosition( + eq(mMockTaskSurface), anyFloat(), anyFloat()); + verify(mMockSurfaceControlFinishT).setWindowCrop( + eq(mMockTaskSurface), anyInt(), anyInt()); + } + + private TestWindowDecoration createWindowDecoration(ActivityManager.RunningTaskInfo taskInfo) { return new TestWindowDecoration(mContext, mMockDisplayController, mMockShellTaskOrganizer, taskInfo, mMockTaskSurface, mWindowConfiguration, @@ -702,6 +759,11 @@ public class WindowDecorationTests extends ShellTestCase { relayout(taskInfo, false /* applyStartTransactionOnDraw */); } + @Override + Rect calculateValidDragArea() { + return null; + } + void relayout(ActivityManager.RunningTaskInfo taskInfo, boolean applyStartTransactionOnDraw) { mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; @@ -711,15 +773,13 @@ public class WindowDecorationTests extends ShellTestCase { private WindowDecoration.AdditionalWindow addTestWindow() { final Resources resources = mDecorWindowContext.getResources(); - int x = mRelayoutParams.mCaptionX; - int y = mRelayoutParams.mCaptionY; int width = loadDimensionPixelSize(resources, mCaptionMenuWidthId); int height = loadDimensionPixelSize(resources, mRelayoutParams.mCaptionHeightId); String name = "Test Window"; WindowDecoration.AdditionalWindow additionalWindow = addWindow(R.layout.desktop_mode_window_decor_handle_menu, name, - mMockSurfaceControlAddWindowT, mMockSurfaceSyncGroup, x, y, - width, height); + mMockSurfaceControlAddWindowT, mMockSurfaceSyncGroup, 0 /* x */, + 0 /* y */, width, height); return additionalWindow; } } diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 2f28363aedc7..77800a305f02 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -31,6 +31,12 @@ license { ], } +cc_aconfig_library { + name: "backup_flags_cc_lib", + host_supported: true, + aconfig_declarations: "backup_flags", +} + cc_defaults { name: "libandroidfw_defaults", cpp_std: "gnu++2b", @@ -115,7 +121,10 @@ cc_library { "libutils", "libz", ], - static_libs: ["libziparchive_for_incfs"], + static_libs: [ + "libziparchive_for_incfs", + "backup_flags_cc_lib", + ], static: { enabled: false, }, diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index 1a6a952492f6..a1e7c2ffc1b1 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -36,6 +36,9 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> +#include <com_android_server_backup.h> +namespace backup_flags = com::android::server::backup; + namespace android { #define MAGIC0 0x70616e53 // Snap @@ -214,7 +217,7 @@ write_update_file(BackupDataWriter* dataStream, int fd, int mode, const String8& { LOGP("write_update_file %s (%s) : mode 0%o\n", realFilename, key.c_str(), mode); - const int bufsize = 4*1024; + const int bufsize = backup_flags::enable_max_size_writes_to_pipes() ? (64*1024) : (4*1024); int err; int amt; int fileSize; @@ -550,7 +553,8 @@ int write_tarfile(const String8& packageName, const String8& domain, } // read/write up to this much at a time. - const size_t BUFSIZE = 32 * 1024; + const size_t BUFSIZE = backup_flags::enable_max_size_writes_to_pipes() ? (64*1024) : (32*1024); + char* buf = (char *)calloc(1,BUFSIZE); const size_t PAXHEADER_OFFSET = 512; const size_t PAXHEADER_SIZE = 512; @@ -726,7 +730,7 @@ done: -#define RESTORE_BUF_SIZE (8*1024) +const size_t RESTORE_BUF_SIZE = backup_flags::enable_max_size_writes_to_pipes() ? 64*1024 : 8*1024; RestoreHelperBase::RestoreHelperBase() { diff --git a/libs/androidfw/LoadedArsc.cpp b/libs/androidfw/LoadedArsc.cpp index c9d5e074271b..d9166a16cdea 100644 --- a/libs/androidfw/LoadedArsc.cpp +++ b/libs/androidfw/LoadedArsc.cpp @@ -21,6 +21,7 @@ #include <algorithm> #include <cstddef> #include <limits> +#include <optional> #include "android-base/logging.h" #include "android-base/stringprintf.h" @@ -50,7 +51,9 @@ namespace { // contiguous block of memory to store both the TypeSpec struct and // the Type structs. struct TypeSpecBuilder { - explicit TypeSpecBuilder(incfs::verified_map_ptr<ResTable_typeSpec> header) : header_(header) {} + explicit TypeSpecBuilder(incfs::verified_map_ptr<ResTable_typeSpec> header) : header_(header) { + type_entries.reserve(dtohs(header_->typesCount)); + } void AddType(incfs::verified_map_ptr<ResTable_type> type) { TypeSpec::TypeEntry& entry = type_entries.emplace_back(); @@ -59,6 +62,7 @@ struct TypeSpecBuilder { } TypeSpec Build() { + type_entries.shrink_to_fit(); return {header_, std::move(type_entries)}; } @@ -450,7 +454,8 @@ const LoadedPackage* LoadedArsc::GetPackageById(uint8_t package_id) const { std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk, package_property_t property_flags) { ATRACE_NAME("LoadedPackage::Load"); - std::unique_ptr<LoadedPackage> loaded_package(new LoadedPackage()); + const bool optimize_name_lookups = (property_flags & PROPERTY_OPTIMIZE_NAME_LOOKUPS) != 0; + std::unique_ptr<LoadedPackage> loaded_package(new LoadedPackage(optimize_name_lookups)); // typeIdOffset was added at some point, but we still must recognize apps built before this // was added. @@ -499,7 +504,7 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk, // A map of TypeSpec builders, each associated with an type index. // We use these to accumulate the set of Types available for a TypeSpec, and later build a single, // contiguous block of memory that holds all the Types together with the TypeSpec. - std::unordered_map<int, std::unique_ptr<TypeSpecBuilder>> type_builder_map; + std::unordered_map<int, std::optional<TypeSpecBuilder>> type_builder_map; ChunkIterator iter(chunk.data_ptr(), chunk.data_size()); while (iter.HasNext()) { @@ -567,14 +572,14 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk, return {}; } - if (entry_count * sizeof(uint32_t) > chunk.data_size()) { + if (entry_count * sizeof(uint32_t) > child_chunk.data_size()) { LOG(ERROR) << "RES_TABLE_TYPE_SPEC_TYPE too small to hold entries."; return {}; } - std::unique_ptr<TypeSpecBuilder>& builder_ptr = type_builder_map[type_spec->id]; - if (builder_ptr == nullptr) { - builder_ptr = util::make_unique<TypeSpecBuilder>(type_spec.verified()); + auto& maybe_type_builder = type_builder_map[type_spec->id]; + if (!maybe_type_builder) { + maybe_type_builder.emplace(type_spec.verified()); loaded_package->resource_ids_.set(type_spec->id, entry_count); } else { LOG(WARNING) << StringPrintf("RES_TABLE_TYPE_SPEC_TYPE already defined for ID %02x", @@ -594,9 +599,9 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk, } // Type chunks must be preceded by their TypeSpec chunks. - std::unique_ptr<TypeSpecBuilder>& builder_ptr = type_builder_map[type->id]; - if (builder_ptr != nullptr) { - builder_ptr->AddType(type.verified()); + auto& maybe_type_builder = type_builder_map[type->id]; + if (maybe_type_builder) { + maybe_type_builder->AddType(type.verified()); } else { LOG(ERROR) << StringPrintf( "RES_TABLE_TYPE_TYPE with ID %02x found without preceding RES_TABLE_TYPE_SPEC_TYPE.", diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 4c992becda7c..2c99f1aa3675 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -447,15 +447,19 @@ Res_png_9patch* Res_png_9patch::deserialize(void* inData) // -------------------------------------------------------------------- // -------------------------------------------------------------------- -ResStringPool::ResStringPool() - : mError(NO_INIT), mOwnedData(NULL), mHeader(NULL), mCache(NULL) -{ +ResStringPool::ResStringPool() : mError(NO_INIT), mOwnedData(NULL), mHeader(NULL), mCache(NULL) { } -ResStringPool::ResStringPool(const void* data, size_t size, bool copyData) - : mError(NO_INIT), mOwnedData(NULL), mHeader(NULL), mCache(NULL) -{ - setTo(data, size, copyData); +ResStringPool::ResStringPool(bool optimize_name_lookups) : ResStringPool() { + if (optimize_name_lookups) { + mIndexLookupCache.emplace(); + } +} + +ResStringPool::ResStringPool(const void* data, size_t size, bool copyData, + bool optimize_name_lookups) + : ResStringPool(optimize_name_lookups) { + setTo(data, size, copyData); } ResStringPool::~ResStringPool() @@ -683,6 +687,14 @@ status_t ResStringPool::setTo(incfs::map_ptr<void> data, size_t size, bool copyD mStylePoolSize = 0; } + if (mIndexLookupCache) { + if ((mHeader->flags & ResStringPool_header::UTF8_FLAG) != 0) { + mIndexLookupCache->first.reserve(mHeader->stringCount); + } else { + mIndexLookupCache->second.reserve(mHeader->stringCount); + } + } + return (mError=NO_ERROR); } @@ -708,6 +720,10 @@ void ResStringPool::uninit() free(mOwnedData); mOwnedData = NULL; } + if (mIndexLookupCache) { + mIndexLookupCache->first.clear(); + mIndexLookupCache->second.clear(); + } } /** @@ -824,11 +840,11 @@ base::expected<StringPiece16, NullOrIOError> ResStringPool::stringAt(size_t idx) // encLen must be less than 0x7FFF due to encoding. if ((uint32_t)(u8str+*u8len-strings) < mStringPoolSize) { - AutoMutex lock(mDecodeLock); + AutoMutex lock(mCachesLock); - if (mCache != NULL && mCache[idx] != NULL) { - return StringPiece16(mCache[idx], *u16len); - } + if (mCache != NULL && mCache[idx] != NULL) { + return StringPiece16(mCache[idx], *u16len); + } // Retrieve the actual length of the utf8 string if the // encoded length was truncated @@ -1093,12 +1109,24 @@ base::expected<size_t, NullOrIOError> ResStringPool::indexOfString(const char16_ // block, start searching at the back. String8 str8(str, strLen); const size_t str8Len = str8.size(); + std::optional<AutoMutex> cacheLock; + if (mIndexLookupCache) { + cacheLock.emplace(mCachesLock); + if (auto it = mIndexLookupCache->first.find(std::string_view(str8)); + it != mIndexLookupCache->first.end()) { + return it->second; + } + } + for (int i=mHeader->stringCount-1; i>=0; i--) { const base::expected<StringPiece, NullOrIOError> s = string8At(i); if (UNLIKELY(IsIOError(s))) { return base::unexpected(s.error()); } if (s.has_value()) { + if (mIndexLookupCache) { + mIndexLookupCache->first.insert({*s, i}); + } if (kDebugStringPoolNoisy) { ALOGI("Looking at %s, i=%d\n", s->data(), i); } @@ -1151,20 +1179,32 @@ base::expected<size_t, NullOrIOError> ResStringPool::indexOfString(const char16_ // most often this happens because we want to get IDs for style // span tags; since those always appear at the end of the string // block, start searching at the back. + std::optional<AutoMutex> cacheLock; + if (mIndexLookupCache) { + cacheLock.emplace(mCachesLock); + if (auto it = mIndexLookupCache->second.find({str, strLen}); + it != mIndexLookupCache->second.end()) { + return it->second; + } + } for (int i=mHeader->stringCount-1; i>=0; i--) { const base::expected<StringPiece16, NullOrIOError> s = stringAt(i); if (UNLIKELY(IsIOError(s))) { return base::unexpected(s.error()); } if (kDebugStringPoolNoisy) { - ALOGI("Looking at %s, i=%d\n", String8(s->data(), s->size()).c_str(), i); + ALOGI("Looking16 at %s, i=%d\n", String8(s->data(), s->size()).c_str(), i); } - if (s.has_value() && strLen == s->size() && - strzcmp16(s->data(), s->size(), str, strLen) == 0) { + if (s.has_value()) { + if (mIndexLookupCache) { + mIndexLookupCache->second.insert({*s, i}); + } + if (strLen == s->size() && strzcmp16(s->data(), s->size(), str, strLen) == 0) { if (kDebugStringPoolNoisy) { - ALOGI("MATCH!"); + ALOGI("MATCH16!"); } return i; + } } } } diff --git a/libs/androidfw/include/androidfw/Idmap.h b/libs/androidfw/include/androidfw/Idmap.h index 60689128dffb..d9f7c2a1ac19 100644 --- a/libs/androidfw/include/androidfw/Idmap.h +++ b/libs/androidfw/include/androidfw/Idmap.h @@ -71,7 +71,7 @@ class OverlayDynamicRefTable : public DynamicRefTable { // Rewrites a compile-time overlay resource id to the runtime resource id of corresponding target // resource. - virtual status_t lookupResourceIdNoRewrite(uint32_t* resId) const; + status_t lookupResourceIdNoRewrite(uint32_t* resId) const; const Idmap_data_header* data_header_; const Idmap_overlay_entry* entries_; diff --git a/libs/androidfw/include/androidfw/LoadedArsc.h b/libs/androidfw/include/androidfw/LoadedArsc.h index 3a7287187781..413b27829474 100644 --- a/libs/androidfw/include/androidfw/LoadedArsc.h +++ b/libs/androidfw/include/androidfw/LoadedArsc.h @@ -99,6 +99,9 @@ enum : package_property_t { // The apk assets only contain the overlayable declarations information. PROPERTY_ONLY_OVERLAYABLES = 1U << 5U, + + // Optimize the resource lookups by name via an in-memory lookup table. + PROPERTY_OPTIMIZE_NAME_LOOKUPS = 1U << 6U, }; struct OverlayableInfo { @@ -285,7 +288,9 @@ class LoadedPackage { private: DISALLOW_COPY_AND_ASSIGN(LoadedPackage); - LoadedPackage() = default; + explicit LoadedPackage(bool optimize_name_lookups = false) + : type_string_pool_(optimize_name_lookups), key_string_pool_(optimize_name_lookups) { + } ResStringPool type_string_pool_; ResStringPool key_string_pool_; diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h index c0514fdff469..3d1403d0e039 100644 --- a/libs/androidfw/include/androidfw/ResourceTypes.h +++ b/libs/androidfw/include/androidfw/ResourceTypes.h @@ -22,27 +22,28 @@ #include <android-base/expected.h> #include <android-base/unique_fd.h> - +#include <android/configuration.h> #include <androidfw/Asset.h> #include <androidfw/Errors.h> #include <androidfw/LocaleData.h> #include <androidfw/StringPiece.h> #include <utils/ByteOrder.h> #include <utils/Errors.h> +#include <utils/KeyedVector.h> #include <utils/String16.h> #include <utils/Vector.h> -#include <utils/KeyedVector.h> - #include <utils/threads.h> #include <stdint.h> #include <sys/types.h> -#include <android/configuration.h> - #include <array> #include <map> #include <memory> +#include <optional> +#include <string_view> +#include <unordered_map> +#include <utility> namespace android { @@ -512,23 +513,24 @@ struct ResStringPool_span class ResStringPool { public: - ResStringPool(); - ResStringPool(const void* data, size_t size, bool copyData=false); - virtual ~ResStringPool(); + ResStringPool(); + explicit ResStringPool(bool optimize_name_lookups); + ResStringPool(const void* data, size_t size, bool copyData = false, + bool optimize_name_lookups = false); + virtual ~ResStringPool(); - void setToEmpty(); - status_t setTo(incfs::map_ptr<void> data, size_t size, bool copyData=false); + void setToEmpty(); + status_t setTo(incfs::map_ptr<void> data, size_t size, bool copyData = false); - status_t getError() const; + status_t getError() const; - void uninit(); + void uninit(); - // Return string entry as UTF16; if the pool is UTF8, the string will - // be converted before returning. - inline base::expected<StringPiece16, NullOrIOError> stringAt( - const ResStringPool_ref& ref) const { - return stringAt(ref.index); - } + // Return string entry as UTF16; if the pool is UTF8, the string will + // be converted before returning. + inline base::expected<StringPiece16, NullOrIOError> stringAt(const ResStringPool_ref& ref) const { + return stringAt(ref.index); + } virtual base::expected<StringPiece16, NullOrIOError> stringAt(size_t idx) const; // Note: returns null if the string pool is not UTF8. @@ -557,7 +559,7 @@ private: void* mOwnedData; incfs::verified_map_ptr<ResStringPool_header> mHeader; size_t mSize; - mutable Mutex mDecodeLock; + mutable Mutex mCachesLock; incfs::map_ptr<uint32_t> mEntries; incfs::map_ptr<uint32_t> mEntryStyles; incfs::map_ptr<void> mStrings; @@ -566,6 +568,10 @@ private: incfs::map_ptr<uint32_t> mStyles; uint32_t mStylePoolSize; // number of uint32_t + mutable std::optional<std::pair<std::unordered_map<std::string_view, int>, + std::unordered_map<std::u16string_view, int>>> + mIndexLookupCache; + base::expected<StringPiece, NullOrIOError> stringDecodeAt( size_t idx, incfs::map_ptr<uint8_t> str, size_t encLen) const; }; @@ -1401,8 +1407,8 @@ struct ResTable_typeSpec // Must be 0. uint8_t res0; - // Must be 0. - uint16_t res1; + // Used to be reserved, if >0 specifies the number of ResTable_type entries for this spec. + uint16_t typesCount; // Number of uint32_t entry configuration masks that follow. uint32_t entryCount; diff --git a/libs/hostgraphics/gui/Surface.h b/libs/hostgraphics/gui/Surface.h index de1ba00211d3..2573931c8543 100644 --- a/libs/hostgraphics/gui/Surface.h +++ b/libs/hostgraphics/gui/Surface.h @@ -50,6 +50,8 @@ public: virtual int unlockAndPost() { return 0; } virtual int query(int what, int* value) const { return 0; } + virtual void destroy() {} + protected: virtual ~Surface() {} diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 14e865366371..4e330da417be 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -38,6 +38,7 @@ aconfig_declarations { cc_aconfig_library { name: "hwui_flags_cc_lib", + host_supported: true, aconfig_declarations: "hwui_flags", } @@ -109,12 +110,15 @@ cc_defaults { "libbase", "libharfbuzz_ng", "libminikin", + "server_configurable_flags", ], static_libs: [ "libui-types", ], + whole_static_libs: ["hwui_flags_cc_lib"], + target: { android: { shared_libs: [ @@ -146,7 +150,6 @@ cc_defaults { "libstatspull_lazy", "libstatssocket_lazy", "libtonemap", - "hwui_flags_cc_lib", ], }, host: { @@ -626,14 +629,6 @@ cc_defaults { // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed. cflags: ["-Wno-implicit-fallthrough"], }, - host: { - srcs: [ - "utils/HostColorSpace.cpp", - ], - export_static_lib_headers: [ - "libarect", - ], - }, }, } @@ -704,7 +699,6 @@ cc_test { ], shared_libs: [ "libmemunreachable", - "server_configurable_flags", ], srcs: [ "tests/unit/main.cpp", diff --git a/libs/hwui/AutoBackendTextureRelease.cpp b/libs/hwui/AutoBackendTextureRelease.cpp index 4d020c567972..5f5ffe97e953 100644 --- a/libs/hwui/AutoBackendTextureRelease.cpp +++ b/libs/hwui/AutoBackendTextureRelease.cpp @@ -21,6 +21,7 @@ #include <include/gpu/GrDirectContext.h> #include <include/gpu/GrBackendSurface.h> #include <include/gpu/MutableTextureState.h> +#include <include/gpu/vk/VulkanMutableTextureState.h> #include "renderthread/RenderThread.h" #include "utils/Color.h" #include "utils/PaintUtils.h" @@ -142,8 +143,9 @@ void AutoBackendTextureRelease::releaseQueueOwnership(GrDirectContext* context) LOG_ALWAYS_FATAL_IF(Properties::getRenderPipelineType() != RenderPipelineType::SkiaVulkan); if (mBackendTexture.isValid()) { // Passing in VK_IMAGE_LAYOUT_UNDEFINED means we keep the old layout. - skgpu::MutableTextureState newState(VK_IMAGE_LAYOUT_UNDEFINED, - VK_QUEUE_FAMILY_FOREIGN_EXT); + skgpu::MutableTextureState newState = skgpu::MutableTextureStates::MakeVulkan( + VK_IMAGE_LAYOUT_UNDEFINED, + VK_QUEUE_FAMILY_FOREIGN_EXT); // The unref for this ref happens in the releaseProc passed into setBackendTextureState. The // releaseProc callback will be made when the work to set the new state has finished on the diff --git a/libs/hwui/DeviceInfo.h b/libs/hwui/DeviceInfo.h index d4af0872e31e..a5a841e07d7a 100644 --- a/libs/hwui/DeviceInfo.h +++ b/libs/hwui/DeviceInfo.h @@ -23,6 +23,7 @@ #include <mutex> +#include "Properties.h" #include "utils/Macros.h" namespace android { @@ -60,7 +61,13 @@ public: static void setWideColorDataspace(ADataSpace dataspace); static void setSupportFp16ForHdr(bool supportFp16ForHdr); - static bool isSupportFp16ForHdr() { return get()->mSupportFp16ForHdr; }; + static bool isSupportFp16ForHdr() { + if (!Properties::hdr10bitPlus) { + return false; + } + + return get()->mSupportFp16ForHdr; + }; static void setSupportMixedColorSpaces(bool supportMixedColorSpaces); static bool isSupportMixedColorSpaces() { return get()->mSupportMixedColorSpaces; }; diff --git a/libs/hwui/FeatureFlags.h b/libs/hwui/FeatureFlags.h index 00d049cde925..ac75c077b58f 100644 --- a/libs/hwui/FeatureFlags.h +++ b/libs/hwui/FeatureFlags.h @@ -41,6 +41,14 @@ inline bool deprecate_ui_fonts() { #endif // __ANDROID__ } +inline bool letter_spacing_justification() { +#ifdef __ANDROID__ + return com_android_text_flags_letter_spacing_justification(); +#else + return true; +#endif // __ANDROID__ +} + } // namespace text_feature } // namespace android diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp index 16de21def0e3..71f7926930fc 100644 --- a/libs/hwui/HardwareBitmapUploader.cpp +++ b/libs/hwui/HardwareBitmapUploader.cpp @@ -379,7 +379,7 @@ static FormatInfo determineFormat(const SkBitmap& skBitmap, bool usingGL) { case kAlpha_8_SkColorType: formatInfo.isSupported = HardwareBitmapUploader::hasAlpha8Support(); formatInfo.bufferFormat = AHARDWAREBUFFER_FORMAT_R8_UNORM; - formatInfo.format = GL_R8; + formatInfo.format = GL_RED; formatInfo.type = GL_UNSIGNED_BYTE; formatInfo.vkFormat = VK_FORMAT_R8_UNORM; break; diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 6c3172a26751..755332ff66fd 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -38,6 +38,9 @@ namespace hwui_flags { constexpr bool clip_surfaceviews() { return false; } +constexpr bool hdr_10bit_plus() { + return false; +} } // namespace hwui_flags #endif @@ -56,6 +59,7 @@ std::optional<std::int32_t> render_ahead() { bool Properties::debugLayersUpdates = false; bool Properties::debugOverdraw = false; +bool Properties::debugTraceGpuResourceCategories = false; bool Properties::showDirtyRegions = false; bool Properties::skipEmptyFrames = true; bool Properties::useBufferAge = true; @@ -104,6 +108,7 @@ bool Properties::isSystemOrPersistent = false; float Properties::maxHdrHeadroomOn8bit = 5.f; // TODO: Refine this number bool Properties::clipSurfaceViews = false; +bool Properties::hdr10bitPlus = false; StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI; @@ -151,10 +156,12 @@ bool Properties::load() { skpCaptureEnabled = debuggingEnabled && base::GetBoolProperty(PROPERTY_CAPTURE_SKP_ENABLED, false); - SkAndroidFrameworkTraceUtil::setEnableTracing( - base::GetBoolProperty(PROPERTY_SKIA_TRACING_ENABLED, false)); + bool skiaBroadTracing = base::GetBoolProperty(PROPERTY_SKIA_TRACING_ENABLED, false); + SkAndroidFrameworkTraceUtil::setEnableTracing(skiaBroadTracing); SkAndroidFrameworkTraceUtil::setUsePerfettoTrackEvents( base::GetBoolProperty(PROPERTY_SKIA_USE_PERFETTO_TRACK_EVENTS, false)); + debugTraceGpuResourceCategories = + base::GetBoolProperty(PROPERTY_TRACE_GPU_RESOURCES, skiaBroadTracing); runningInEmulator = base::GetBoolProperty(PROPERTY_IS_EMULATOR, false); @@ -174,6 +181,7 @@ bool Properties::load() { clipSurfaceViews = base::GetBoolProperty("debug.hwui.clip_surfaceviews", hwui_flags::clip_surfaceviews()); + hdr10bitPlus = hwui_flags::hdr_10bit_plus(); return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw); } diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index bca57e9e4678..ec53070f6cb8 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -143,6 +143,15 @@ enum DebugLevel { #define PROPERTY_CAPTURE_SKP_ENABLED "debug.hwui.capture_skp_enabled" /** + * Might split Skia's GPU resource utilization into separate tracing tracks (slow). + * + * Aggregate total and purgeable numbers will still be reported under a "misc" track when this is + * disabled, they just won't be split into distinct categories. Results may vary depending on GPU + * backend/API, and the category mappings defined in ATraceMemoryDump's hardcoded sResourceMap. + */ +#define PROPERTY_TRACE_GPU_RESOURCES "debug.hwui.trace_gpu_resources" + +/** * Allows broad recording of Skia drawing commands. * * If disabled, a very minimal set of trace events *may* be recorded. @@ -254,6 +263,7 @@ public: static bool debugLayersUpdates; static bool debugOverdraw; + static bool debugTraceGpuResourceCategories; static bool showDirtyRegions; // TODO: Remove after stabilization period static bool skipEmptyFrames; @@ -326,6 +336,7 @@ public: static float maxHdrHeadroomOn8bit; static bool clipSurfaceViews; + static bool hdr10bitPlus; static StretchEffectBehavior getStretchEffectBehavior() { return stretchEffectBehavior; diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 008ea3aaa2e7..14b8d8d0aa12 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -341,6 +341,10 @@ void SkiaCanvas::concat(const SkMatrix& matrix) { mCanvas->concat(matrix); } +void SkiaCanvas::concat(const SkM44& matrix) { + mCanvas->concat(matrix); +} + void SkiaCanvas::rotate(float degrees) { mCanvas->rotate(degrees); } diff --git a/libs/hwui/SkiaCanvas.h b/libs/hwui/SkiaCanvas.h index 4bf1790e2415..5e3553bbbbb4 100644 --- a/libs/hwui/SkiaCanvas.h +++ b/libs/hwui/SkiaCanvas.h @@ -86,6 +86,7 @@ public: virtual void getMatrix(SkMatrix* outMatrix) const override; virtual void setMatrix(const SkMatrix& matrix) override; virtual void concat(const SkMatrix& matrix) override; + virtual void concat(const SkM44& matrix) override; virtual void rotate(float degrees) override; virtual void scale(float sx, float sy) override; virtual void skew(float sx, float sy) override; diff --git a/libs/hwui/aconfig/hwui_flags.aconfig b/libs/hwui/aconfig/hwui_flags.aconfig index ca119757e816..3d7e559bebe0 100644 --- a/libs/hwui/aconfig/hwui_flags.aconfig +++ b/libs/hwui/aconfig/hwui_flags.aconfig @@ -1,6 +1,13 @@ package: "com.android.graphics.hwui.flags" flag { + name: "clip_shader" + namespace: "core_graphics" + description: "API for canvas shader clipping operations" + bug: "280116960" +} + +flag { name: "matrix_44" namespace: "core_graphics" description: "API for 4x4 matrix and related canvas functions" @@ -15,6 +22,20 @@ flag { } flag { + name: "high_contrast_text_luminance" + namespace: "accessibility" + description: "Use luminance to determine how to make text more high contrast, instead of RGB heuristic" + bug: "186567103" +} + +flag { + name: "high_contrast_text_small_text_rect" + namespace: "accessibility" + description: "Draw a solid rectangle background behind text instead of a stroke outline" + bug: "186567103" +} + +flag { name: "hdr_10bit_plus" namespace: "core_graphics" description: "Use 10101010 and FP16 formats for HDR-UI when available" diff --git a/libs/hwui/apex/android_paint.cpp b/libs/hwui/apex/android_paint.cpp index cc79cba5e19c..5e73e7628568 100644 --- a/libs/hwui/apex/android_paint.cpp +++ b/libs/hwui/apex/android_paint.cpp @@ -14,12 +14,13 @@ * limitations under the License. */ -#include "android/graphics/paint.h" +#include <SkBlendMode.h> +#include <SkImageFilter.h> +#include <hwui/Paint.h> #include "TypeCast.h" - -#include <hwui/Paint.h> -#include <SkBlendMode.h> +#include "android/graphics/paint.h" +#include "include/effects/SkImageFilters.h" using namespace android; @@ -43,6 +44,22 @@ static SkBlendMode convertBlendMode(ABlendMode blendMode) { } } +static sk_sp<SkImageFilter> convertImageFilter(AImageFilter imageFilter) { + switch (imageFilter) { + case AIMAGE_FILTER_DROP_SHADOW_FOR_POINTER_ICON: + // Material Elevation Level 1 Drop Shadow. + sk_sp<SkImageFilter> key_shadow = SkImageFilters::DropShadow( + 0.0f, 1.0f, 2.0f, 2.0f, SkColorSetARGB(0x4D, 0x00, 0x00, 0x00), nullptr); + sk_sp<SkImageFilter> ambient_shadow = SkImageFilters::DropShadow( + 0.0f, 1.0f, 3.0f, 3.0f, SkColorSetARGB(0x26, 0x00, 0x00, 0x00), nullptr); + return SkImageFilters::Compose(ambient_shadow, key_shadow); + } +} + void APaint_setBlendMode(APaint* paint, ABlendMode blendMode) { TypeCast::toPaint(paint)->setBlendMode(convertBlendMode(blendMode)); } + +void APaint_setImageFilter(APaint* paint, AImageFilter imageFilter) { + TypeCast::toPaint(paint)->setImageFilter(convertImageFilter(imageFilter)); +} diff --git a/libs/hwui/apex/include/android/graphics/paint.h b/libs/hwui/apex/include/android/graphics/paint.h index 058db8d37619..36b7575d585d 100644 --- a/libs/hwui/apex/include/android/graphics/paint.h +++ b/libs/hwui/apex/include/android/graphics/paint.h @@ -26,6 +26,14 @@ __BEGIN_DECLS */ typedef struct APaint APaint; +/** + * Predefined Image filter type. + */ +enum AImageFilter { + /** Drop shadow image filter for PointerIcons. */ + AIMAGE_FILTER_DROP_SHADOW_FOR_POINTER_ICON = 0, +}; + /** Bitmap pixel format. */ enum ABlendMode { /** replaces destination with zero: fully transparent */ @@ -42,6 +50,8 @@ ANDROID_API void APaint_destroyPaint(APaint* paint); ANDROID_API void APaint_setBlendMode(APaint* paint, ABlendMode blendMode); +ANDROID_API void APaint_setImageFilter(APaint* paint, AImageFilter imageFilter); + __END_DECLS #ifdef __cplusplus @@ -54,6 +64,10 @@ namespace graphics { void setBlendMode(ABlendMode blendMode) { APaint_setBlendMode(mPaint, blendMode); } + void setImageFilter(AImageFilter imageFilter) { + APaint_setImageFilter(mPaint, imageFilter); + } + const APaint& get() const { return *mPaint; } private: diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp index 80b6c0385fca..e9f4b81c7624 100644 --- a/libs/hwui/hwui/Canvas.cpp +++ b/libs/hwui/hwui/Canvas.cpp @@ -18,6 +18,7 @@ #include <SkFontMetrics.h> #include <SkRRect.h> +#include <minikin/MinikinRect.h> #include "FeatureFlags.h" #include "MinikinUtils.h" @@ -107,7 +108,13 @@ void Canvas::drawText(const uint16_t* text, int textSize, int start, int count, // care of all alignment. paint.setTextAlign(Paint::kLeft_Align); - DrawTextFunctor f(layout, this, paint, x, y, layout.getAdvance()); + minikin::MinikinRect bounds; + // We only need the bounds to draw a rectangular background in high contrast mode. Let's save + // the cycles otherwise. + if (flags::high_contrast_text_small_text_rect() && isHighContrastText()) { + MinikinUtils::getBounds(&paint, bidiFlags, typeface, text, textSize, &bounds); + } + DrawTextFunctor f(layout, this, paint, x, y, layout.getAdvance(), bounds); MinikinUtils::forFontRun(layout, &paint, f); if (text_feature::fix_double_underline()) { diff --git a/libs/hwui/hwui/Canvas.h b/libs/hwui/hwui/Canvas.h index 9ec023b2c36f..20e3ad2c8202 100644 --- a/libs/hwui/hwui/Canvas.h +++ b/libs/hwui/hwui/Canvas.h @@ -175,6 +175,7 @@ public: virtual void setMatrix(const SkMatrix& matrix) = 0; virtual void concat(const SkMatrix& matrix) = 0; + virtual void concat(const SkM44& matrix) = 0; virtual void rotate(float degrees) = 0; virtual void scale(float sx, float sy) = 0; virtual void skew(float sx, float sy) = 0; diff --git a/libs/hwui/hwui/DrawTextFunctor.h b/libs/hwui/hwui/DrawTextFunctor.h index 2e6e97634aec..ba6543988a7b 100644 --- a/libs/hwui/hwui/DrawTextFunctor.h +++ b/libs/hwui/hwui/DrawTextFunctor.h @@ -16,7 +16,9 @@ #include <SkFontMetrics.h> #include <SkRRect.h> +#include <com_android_graphics_hwui_flags.h> +#include "../utils/Color.h" #include "Canvas.h" #include "FeatureFlags.h" #include "MinikinUtils.h" @@ -27,8 +29,12 @@ #include "hwui/PaintFilter.h" #include "pipeline/skia/SkiaRecordingCanvas.h" +namespace flags = com::android::graphics::hwui::flags; + namespace android { +inline constexpr int kHighContrastTextBorderWidth = 4; + static inline void drawStroke(SkScalar left, SkScalar right, SkScalar top, SkScalar thickness, const Paint& paint, Canvas* canvas) { const SkScalar strokeWidth = fmax(thickness, 1.0f); @@ -41,15 +47,26 @@ static void simplifyPaint(int color, Paint* paint) { paint->setShader(nullptr); paint->setColorFilter(nullptr); paint->setLooper(nullptr); - paint->setStrokeWidth(4 + 0.04 * paint->getSkFont().getSize()); + paint->setStrokeWidth(kHighContrastTextBorderWidth + 0.04 * paint->getSkFont().getSize()); paint->setStrokeJoin(SkPaint::kRound_Join); paint->setLooper(nullptr); } class DrawTextFunctor { public: + /** + * Creates a Functor to draw the given text layout. + * + * @param layout + * @param canvas + * @param paint + * @param x + * @param y + * @param totalAdvance + * @param bounds bounds of the text. Only required if high contrast text mode is enabled. + */ DrawTextFunctor(const minikin::Layout& layout, Canvas* canvas, const Paint& paint, float x, - float y, float totalAdvance) + float y, float totalAdvance, const minikin::MinikinRect& bounds) : layout(layout) , canvas(canvas) , paint(paint) @@ -57,7 +74,8 @@ public: , y(y) , totalAdvance(totalAdvance) , underlinePosition(0) - , underlineThickness(0) {} + , underlineThickness(0) + , bounds(bounds) {} void operator()(size_t start, size_t end) { auto glyphFunc = [&](uint16_t* text, float* positions) { @@ -73,15 +91,30 @@ public: if (CC_UNLIKELY(canvas->isHighContrastText() && paint.getAlpha() != 0)) { // high contrast draw path int color = paint.getColor(); - int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color); - bool darken = channelSum < (128 * 3); + bool darken; + if (flags::high_contrast_text_luminance()) { + uirenderer::Lab lab = uirenderer::sRGBToLab(color); + darken = lab.L <= 50; + } else { + int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color); + darken = channelSum < (128 * 3); + } // outline gDrawTextBlobMode = DrawTextBlobMode::HctOutline; Paint outlinePaint(paint); simplifyPaint(darken ? SK_ColorWHITE : SK_ColorBLACK, &outlinePaint); outlinePaint.setStyle(SkPaint::kStrokeAndFill_Style); - canvas->drawGlyphs(glyphFunc, glyphCount, outlinePaint, x, y, totalAdvance); + if (flags::high_contrast_text_small_text_rect()) { + auto bgBounds(bounds); + auto padding = kHighContrastTextBorderWidth + 0.1f * paint.getSkFont().getSize(); + bgBounds.offset(x, y); + canvas->drawRect(bgBounds.mLeft - padding, bgBounds.mTop - padding, + bgBounds.mRight + padding, bgBounds.mBottom + padding, + outlinePaint); + } else { + canvas->drawGlyphs(glyphFunc, glyphCount, outlinePaint, x, y, totalAdvance); + } // inner gDrawTextBlobMode = DrawTextBlobMode::HctInner; @@ -136,6 +169,7 @@ private: float totalAdvance; float underlinePosition; float underlineThickness; + const minikin::MinikinRect& bounds; }; } // namespace android diff --git a/libs/hwui/hwui/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp index f4ee36ec66d1..bbb142014ed8 100644 --- a/libs/hwui/hwui/MinikinSkia.cpp +++ b/libs/hwui/hwui/MinikinSkia.cpp @@ -131,11 +131,6 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( const std::vector<minikin::FontVariation>& variations) const { SkFontArguments args; - int ttcIndex; - std::unique_ptr<SkStreamAsset> stream(mTypeface->openStream(&ttcIndex)); - LOG_ALWAYS_FATAL_IF(stream == nullptr, "openStream failed"); - - args.setCollectionIndex(ttcIndex); std::vector<SkFontArguments::VariationPosition::Coordinate> skVariation; skVariation.resize(variations.size()); for (size_t i = 0; i < variations.size(); i++) { @@ -143,11 +138,10 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( skVariation[i].value = SkFloatToScalar(variations[i].value); } args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())}); - sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr(); - sk_sp<SkTypeface> face(fm->makeFromStream(std::move(stream), args)); + sk_sp<SkTypeface> face = mTypeface->makeClone(args); return std::make_shared<MinikinFontSkia>(std::move(face), mSourceId, mFontData, mFontSize, - mFilePath, ttcIndex, variations); + mFilePath, mTtcIndex, variations); } // hinting<<16 | edging<<8 | bools:5bits diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp index 7552b56d2ad6..d66d7f8e83f4 100644 --- a/libs/hwui/hwui/MinikinUtils.cpp +++ b/libs/hwui/hwui/MinikinUtils.cpp @@ -72,10 +72,13 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, minikin::Bidi bidiFla const minikin::Range contextRange(contextStart, contextStart + contextCount); const minikin::StartHyphenEdit startHyphen = paint->getStartHyphenEdit(); const minikin::EndHyphenEdit endHyphen = paint->getEndHyphenEdit(); + const minikin::RunFlag minikinRunFlag = text_feature::letter_spacing_justification() + ? paint->getRunFlag() + : minikin::RunFlag::NONE; if (mt == nullptr) { return minikin::Layout(textBuf.substr(contextRange), range - contextStart, bidiFlags, - minikinPaint, startHyphen, endHyphen); + minikinPaint, startHyphen, endHyphen, minikinRunFlag); } else { return mt->buildLayout(textBuf, range, contextRange, minikinPaint, startHyphen, endHyphen); } @@ -96,15 +99,18 @@ void MinikinUtils::getBounds(const Paint* paint, minikin::Bidi bidiFlags, const float MinikinUtils::measureText(const Paint* paint, minikin::Bidi bidiFlags, const Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize, float* advances, - minikin::MinikinRect* bounds) { + minikin::MinikinRect* bounds, uint32_t* clusterCount) { minikin::MinikinPaint minikinPaint = prepareMinikinPaint(paint, typeface); const minikin::U16StringPiece textBuf(buf, bufSize); const minikin::Range range(start, start + count); const minikin::StartHyphenEdit startHyphen = paint->getStartHyphenEdit(); const minikin::EndHyphenEdit endHyphen = paint->getEndHyphenEdit(); + const minikin::RunFlag minikinRunFlag = text_feature::letter_spacing_justification() + ? paint->getRunFlag() + : minikin::RunFlag::NONE; return minikin::Layout::measureText(textBuf, range, bidiFlags, minikinPaint, startHyphen, - endHyphen, advances, bounds); + endHyphen, advances, bounds, clusterCount, minikinRunFlag); } minikin::MinikinExtent MinikinUtils::getFontExtent(const Paint* paint, minikin::Bidi bidiFlags, diff --git a/libs/hwui/hwui/MinikinUtils.h b/libs/hwui/hwui/MinikinUtils.h index 61bc881faa54..f8574ee50525 100644 --- a/libs/hwui/hwui/MinikinUtils.h +++ b/libs/hwui/hwui/MinikinUtils.h @@ -53,7 +53,7 @@ public: static float measureText(const Paint* paint, minikin::Bidi bidiFlags, const Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize, - float* advances, minikin::MinikinRect* bounds); + float* advances, minikin::MinikinRect* bounds, uint32_t* clusterCount); static minikin::MinikinExtent getFontExtent(const Paint* paint, minikin::Bidi bidiFlags, const Typeface* typeface, const uint16_t* buf, diff --git a/libs/hwui/hwui/Paint.h b/libs/hwui/hwui/Paint.h index ef4dce57bf46..708f96e5a070 100644 --- a/libs/hwui/hwui/Paint.h +++ b/libs/hwui/hwui/Paint.h @@ -25,6 +25,7 @@ #include <minikin/FontFamily.h> #include <minikin/FontFeature.h> #include <minikin/Hyphenator.h> +#include <minikin/Layout.h> #include <string> @@ -144,6 +145,9 @@ public: bool isDevKern() const { return mDevKern; } void setDevKern(bool d) { mDevKern = d; } + minikin::RunFlag getRunFlag() const { return mRunFlag; } + void setRunFlag(minikin::RunFlag runFlag) { mRunFlag = runFlag; } + // Deprecated -- bitmapshaders will be taking this flag explicitly bool isFilterBitmap() const { return mFilterBitmap; } void setFilterBitmap(bool filter) { mFilterBitmap = filter; } @@ -188,6 +192,7 @@ private: bool mStrikeThru = false; bool mUnderline = false; bool mDevKern = false; + minikin::RunFlag mRunFlag = minikin::RunFlag::NONE; }; } // namespace android diff --git a/libs/hwui/hwui/PaintImpl.cpp b/libs/hwui/hwui/PaintImpl.cpp index aac928f85924..c32ea01db7b7 100644 --- a/libs/hwui/hwui/PaintImpl.cpp +++ b/libs/hwui/hwui/PaintImpl.cpp @@ -47,8 +47,8 @@ Paint::Paint(const Paint& paint) , mFilterBitmap(paint.mFilterBitmap) , mStrikeThru(paint.mStrikeThru) , mUnderline(paint.mUnderline) - , mDevKern(paint.mDevKern) {} - + , mDevKern(paint.mDevKern) + , mRunFlag(paint.mRunFlag) {} Paint::~Paint() {} @@ -68,21 +68,19 @@ Paint& Paint::operator=(const Paint& other) { mStrikeThru = other.mStrikeThru; mUnderline = other.mUnderline; mDevKern = other.mDevKern; + mRunFlag = other.mRunFlag; return *this; } bool operator==(const Paint& a, const Paint& b) { - return static_cast<const SkPaint&>(a) == static_cast<const SkPaint&>(b) && - a.mFont == b.mFont && - a.mLooper == b.mLooper && - a.mLetterSpacing == b.mLetterSpacing && a.mWordSpacing == b.mWordSpacing && - a.mFontFeatureSettings == b.mFontFeatureSettings && + return static_cast<const SkPaint&>(a) == static_cast<const SkPaint&>(b) && a.mFont == b.mFont && + a.mLooper == b.mLooper && a.mLetterSpacing == b.mLetterSpacing && + a.mWordSpacing == b.mWordSpacing && a.mFontFeatureSettings == b.mFontFeatureSettings && a.mMinikinLocaleListId == b.mMinikinLocaleListId && a.mFamilyVariant == b.mFamilyVariant && a.mHyphenEdit == b.mHyphenEdit && a.mTypeface == b.mTypeface && a.mAlign == b.mAlign && - a.mFilterBitmap == b.mFilterBitmap && - a.mStrikeThru == b.mStrikeThru && a.mUnderline == b.mUnderline && - a.mDevKern == b.mDevKern; + a.mFilterBitmap == b.mFilterBitmap && a.mStrikeThru == b.mStrikeThru && + a.mUnderline == b.mUnderline && a.mDevKern == b.mDevKern && a.mRunFlag == b.mRunFlag; } void Paint::reset() { @@ -96,6 +94,7 @@ void Paint::reset() { mStrikeThru = false; mUnderline = false; mDevKern = false; + mRunFlag = minikin::RunFlag::NONE; } void Paint::setLooper(sk_sp<BlurDrawLooper> looper) { @@ -133,6 +132,8 @@ static const uint32_t sForceAutoHinting = 0x800; // flags related to minikin::Paint static const uint32_t sUnderlineFlag = 0x08; static const uint32_t sStrikeThruFlag = 0x10; +static const uint32_t sTextRunLeftEdge = 0x2000; +static const uint32_t sTextRunRightEdge = 0x4000; // flags no longer supported on native side (but mirrored for compatibility) static const uint32_t sDevKernFlag = 0x100; @@ -186,6 +187,12 @@ uint32_t Paint::getJavaFlags() const { flags |= -(int)mUnderline & sUnderlineFlag; flags |= -(int)mDevKern & sDevKernFlag; flags |= -(int)mFilterBitmap & sFilterBitmapFlag; + if (mRunFlag & minikin::RunFlag::LEFT_EDGE) { + flags |= sTextRunLeftEdge; + } + if (mRunFlag & minikin::RunFlag::RIGHT_EDGE) { + flags |= sTextRunRightEdge; + } return flags; } @@ -196,6 +203,15 @@ void Paint::setJavaFlags(uint32_t flags) { mUnderline = (flags & sUnderlineFlag) != 0; mDevKern = (flags & sDevKernFlag) != 0; mFilterBitmap = (flags & sFilterBitmapFlag) != 0; + + std::underlying_type<minikin::RunFlag>::type rawFlag = minikin::RunFlag::NONE; + if (flags & sTextRunLeftEdge) { + rawFlag |= minikin::RunFlag::LEFT_EDGE; + } + if (flags & sTextRunRightEdge) { + rawFlag |= minikin::RunFlag::RIGHT_EDGE; + } + mRunFlag = static_cast<minikin::RunFlag>(rawFlag); } } // namespace android diff --git a/libs/hwui/jni/Graphics.cpp b/libs/hwui/jni/Graphics.cpp index 7cc48661619a..8315c4c0dd4d 100644 --- a/libs/hwui/jni/Graphics.cpp +++ b/libs/hwui/jni/Graphics.cpp @@ -247,6 +247,9 @@ static jfieldID gFontMetricsInt_descent; static jfieldID gFontMetricsInt_bottom; static jfieldID gFontMetricsInt_leading; +static jclass gRunInfo_class; +static jfieldID gRunInfo_clusterCount; + /////////////////////////////////////////////////////////////////////////////// void GraphicsJNI::get_jrect(JNIEnv* env, jobject obj, int* L, int* T, int* R, int* B) @@ -511,6 +514,10 @@ int GraphicsJNI::set_metrics_int(JNIEnv* env, jobject metrics, const SkFontMetri return descent - ascent + leading; } +void GraphicsJNI::set_cluster_count_to_run_info(JNIEnv* env, jobject runInfo, jint clusterCount) { + env->SetIntField(runInfo, gRunInfo_clusterCount, clusterCount); +} + /////////////////////////////////////////////////////////////////////////////////////////// jobject GraphicsJNI::createBitmapRegionDecoder(JNIEnv* env, BitmapRegionDecoderWrapper* bitmap) { @@ -834,5 +841,10 @@ int register_android_graphics_Graphics(JNIEnv* env) gFontMetricsInt_bottom = GetFieldIDOrDie(env, gFontMetricsInt_class, "bottom", "I"); gFontMetricsInt_leading = GetFieldIDOrDie(env, gFontMetricsInt_class, "leading", "I"); + gRunInfo_class = FindClassOrDie(env, "android/graphics/Paint$RunInfo"); + gRunInfo_class = MakeGlobalRefOrDie(env, gRunInfo_class); + + gRunInfo_clusterCount = GetFieldIDOrDie(env, gRunInfo_class, "mClusterCount", "I"); + return 0; } diff --git a/libs/hwui/jni/GraphicsJNI.h b/libs/hwui/jni/GraphicsJNI.h index b9fff36d372e..b0a1074d6693 100644 --- a/libs/hwui/jni/GraphicsJNI.h +++ b/libs/hwui/jni/GraphicsJNI.h @@ -77,6 +77,8 @@ public: static SkRect* jrect_to_rect(JNIEnv*, jobject jrect, SkRect*); static void rect_to_jrectf(const SkRect&, JNIEnv*, jobject jrectf); + static void set_cluster_count_to_run_info(JNIEnv* env, jobject runInfo, jint clusterCount); + static void set_jpoint(JNIEnv*, jobject jrect, int x, int y); static SkIPoint* jpoint_to_ipoint(JNIEnv*, jobject jpoint, SkIPoint* point); diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp index d84b73d1a1ca..286f06a6bad8 100644 --- a/libs/hwui/jni/Paint.cpp +++ b/libs/hwui/jni/Paint.cpp @@ -114,7 +114,7 @@ namespace PaintGlue { std::unique_ptr<float[]> advancesArray(new float[count]); MinikinUtils::measureText(&paint, static_cast<minikin::Bidi>(bidiFlags), typeface, text, 0, - count, count, advancesArray.get(), nullptr); + count, count, advancesArray.get(), nullptr, nullptr); for (int i = 0; i < count; i++) { // traverse in the given direction @@ -206,7 +206,7 @@ namespace PaintGlue { } const float advance = MinikinUtils::measureText( paint, static_cast<minikin::Bidi>(bidiFlags), typeface, text, start, count, - contextCount, advancesArray.get(), nullptr); + contextCount, advancesArray.get(), nullptr, nullptr); if (advances) { env->SetFloatArrayRegion(advances, advancesIndex, count, advancesArray.get()); } @@ -244,7 +244,7 @@ namespace PaintGlue { minikin::Bidi bidiFlags = dir == 1 ? minikin::Bidi::FORCE_RTL : minikin::Bidi::FORCE_LTR; std::unique_ptr<float[]> advancesArray(new float[count]); MinikinUtils::measureText(paint, bidiFlags, typeface, text, start, count, start + count, - advancesArray.get(), nullptr); + advancesArray.get(), nullptr, nullptr); size_t result = minikin::GraphemeBreak::getTextRunCursor(advancesArray.get(), text, start, count, offset, moveOpt); return static_cast<jint>(result); @@ -508,7 +508,7 @@ namespace PaintGlue { static jfloat doRunAdvance(JNIEnv* env, const Paint* paint, const Typeface* typeface, const jchar buf[], jint start, jint count, jint bufSize, jboolean isRtl, jint offset, jfloatArray advances, - jint advancesIndex, SkRect* drawBounds) { + jint advancesIndex, SkRect* drawBounds, uint32_t* clusterCount) { if (advances) { size_t advancesLength = env->GetArrayLength(advances); if ((size_t)(count + advancesIndex) > advancesLength) { @@ -519,9 +519,9 @@ namespace PaintGlue { minikin::Bidi bidiFlags = isRtl ? minikin::Bidi::FORCE_RTL : minikin::Bidi::FORCE_LTR; minikin::MinikinRect bounds; if (offset == start + count && advances == nullptr) { - float result = - MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count, - bufSize, nullptr, drawBounds ? &bounds : nullptr); + float result = MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count, + bufSize, nullptr, + drawBounds ? &bounds : nullptr, clusterCount); if (drawBounds) { copyMinikinRectToSkRect(bounds, drawBounds); } @@ -529,7 +529,8 @@ namespace PaintGlue { } std::unique_ptr<float[]> advancesArray(new float[count]); MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count, bufSize, - advancesArray.get(), drawBounds ? &bounds : nullptr); + advancesArray.get(), drawBounds ? &bounds : nullptr, + clusterCount); if (drawBounds) { copyMinikinRectToSkRect(bounds, drawBounds); @@ -549,7 +550,7 @@ namespace PaintGlue { ScopedCharArrayRO textArray(env, text); jfloat result = doRunAdvance(env, paint, typeface, textArray.get() + contextStart, start - contextStart, end - start, contextEnd - contextStart, - isRtl, offset - contextStart, nullptr, 0, nullptr); + isRtl, offset - contextStart, nullptr, 0, nullptr, nullptr); return result; } @@ -558,18 +559,22 @@ namespace PaintGlue { jint contextStart, jint contextEnd, jboolean isRtl, jint offset, jfloatArray advances, jint advancesIndex, - jobject drawBounds) { + jobject drawBounds, jobject runInfo) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); const Typeface* typeface = paint->getAndroidTypeface(); ScopedCharArrayRO textArray(env, text); SkRect skDrawBounds; + uint32_t clusterCount = 0; jfloat result = doRunAdvance(env, paint, typeface, textArray.get() + contextStart, start - contextStart, end - start, contextEnd - contextStart, isRtl, offset - contextStart, advances, advancesIndex, - drawBounds ? &skDrawBounds : nullptr); + drawBounds ? &skDrawBounds : nullptr, &clusterCount); if (drawBounds != nullptr) { GraphicsJNI::rect_to_jrectf(skDrawBounds, env, drawBounds); } + if (runInfo) { + GraphicsJNI::set_cluster_count_to_run_info(env, runInfo, clusterCount); + } return result; } @@ -578,7 +583,7 @@ namespace PaintGlue { minikin::Bidi bidiFlags = isRtl ? minikin::Bidi::FORCE_RTL : minikin::Bidi::FORCE_LTR; std::unique_ptr<float[]> advancesArray(new float[count]); MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count, bufSize, - advancesArray.get(), nullptr); + advancesArray.get(), nullptr, nullptr); return minikin::getOffsetForAdvance(advancesArray.get(), buf, start, count, advance); } @@ -1145,7 +1150,8 @@ static const JNINativeMethod methods[] = { (void*)PaintGlue::getCharArrayBounds}, {"nHasGlyph", "(JILjava/lang/String;)Z", (void*)PaintGlue::hasGlyph}, {"nGetRunAdvance", "(J[CIIIIZI)F", (void*)PaintGlue::getRunAdvance___CIIIIZI_F}, - {"nGetRunCharacterAdvance", "(J[CIIIIZI[FILandroid/graphics/RectF;)F", + {"nGetRunCharacterAdvance", + "(J[CIIIIZI[FILandroid/graphics/RectF;Landroid/graphics/Paint$RunInfo;)F", (void*)PaintGlue::getRunCharacterAdvance___CIIIIZI_FI_F}, {"nGetOffsetForAdvance", "(J[CIIIIZF)I", (void*)PaintGlue::getOffsetForAdvance___CIIIIZF_I}, {"nGetFontMetricsIntForText", "(J[CIIIIZLandroid/graphics/Paint$FontMetricsInt;)V", diff --git a/libs/hwui/jni/android_graphics_Canvas.cpp b/libs/hwui/jni/android_graphics_Canvas.cpp index 8ba750372d18..e5bdeeea75be 100644 --- a/libs/hwui/jni/android_graphics_Canvas.cpp +++ b/libs/hwui/jni/android_graphics_Canvas.cpp @@ -158,6 +158,13 @@ static void concat(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle, jlong matrixHan get_canvas(canvasHandle)->concat(*matrix); } +static void concat44(JNIEnv* env, jobject obj, jlong canvasHandle, jfloatArray arr) { + jfloat* matVals = env->GetFloatArrayElements(arr, 0); + const SkM44 matrix = SkM44::RowMajor(matVals); + get_canvas(canvasHandle)->concat(matrix); + env->ReleaseFloatArrayElements(arr, matVals, 0); +} + static void rotate(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle, jfloat degrees) { get_canvas(canvasHandle)->rotate(degrees); } @@ -613,6 +620,12 @@ static void drawTextChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray c Paint* paint = reinterpret_cast<Paint*>(paintHandle); const Typeface* typeface = paint->getAndroidTypeface(); ScopedCharArrayRO text(env, charArray); + + // The drawText API is designed to draw entire line, so ignore the text run flag and draw the + // text as entire line mode. + const minikin::RunFlag originalRunFlag = paint->getRunFlag(); + paint->setRunFlag(minikin::RunFlag::WHOLE_LINE); + // drawTextString and drawTextChars doesn't use context info get_canvas(canvasHandle)->drawText( text.get() + index, count, // text buffer @@ -620,6 +633,7 @@ static void drawTextChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray c 0, count, // context range x, y, // draw position static_cast<minikin::Bidi>(bidiFlags), *paint, typeface, nullptr /* measured text */); + paint->setRunFlag(originalRunFlag); } static void drawTextString(JNIEnv* env, jobject, jlong canvasHandle, jstring strObj, @@ -629,6 +643,12 @@ static void drawTextString(JNIEnv* env, jobject, jlong canvasHandle, jstring str Paint* paint = reinterpret_cast<Paint*>(paintHandle); const Typeface* typeface = paint->getAndroidTypeface(); const int count = end - start; + + // The drawText API is designed to draw entire line, so ignore the text run flag and draw the + // text as entire line mode. + const minikin::RunFlag originalRunFlag = paint->getRunFlag(); + paint->setRunFlag(minikin::RunFlag::WHOLE_LINE); + // drawTextString and drawTextChars doesn't use context info get_canvas(canvasHandle)->drawText( text.get() + start, count, // text buffer @@ -636,6 +656,7 @@ static void drawTextString(JNIEnv* env, jobject, jlong canvasHandle, jstring str 0, count, // context range x, y, // draw position static_cast<minikin::Bidi>(bidiFlags), *paint, typeface, nullptr /* measured text */); + paint->setRunFlag(originalRunFlag); } static void drawTextRunChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray charArray, @@ -681,9 +702,15 @@ static void drawTextOnPathChars(JNIEnv* env, jobject, jlong canvasHandle, jcharA jchar* jchars = env->GetCharArrayElements(text, NULL); + // The drawText API is designed to draw entire line, so ignore the text run flag and draw the + // text as entire line mode. + const minikin::RunFlag originalRunFlag = paint->getRunFlag(); + paint->setRunFlag(minikin::RunFlag::WHOLE_LINE); + get_canvas(canvasHandle)->drawTextOnPath(jchars + index, count, static_cast<minikin::Bidi>(bidiFlags), *path, hOffset, vOffset, *paint, typeface); + paint->setRunFlag(originalRunFlag); env->ReleaseCharArrayElements(text, jchars, 0); } @@ -697,9 +724,15 @@ static void drawTextOnPathString(JNIEnv* env, jobject, jlong canvasHandle, jstri const jchar* jchars = env->GetStringChars(text, NULL); int count = env->GetStringLength(text); + // The drawText API is designed to draw entire line, so ignore the text run flag and draw the + // text as entire line mode. + const minikin::RunFlag originalRunFlag = paint->getRunFlag(); + paint->setRunFlag(minikin::RunFlag::WHOLE_LINE); + get_canvas(canvasHandle)->drawTextOnPath(jchars, count, static_cast<minikin::Bidi>(bidiFlags), *path, hOffset, vOffset, *paint, typeface); + paint->setRunFlag(originalRunFlag); env->ReleaseStringChars(text, jchars); } @@ -730,40 +763,41 @@ static void punchHole(JNIEnv* env, jobject, jlong canvasPtr, jfloat left, jfloat }; // namespace CanvasJNI static const JNINativeMethod gMethods[] = { - {"nGetNativeFinalizer", "()J", (void*) CanvasJNI::getNativeFinalizer}, - {"nFreeCaches", "()V", (void*) CanvasJNI::freeCaches}, - {"nFreeTextLayoutCaches", "()V", (void*) CanvasJNI::freeTextLayoutCaches}, - {"nSetCompatibilityVersion", "(I)V", (void*) CanvasJNI::setCompatibilityVersion}, - - // ------------ @FastNative ---------------- - {"nInitRaster", "(J)J", (void*) CanvasJNI::initRaster}, - {"nSetBitmap", "(JJ)V", (void*) CanvasJNI::setBitmap}, - {"nGetClipBounds","(JLandroid/graphics/Rect;)Z", (void*) CanvasJNI::getClipBounds}, - - // ------------ @CriticalNative ---------------- - {"nIsOpaque","(J)Z", (void*) CanvasJNI::isOpaque}, - {"nGetWidth","(J)I", (void*) CanvasJNI::getWidth}, - {"nGetHeight","(J)I", (void*) CanvasJNI::getHeight}, - {"nSave","(JI)I", (void*) CanvasJNI::save}, - {"nSaveLayer","(JFFFFJ)I", (void*) CanvasJNI::saveLayer}, - {"nSaveLayerAlpha","(JFFFFI)I", (void*) CanvasJNI::saveLayerAlpha}, - {"nSaveUnclippedLayer","(JIIII)I", (void*) CanvasJNI::saveUnclippedLayer}, - {"nRestoreUnclippedLayer","(JIJ)V", (void*) CanvasJNI::restoreUnclippedLayer}, - {"nGetSaveCount","(J)I", (void*) CanvasJNI::getSaveCount}, - {"nRestore","(J)Z", (void*) CanvasJNI::restore}, - {"nRestoreToCount","(JI)V", (void*) CanvasJNI::restoreToCount}, - {"nGetMatrix", "(JJ)V", (void*)CanvasJNI::getMatrix}, - {"nSetMatrix","(JJ)V", (void*) CanvasJNI::setMatrix}, - {"nConcat","(JJ)V", (void*) CanvasJNI::concat}, - {"nRotate","(JF)V", (void*) CanvasJNI::rotate}, - {"nScale","(JFF)V", (void*) CanvasJNI::scale}, - {"nSkew","(JFF)V", (void*) CanvasJNI::skew}, - {"nTranslate","(JFF)V", (void*) CanvasJNI::translate}, - {"nQuickReject","(JJ)Z", (void*) CanvasJNI::quickRejectPath}, - {"nQuickReject","(JFFFF)Z", (void*)CanvasJNI::quickRejectRect}, - {"nClipRect","(JFFFFI)Z", (void*) CanvasJNI::clipRect}, - {"nClipPath","(JJI)Z", (void*) CanvasJNI::clipPath}, - {"nSetDrawFilter", "(JJ)V", (void*) CanvasJNI::setPaintFilter}, + {"nGetNativeFinalizer", "()J", (void*)CanvasJNI::getNativeFinalizer}, + {"nFreeCaches", "()V", (void*)CanvasJNI::freeCaches}, + {"nFreeTextLayoutCaches", "()V", (void*)CanvasJNI::freeTextLayoutCaches}, + {"nSetCompatibilityVersion", "(I)V", (void*)CanvasJNI::setCompatibilityVersion}, + + // ------------ @FastNative ---------------- + {"nInitRaster", "(J)J", (void*)CanvasJNI::initRaster}, + {"nSetBitmap", "(JJ)V", (void*)CanvasJNI::setBitmap}, + {"nGetClipBounds", "(JLandroid/graphics/Rect;)Z", (void*)CanvasJNI::getClipBounds}, + + // ------------ @CriticalNative ---------------- + {"nIsOpaque", "(J)Z", (void*)CanvasJNI::isOpaque}, + {"nGetWidth", "(J)I", (void*)CanvasJNI::getWidth}, + {"nGetHeight", "(J)I", (void*)CanvasJNI::getHeight}, + {"nSave", "(JI)I", (void*)CanvasJNI::save}, + {"nSaveLayer", "(JFFFFJ)I", (void*)CanvasJNI::saveLayer}, + {"nSaveLayerAlpha", "(JFFFFI)I", (void*)CanvasJNI::saveLayerAlpha}, + {"nSaveUnclippedLayer", "(JIIII)I", (void*)CanvasJNI::saveUnclippedLayer}, + {"nRestoreUnclippedLayer", "(JIJ)V", (void*)CanvasJNI::restoreUnclippedLayer}, + {"nGetSaveCount", "(J)I", (void*)CanvasJNI::getSaveCount}, + {"nRestore", "(J)Z", (void*)CanvasJNI::restore}, + {"nRestoreToCount", "(JI)V", (void*)CanvasJNI::restoreToCount}, + {"nGetMatrix", "(JJ)V", (void*)CanvasJNI::getMatrix}, + {"nSetMatrix", "(JJ)V", (void*)CanvasJNI::setMatrix}, + {"nConcat", "(JJ)V", (void*)CanvasJNI::concat}, + {"nConcat", "(J[F)V", (void*)CanvasJNI::concat44}, + {"nRotate", "(JF)V", (void*)CanvasJNI::rotate}, + {"nScale", "(JFF)V", (void*)CanvasJNI::scale}, + {"nSkew", "(JFF)V", (void*)CanvasJNI::skew}, + {"nTranslate", "(JFF)V", (void*)CanvasJNI::translate}, + {"nQuickReject", "(JJ)Z", (void*)CanvasJNI::quickRejectPath}, + {"nQuickReject", "(JFFFF)Z", (void*)CanvasJNI::quickRejectRect}, + {"nClipRect", "(JFFFFI)Z", (void*)CanvasJNI::clipRect}, + {"nClipPath", "(JJI)Z", (void*)CanvasJNI::clipPath}, + {"nSetDrawFilter", "(JJ)V", (void*)CanvasJNI::setPaintFilter}, }; // If called from Canvas these are regular JNI diff --git a/libs/hwui/libhwui.map.txt b/libs/hwui/libhwui.map.txt index fdb237387098..d03ceb471d6c 100644 --- a/libs/hwui/libhwui.map.txt +++ b/libs/hwui/libhwui.map.txt @@ -32,6 +32,7 @@ LIBHWUI { # platform-only /* HWUI isn't current a module, so all of these are st APaint_createPaint; APaint_destroyPaint; APaint_setBlendMode; + APaint_setImageFilter; ARegionIterator_acquireIterator; ARegionIterator_releaseIterator; ARegionIterator_isComplex; diff --git a/libs/hwui/pipeline/skia/ATraceMemoryDump.cpp b/libs/hwui/pipeline/skia/ATraceMemoryDump.cpp index 234f42d79cb7..756b937f7de3 100644 --- a/libs/hwui/pipeline/skia/ATraceMemoryDump.cpp +++ b/libs/hwui/pipeline/skia/ATraceMemoryDump.cpp @@ -20,6 +20,8 @@ #include <cstring> +#include "GrDirectContext.h" + namespace android { namespace uirenderer { namespace skiapipeline { @@ -114,8 +116,16 @@ void ATraceMemoryDump::startFrame() { /** * logTraces reads from mCurrentValues and logs the counters with ATRACE. + * + * gpuMemoryIsAlreadyInDump must be true if GrDirectContext::dumpMemoryStatistics(...) was called + * with this tracer, false otherwise. Leaving this false allows this function to quickly query total + * and purgable GPU memory without the caller having to spend time in + * GrDirectContext::dumpMemoryStatistics(...) first, which iterates over every resource in the GPU + * cache. This can save significant time, but buckets all GPU memory into a single "misc" track, + * which may be a loss of granularity depending on the GPU backend and the categories defined in + * sResourceMap. */ -void ATraceMemoryDump::logTraces() { +void ATraceMemoryDump::logTraces(bool gpuMemoryIsAlreadyInDump, GrDirectContext* grContext) { // Accumulate data from last dumpName recordAndResetCountersIfNeeded(""); uint64_t hwui_all_frame_memory = 0; @@ -126,6 +136,20 @@ void ATraceMemoryDump::logTraces() { ATRACE_INT64((std::string("Purgeable ") + it.first).c_str(), it.second.purgeableMemory); } } + + if (!gpuMemoryIsAlreadyInDump && grContext) { + // Total GPU memory + int gpuResourceCount; + size_t gpuResourceBytes; + grContext->getResourceCacheUsage(&gpuResourceCount, &gpuResourceBytes); + hwui_all_frame_memory += (uint64_t)gpuResourceBytes; + ATRACE_INT64("HWUI Misc Memory", gpuResourceBytes); + + // Purgable subset of GPU memory + size_t purgeableGpuResourceBytes = grContext->getResourceCachePurgeableBytes(); + ATRACE_INT64("Purgeable HWUI Misc Memory", purgeableGpuResourceBytes); + } + ATRACE_INT64("HWUI All Memory", hwui_all_frame_memory); } diff --git a/libs/hwui/pipeline/skia/ATraceMemoryDump.h b/libs/hwui/pipeline/skia/ATraceMemoryDump.h index 4592711dd5b5..777d1a2ddb5b 100644 --- a/libs/hwui/pipeline/skia/ATraceMemoryDump.h +++ b/libs/hwui/pipeline/skia/ATraceMemoryDump.h @@ -16,6 +16,7 @@ #pragma once +#include <GrDirectContext.h> #include <SkString.h> #include <SkTraceMemoryDump.h> @@ -50,7 +51,7 @@ public: void startFrame(); - void logTraces(); + void logTraces(bool gpuMemoryIsAlreadyInDump, GrDirectContext* grContext); private: std::string mLastDumpName; diff --git a/libs/hwui/pipeline/skia/DumpOpsCanvas.h b/libs/hwui/pipeline/skia/DumpOpsCanvas.h index 6a052dbb7cea..260547cda1c2 100644 --- a/libs/hwui/pipeline/skia/DumpOpsCanvas.h +++ b/libs/hwui/pipeline/skia/DumpOpsCanvas.h @@ -90,11 +90,6 @@ protected: mOutput << mIdent << "drawTextBlob" << std::endl; } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { - mOutput << mIdent << "drawImage" << std::endl; - } - void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SrcRectConstraint) override { mOutput << mIdent << "drawImageRect" << std::endl; diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index e0f1f6ef44be..326b6ed77fe0 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -650,9 +650,14 @@ void SkiaPipeline::setSurfaceColorProperties(ColorMode colorMode) { mSurfaceColorSpace = DeviceInfo::get()->getWideColorSpace(); break; case ColorMode::Hdr: - mSurfaceColorType = SkColorType::kN32_SkColorType; - mSurfaceColorSpace = SkColorSpace::MakeRGB( - GetExtendedTransferFunction(mTargetSdrHdrRatio), SkNamedGamut::kDisplayP3); + if (DeviceInfo::get()->isSupportFp16ForHdr()) { + mSurfaceColorType = SkColorType::kRGBA_F16_SkColorType; + mSurfaceColorSpace = SkColorSpace::MakeSRGB(); + } else { + mSurfaceColorType = SkColorType::kN32_SkColorType; + mSurfaceColorSpace = SkColorSpace::MakeRGB( + GetExtendedTransferFunction(mTargetSdrHdrRatio), SkNamedGamut::kDisplayP3); + } break; case ColorMode::Hdr10: mSurfaceColorType = SkColorType::kRGBA_1010102_SkColorType; @@ -669,8 +674,13 @@ void SkiaPipeline::setSurfaceColorProperties(ColorMode colorMode) { void SkiaPipeline::setTargetSdrHdrRatio(float ratio) { if (mColorMode == ColorMode::Hdr || mColorMode == ColorMode::Hdr10) { mTargetSdrHdrRatio = ratio; - mSurfaceColorSpace = SkColorSpace::MakeRGB(GetExtendedTransferFunction(mTargetSdrHdrRatio), - SkNamedGamut::kDisplayP3); + + if (mColorMode == ColorMode::Hdr && DeviceInfo::get()->isSupportFp16ForHdr()) { + mSurfaceColorSpace = SkColorSpace::MakeSRGB(); + } else { + mSurfaceColorSpace = SkColorSpace::MakeRGB( + GetExtendedTransferFunction(mTargetSdrHdrRatio), SkNamedGamut::kDisplayP3); + } } else { mTargetSdrHdrRatio = 1.f; } diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp index 30d461271c89..ac2a9366a1f6 100644 --- a/libs/hwui/renderthread/CacheManager.cpp +++ b/libs/hwui/renderthread/CacheManager.cpp @@ -124,24 +124,19 @@ void CacheManager::trimMemory(TrimLevel mode) { // flush and submit all work to the gpu and wait for it to finish mGrContext->flushAndSubmit(GrSyncCpu::kYes); - switch (mode) { - case TrimLevel::BACKGROUND: - mGrContext->freeGpuResources(); - SkGraphics::PurgeAllCaches(); - mRenderThread.destroyRenderingContext(); - break; - case TrimLevel::UI_HIDDEN: - // Here we purge all the unlocked scratch resources and then toggle the resources cache - // limits between the background and max amounts. This causes the unlocked resources - // that have persistent data to be purged in LRU order. - mGrContext->setResourceCacheLimit(mBackgroundResourceBytes); - SkGraphics::SetFontCacheLimit(mBackgroundCpuFontCacheBytes); - mGrContext->purgeUnlockedResources(toSkiaEnum(mMemoryPolicy.purgeScratchOnly)); - mGrContext->setResourceCacheLimit(mMaxResourceBytes); - SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes); - break; - default: - break; + if (mode >= TrimLevel::BACKGROUND) { + mGrContext->freeGpuResources(); + SkGraphics::PurgeAllCaches(); + mRenderThread.destroyRenderingContext(); + } else if (mode == TrimLevel::UI_HIDDEN) { + // Here we purge all the unlocked scratch resources and then toggle the resources cache + // limits between the background and max amounts. This causes the unlocked resources + // that have persistent data to be purged in LRU order. + mGrContext->setResourceCacheLimit(mBackgroundResourceBytes); + SkGraphics::SetFontCacheLimit(mBackgroundCpuFontCacheBytes); + mGrContext->purgeUnlockedResources(toSkiaEnum(mMemoryPolicy.purgeScratchOnly)); + mGrContext->setResourceCacheLimit(mMaxResourceBytes); + SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes); } } @@ -269,13 +264,14 @@ void CacheManager::onFrameCompleted() { cancelDestroyContext(); mFrameCompletions.next() = systemTime(CLOCK_MONOTONIC); if (ATRACE_ENABLED()) { + ATRACE_NAME("dumpingMemoryStatistics"); static skiapipeline::ATraceMemoryDump tracer; tracer.startFrame(); SkGraphics::DumpMemoryStatistics(&tracer); - if (mGrContext) { + if (mGrContext && Properties::debugTraceGpuResourceCategories) { mGrContext->dumpMemoryStatistics(&tracer); } - tracer.logTraces(); + tracer.logTraces(Properties::debugTraceGpuResourceCategories, mGrContext.get()); } } diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 94f35fd9eaf2..2904dfe76f40 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -37,6 +37,9 @@ // Android-specific addition that is used to show when frames began in systrace EGLAPI void EGLAPIENTRY eglBeginFrame(EGLDisplay dpy, EGLSurface surface); +static constexpr auto P3_XRB = static_cast<android_dataspace>( + ADATASPACE_STANDARD_DCI_P3 | ADATASPACE_TRANSFER_SRGB | ADATASPACE_RANGE_EXTENDED); + namespace android { namespace uirenderer { namespace renderthread { @@ -438,22 +441,32 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, colorMode = ColorMode::Default; } - if (DeviceInfo::get()->getWideColorType() == kRGBA_F16_SkColorType) { + // TODO: maybe we want to get rid of the WCG check if overlay properties just works? + const bool canUseFp16 = DeviceInfo::get()->isSupportFp16ForHdr() || + DeviceInfo::get()->getWideColorType() == kRGBA_F16_SkColorType; + + if (canUseFp16) { if (mEglConfigF16 == EGL_NO_CONFIG_KHR) { colorMode = ColorMode::Default; } else { config = mEglConfigF16; } } + if (EglExtensions.glColorSpace) { attribs[0] = EGL_GL_COLORSPACE_KHR; switch (colorMode) { case ColorMode::Default: attribs[1] = EGL_GL_COLORSPACE_LINEAR_KHR; break; + case ColorMode::Hdr: + if (canUseFp16) { + attribs[1] = EGL_GL_COLORSPACE_SCRGB_EXT; + break; + // No fp16 support so fallthrough to HDR10 + } // We don't have an EGL colorspace for extended range P3 that's used for HDR // So override it after configuring the EGL context - case ColorMode::Hdr: case ColorMode::Hdr10: overrideWindowDataSpaceForHdr = true; attribs[1] = EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT; @@ -497,9 +510,7 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, // This relies on knowing that EGL will not re-set the dataspace after the call to // eglCreateWindowSurface. Since the handling of the colorspace extension is largely // implemented in libEGL in the platform, we can safely assume this is the case - int32_t err = ANativeWindow_setBuffersDataSpace( - window, - static_cast<android_dataspace>(STANDARD_DCI_P3 | TRANSFER_SRGB | RANGE_EXTENDED)); + int32_t err = ANativeWindow_setBuffersDataSpace(window, P3_XRB); LOG_ALWAYS_FATAL_IF(err, "Failed to ANativeWindow_setBuffersDataSpace %d", err); } diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index d55d28d469d0..b5f7caaf1b5b 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -31,6 +31,8 @@ #include <vk/GrVkExtensions.h> #include <vk/GrVkTypes.h> +#include <sstream> + #include "Properties.h" #include "RenderThread.h" #include "pipeline/skia/ShaderCache.h" @@ -40,7 +42,8 @@ namespace android { namespace uirenderer { namespace renderthread { -static std::array<std::string_view, 20> sEnableExtensions{ +// Not all of these are strictly required, but are all enabled if present. +static std::array<std::string_view, 21> sEnableExtensions{ VK_KHR_BIND_MEMORY_2_EXTENSION_NAME, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, @@ -61,6 +64,7 @@ static std::array<std::string_view, 20> sEnableExtensions{ VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME, + VK_EXT_DEVICE_FAULT_EXTENSION_NAME, }; static bool shouldEnableExtension(const std::string_view& extension) { @@ -303,6 +307,15 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe *tailPNext = ycbcrFeature; tailPNext = &ycbcrFeature->pNext; + if (grExtensions.hasExtension(VK_EXT_DEVICE_FAULT_EXTENSION_NAME, 1)) { + VkPhysicalDeviceFaultFeaturesEXT* deviceFaultFeatures = + new VkPhysicalDeviceFaultFeaturesEXT; + deviceFaultFeatures->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_EXT; + deviceFaultFeatures->pNext = nullptr; + *tailPNext = deviceFaultFeatures; + tailPNext = &deviceFaultFeatures->pNext; + } + // query to get the physical device features mGetPhysicalDeviceFeatures2(mPhysicalDevice, &features); // this looks like it would slow things down, @@ -405,6 +418,79 @@ void VulkanManager::initialize() { }); } +namespace { +void onVkDeviceFault(const std::string& contextLabel, const std::string& description, + const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos, + const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos, + const std::vector<std::byte>& vendorBinaryData) { + // The final crash string should contain as much differentiating info as possible, up to 1024 + // bytes. As this final message is constructed, the same information is also dumped to the logs + // but in a more verbose format. Building the crash string is unsightly, so the clearer logging + // statement is always placed first to give context. + ALOGE("VK_ERROR_DEVICE_LOST (%s context): %s", contextLabel.c_str(), description.c_str()); + std::stringstream crashMsg; + crashMsg << "VK_ERROR_DEVICE_LOST (" << contextLabel; + + if (!addressInfos.empty()) { + ALOGE("%zu VkDeviceFaultAddressInfoEXT:", addressInfos.size()); + crashMsg << ", " << addressInfos.size() << " address info ("; + for (VkDeviceFaultAddressInfoEXT addressInfo : addressInfos) { + ALOGE(" addressType: %d", (int)addressInfo.addressType); + ALOGE(" reportedAddress: %" PRIu64, addressInfo.reportedAddress); + ALOGE(" addressPrecision: %" PRIu64, addressInfo.addressPrecision); + crashMsg << addressInfo.addressType << ":" + << addressInfo.reportedAddress << ":" + << addressInfo.addressPrecision << ", "; + } + crashMsg.seekp(-2, crashMsg.cur); // Move back to overwrite trailing ", " + crashMsg << ")"; + } + + if (!vendorInfos.empty()) { + ALOGE("%zu VkDeviceFaultVendorInfoEXT:", vendorInfos.size()); + crashMsg << ", " << vendorInfos.size() << " vendor info ("; + for (VkDeviceFaultVendorInfoEXT vendorInfo : vendorInfos) { + ALOGE(" description: %s", vendorInfo.description); + ALOGE(" vendorFaultCode: %" PRIu64, vendorInfo.vendorFaultCode); + ALOGE(" vendorFaultData: %" PRIu64, vendorInfo.vendorFaultData); + // Omit descriptions for individual vendor info structs in the crash string, as the + // fault code and fault data fields should be enough for clustering, and the verbosity + // isn't worth it. Additionally, vendors may just set the general description field of + // the overall fault to the description of the first element in this list, and that + // overall description will be placed at the end of the crash string. + crashMsg << vendorInfo.vendorFaultCode << ":" + << vendorInfo.vendorFaultData << ", "; + } + crashMsg.seekp(-2, crashMsg.cur); // Move back to overwrite trailing ", " + crashMsg << ")"; + } + + if (!vendorBinaryData.empty()) { + // TODO: b/322830575 - Log in base64, or dump directly to a file that gets put in bugreports + ALOGE("%zu bytes of vendor-specific binary data (please notify Android's Core Graphics" + " Stack team if you observe this message).", + vendorBinaryData.size()); + crashMsg << ", " << vendorBinaryData.size() << " bytes binary"; + } + + crashMsg << "): " << description; + LOG_ALWAYS_FATAL("%s", crashMsg.str().c_str()); +} + +void deviceLostProcRenderThread(void* callbackContext, const std::string& description, + const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos, + const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos, + const std::vector<std::byte>& vendorBinaryData) { + onVkDeviceFault("RenderThread", description, addressInfos, vendorInfos, vendorBinaryData); +} +void deviceLostProcUploadThread(void* callbackContext, const std::string& description, + const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos, + const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos, + const std::vector<std::byte>& vendorBinaryData) { + onVkDeviceFault("UploadThread", description, addressInfos, vendorInfos, vendorBinaryData); +} +} // anonymous namespace + static void onGrContextReleased(void* context) { VulkanManager* manager = (VulkanManager*)context; manager->decStrong((void*)onGrContextReleased); @@ -430,6 +516,10 @@ sk_sp<GrDirectContext> VulkanManager::createContext(GrContextOptions& options, backendContext.fVkExtensions = &mExtensions; backendContext.fDeviceFeatures2 = &mPhysicalDeviceFeatures2; backendContext.fGetProc = std::move(getProc); + backendContext.fDeviceLostContext = nullptr; + backendContext.fDeviceLostProc = (contextType == ContextType::kRenderThread) + ? deviceLostProcRenderThread + : deviceLostProcUploadThread; LOG_ALWAYS_FATAL_IF(options.fContextDeleteProc != nullptr, "Conflicting fContextDeleteProcs!"); this->incStrong((void*)onGrContextReleased); diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index 20b743bab2c2..a8e85475aff0 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -29,6 +29,9 @@ namespace android { namespace uirenderer { namespace renderthread { +static constexpr auto P3_XRB = static_cast<android_dataspace>( + ADATASPACE_STANDARD_DCI_P3 | ADATASPACE_TRANSFER_SRGB | ADATASPACE_RANGE_EXTENDED); + static int InvertTransform(int transform) { switch (transform) { case ANATIVEWINDOW_TRANSFORM_ROTATE_90: @@ -214,8 +217,7 @@ bool VulkanSurface::InitializeWindowInfoStruct(ANativeWindow* window, ColorMode outWindowInfo->colorMode = colorMode; if (colorMode == ColorMode::Hdr || colorMode == ColorMode::Hdr10) { - outWindowInfo->dataspace = - static_cast<android_dataspace>(STANDARD_DCI_P3 | TRANSFER_SRGB | RANGE_EXTENDED); + outWindowInfo->dataspace = P3_XRB; } else { outWindowInfo->dataspace = ColorSpaceToADataSpace(colorSpace.get(), colorType); } @@ -541,8 +543,7 @@ void VulkanSurface::setColorSpace(sk_sp<SkColorSpace> colorSpace) { } if (mWindowInfo.colorMode == ColorMode::Hdr || mWindowInfo.colorMode == ColorMode::Hdr10) { - mWindowInfo.dataspace = - static_cast<android_dataspace>(STANDARD_DCI_P3 | TRANSFER_SRGB | RANGE_EXTENDED); + mWindowInfo.dataspace = P3_XRB; } else { mWindowInfo.dataspace = ColorSpaceToADataSpace( mWindowInfo.colorspace.get(), BufferFormatToColorType(mWindowInfo.bufferFormat)); diff --git a/libs/hwui/tests/common/CallCountingCanvas.h b/libs/hwui/tests/common/CallCountingCanvas.h index dc36a2e01815..df5f04f9904e 100644 --- a/libs/hwui/tests/common/CallCountingCanvas.h +++ b/libs/hwui/tests/common/CallCountingCanvas.h @@ -109,12 +109,6 @@ public: drawPoints++; } - int drawImageCount = 0; - void onDrawImage2(const SkImage* image, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint* paint) override { - drawImageCount++; - } - int drawImageRectCount = 0; void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SkCanvas::SrcRectConstraint) override { diff --git a/libs/hwui/tests/unit/CanvasOpTests.cpp b/libs/hwui/tests/unit/CanvasOpTests.cpp index 18c50472a7df..4ae76e2f1fd2 100644 --- a/libs/hwui/tests/unit/CanvasOpTests.cpp +++ b/libs/hwui/tests/unit/CanvasOpTests.cpp @@ -492,7 +492,7 @@ TEST(CanvasOp, simpleDrawImage) { CallCountingCanvas canvas; EXPECT_EQ(0, canvas.sumTotalDrawCalls()); rasterizeCanvasBuffer(buffer, &canvas); - EXPECT_EQ(1, canvas.drawImageCount); + EXPECT_EQ(1, canvas.drawImageRectCount); EXPECT_EQ(1, canvas.sumTotalDrawCalls()); } diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h index 96a0c6114682..8b95e0cd267d 100644 --- a/libs/hwui/tests/unit/FatalTestCanvas.h +++ b/libs/hwui/tests/unit/FatalTestCanvas.h @@ -69,10 +69,6 @@ public: void onDrawPath(const SkPath&, const SkPaint&) { ADD_FAILURE() << "onDrawPath not expected in this test"; } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) { - ADD_FAILURE() << "onDrawImage not expected in this test"; - } void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&, const SkPaint*, SrcRectConstraint) { ADD_FAILURE() << "onDrawImageRect not expected in this test"; diff --git a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp index 073a8357e574..ca540874833c 100644 --- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp +++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp @@ -941,8 +941,9 @@ RENDERTHREAD_TEST(RenderNodeDrawable, simple) { void onDrawRect(const SkRect& rect, const SkPaint& paint) override { EXPECT_EQ(0, mDrawCounter++); } - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(1, mDrawCounter++); } }; diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp index 3ded540c3152..785e2869d15e 100644 --- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp +++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp @@ -303,8 +303,9 @@ RENDERTHREAD_TEST(SkiaPipeline, clipped) { class ClippedTestCanvas : public SkCanvas { public: ClippedTestCanvas() : SkCanvas(CANVAS_WIDTH, CANVAS_HEIGHT) {} - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(0, mDrawCounter++); EXPECT_EQ(SkRect::MakeLTRB(10, 20, 30, 40), TestUtils::getClipBounds(this)); EXPECT_TRUE(getTotalMatrix().isIdentity()); @@ -338,8 +339,9 @@ RENDERTHREAD_TEST(SkiaPipeline, clipped_rotated) { class ClippedTestCanvas : public SkCanvas { public: ClippedTestCanvas() : SkCanvas(CANVAS_WIDTH, CANVAS_HEIGHT) {} - void onDrawImage2(const SkImage*, SkScalar dx, SkScalar dy, const SkSamplingOptions&, - const SkPaint*) override { + void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, + const SkSamplingOptions&, const SkPaint*, + SrcRectConstraint) override { EXPECT_EQ(0, mDrawCounter++); // Expect clip to be rotated. EXPECT_EQ(SkRect::MakeLTRB(CANVAS_HEIGHT - dirty.fTop - dirty.height(), dirty.fLeft, diff --git a/libs/hwui/tests/unit/UnderlineTest.cpp b/libs/hwui/tests/unit/UnderlineTest.cpp index c70a30477ecf..9911bfa70443 100644 --- a/libs/hwui/tests/unit/UnderlineTest.cpp +++ b/libs/hwui/tests/unit/UnderlineTest.cpp @@ -103,8 +103,9 @@ DrawTextFunctor processFunctor(const std::vector<uint16_t>& text, Paint* paint) // Create minikin::Layout std::unique_ptr<Typeface> typeface(makeTypeface()); minikin::Layout layout = doLayout(text, *paint, typeface.get()); + minikin::MinikinRect bounds; - DrawTextFunctor f(layout, &canvas, *paint, 0, 0, layout.getAdvance()); + DrawTextFunctor f(layout, &canvas, *paint, 0, 0, layout.getAdvance(), bounds); MinikinUtils::forFontRun(layout, paint, f); return f; } diff --git a/libs/hwui/utils/ForceDark.h b/libs/hwui/utils/ForceDark.h index 28538c4b7a7b..ecfe41f39ecb 100644 --- a/libs/hwui/utils/ForceDark.h +++ b/libs/hwui/utils/ForceDark.h @@ -17,6 +17,8 @@ #ifndef FORCEDARKUTILS_H #define FORCEDARKUTILS_H +#include <stdint.h> + namespace android { namespace uirenderer { @@ -26,9 +28,9 @@ namespace uirenderer { * This should stay in sync with the java @IntDef in * frameworks/base/graphics/java/android/graphics/ForceDarkType.java */ -enum class ForceDarkType : __uint8_t { NONE = 0, FORCE_DARK = 1, FORCE_INVERT_COLOR_DARK = 2 }; +enum class ForceDarkType : uint8_t { NONE = 0, FORCE_DARK = 1, FORCE_INVERT_COLOR_DARK = 2 }; } /* namespace uirenderer */ } /* namespace android */ -#endif // FORCEDARKUTILS_H
\ No newline at end of file +#endif // FORCEDARKUTILS_H diff --git a/libs/hwui/utils/HostColorSpace.cpp b/libs/hwui/utils/HostColorSpace.cpp deleted file mode 100644 index 77a6820c6999..000000000000 --- a/libs/hwui/utils/HostColorSpace.cpp +++ /dev/null @@ -1,417 +0,0 @@ -/* - * Copyright (C) 2019 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. - */ -// This is copied from framework/native/libs/ui in order not to include libui in host build - -#include <ui/ColorSpace.h> - -using namespace std::placeholders; - -namespace android { - -static constexpr float linearResponse(float v) { - return v; -} - -static constexpr float rcpResponse(float x, const ColorSpace::TransferParameters& p) { - return x >= p.d * p.c ? (std::pow(x, 1.0f / p.g) - p.b) / p.a : x / p.c; -} - -static constexpr float response(float x, const ColorSpace::TransferParameters& p) { - return x >= p.d ? std::pow(p.a * x + p.b, p.g) : p.c * x; -} - -static constexpr float rcpFullResponse(float x, const ColorSpace::TransferParameters& p) { - return x >= p.d * p.c ? (std::pow(x - p.e, 1.0f / p.g) - p.b) / p.a : (x - p.f) / p.c; -} - -static constexpr float fullResponse(float x, const ColorSpace::TransferParameters& p) { - return x >= p.d ? std::pow(p.a * x + p.b, p.g) + p.e : p.c * x + p.f; -} - -static float absRcpResponse(float x, float g,float a, float b, float c, float d) { - float xx = std::abs(x); - return std::copysign(xx >= d * c ? (std::pow(xx, 1.0f / g) - b) / a : xx / c, x); -} - -static float absResponse(float x, float g, float a, float b, float c, float d) { - float xx = std::abs(x); - return std::copysign(xx >= d ? std::pow(a * xx + b, g) : c * xx, x); -} - -static float safePow(float x, float e) { - return powf(x < 0.0f ? 0.0f : x, e); -} - -static ColorSpace::transfer_function toOETF(const ColorSpace::TransferParameters& parameters) { - if (parameters.e == 0.0f && parameters.f == 0.0f) { - return std::bind(rcpResponse, _1, parameters); - } - return std::bind(rcpFullResponse, _1, parameters); -} - -static ColorSpace::transfer_function toEOTF( const ColorSpace::TransferParameters& parameters) { - if (parameters.e == 0.0f && parameters.f == 0.0f) { - return std::bind(response, _1, parameters); - } - return std::bind(fullResponse, _1, parameters); -} - -static ColorSpace::transfer_function toOETF(float gamma) { - if (gamma == 1.0f) { - return linearResponse; - } - return std::bind(safePow, _1, 1.0f / gamma); -} - -static ColorSpace::transfer_function toEOTF(float gamma) { - if (gamma == 1.0f) { - return linearResponse; - } - return std::bind(safePow, _1, gamma); -} - -static constexpr std::array<float2, 3> computePrimaries(const mat3& rgbToXYZ) { - float3 r(rgbToXYZ * float3{1, 0, 0}); - float3 g(rgbToXYZ * float3{0, 1, 0}); - float3 b(rgbToXYZ * float3{0, 0, 1}); - - return {{r.xy / dot(r, float3{1}), - g.xy / dot(g, float3{1}), - b.xy / dot(b, float3{1})}}; -} - -static constexpr float2 computeWhitePoint(const mat3& rgbToXYZ) { - float3 w(rgbToXYZ * float3{1}); - return w.xy / dot(w, float3{1}); -} - -ColorSpace::ColorSpace( - const std::string& name, - const mat3& rgbToXYZ, - transfer_function OETF, - transfer_function EOTF, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(rgbToXYZ) - , mXYZtoRGB(inverse(rgbToXYZ)) - , mOETF(std::move(OETF)) - , mEOTF(std::move(EOTF)) - , mClamper(std::move(clamper)) - , mPrimaries(computePrimaries(rgbToXYZ)) - , mWhitePoint(computeWhitePoint(rgbToXYZ)) { -} - -ColorSpace::ColorSpace( - const std::string& name, - const mat3& rgbToXYZ, - const TransferParameters parameters, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(rgbToXYZ) - , mXYZtoRGB(inverse(rgbToXYZ)) - , mParameters(parameters) - , mOETF(toOETF(mParameters)) - , mEOTF(toEOTF(mParameters)) - , mClamper(std::move(clamper)) - , mPrimaries(computePrimaries(rgbToXYZ)) - , mWhitePoint(computeWhitePoint(rgbToXYZ)) { -} - -ColorSpace::ColorSpace( - const std::string& name, - const mat3& rgbToXYZ, - float gamma, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(rgbToXYZ) - , mXYZtoRGB(inverse(rgbToXYZ)) - , mParameters({gamma, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}) - , mOETF(toOETF(gamma)) - , mEOTF(toEOTF(gamma)) - , mClamper(std::move(clamper)) - , mPrimaries(computePrimaries(rgbToXYZ)) - , mWhitePoint(computeWhitePoint(rgbToXYZ)) { -} - -ColorSpace::ColorSpace( - const std::string& name, - const std::array<float2, 3>& primaries, - const float2& whitePoint, - transfer_function OETF, - transfer_function EOTF, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(computeXYZMatrix(primaries, whitePoint)) - , mXYZtoRGB(inverse(mRGBtoXYZ)) - , mOETF(std::move(OETF)) - , mEOTF(std::move(EOTF)) - , mClamper(std::move(clamper)) - , mPrimaries(primaries) - , mWhitePoint(whitePoint) { -} - -ColorSpace::ColorSpace( - const std::string& name, - const std::array<float2, 3>& primaries, - const float2& whitePoint, - const TransferParameters parameters, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(computeXYZMatrix(primaries, whitePoint)) - , mXYZtoRGB(inverse(mRGBtoXYZ)) - , mParameters(parameters) - , mOETF(toOETF(mParameters)) - , mEOTF(toEOTF(mParameters)) - , mClamper(std::move(clamper)) - , mPrimaries(primaries) - , mWhitePoint(whitePoint) { -} - -ColorSpace::ColorSpace( - const std::string& name, - const std::array<float2, 3>& primaries, - const float2& whitePoint, - float gamma, - clamping_function clamper) noexcept - : mName(name) - , mRGBtoXYZ(computeXYZMatrix(primaries, whitePoint)) - , mXYZtoRGB(inverse(mRGBtoXYZ)) - , mParameters({gamma, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}) - , mOETF(toOETF(gamma)) - , mEOTF(toEOTF(gamma)) - , mClamper(std::move(clamper)) - , mPrimaries(primaries) - , mWhitePoint(whitePoint) { -} - -constexpr mat3 ColorSpace::computeXYZMatrix( - const std::array<float2, 3>& primaries, const float2& whitePoint) { - const float2& R = primaries[0]; - const float2& G = primaries[1]; - const float2& B = primaries[2]; - const float2& W = whitePoint; - - float oneRxRy = (1 - R.x) / R.y; - float oneGxGy = (1 - G.x) / G.y; - float oneBxBy = (1 - B.x) / B.y; - float oneWxWy = (1 - W.x) / W.y; - - float RxRy = R.x / R.y; - float GxGy = G.x / G.y; - float BxBy = B.x / B.y; - float WxWy = W.x / W.y; - - float BY = - ((oneWxWy - oneRxRy) * (GxGy - RxRy) - (WxWy - RxRy) * (oneGxGy - oneRxRy)) / - ((oneBxBy - oneRxRy) * (GxGy - RxRy) - (BxBy - RxRy) * (oneGxGy - oneRxRy)); - float GY = (WxWy - RxRy - BY * (BxBy - RxRy)) / (GxGy - RxRy); - float RY = 1 - GY - BY; - - float RYRy = RY / R.y; - float GYGy = GY / G.y; - float BYBy = BY / B.y; - - return { - float3{RYRy * R.x, RY, RYRy * (1 - R.x - R.y)}, - float3{GYGy * G.x, GY, GYGy * (1 - G.x - G.y)}, - float3{BYBy * B.x, BY, BYBy * (1 - B.x - B.y)} - }; -} - -const ColorSpace ColorSpace::sRGB() { - return { - "sRGB IEC61966-2.1", - {{float2{0.640f, 0.330f}, {0.300f, 0.600f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f}, - {2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.04045f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::linearSRGB() { - return { - "sRGB IEC61966-2.1 (Linear)", - {{float2{0.640f, 0.330f}, {0.300f, 0.600f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f} - }; -} - -const ColorSpace ColorSpace::extendedSRGB() { - return { - "scRGB-nl IEC 61966-2-2:2003", - {{float2{0.640f, 0.330f}, {0.300f, 0.600f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f}, - std::bind(absRcpResponse, _1, 2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.04045f), - std::bind(absResponse, _1, 2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.04045f), - std::bind(clamp<float>, _1, -0.799f, 2.399f) - }; -} - -const ColorSpace ColorSpace::linearExtendedSRGB() { - return { - "scRGB IEC 61966-2-2:2003", - {{float2{0.640f, 0.330f}, {0.300f, 0.600f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f}, - 1.0f, - std::bind(clamp<float>, _1, -0.5f, 7.499f) - }; -} - -const ColorSpace ColorSpace::NTSC() { - return { - "NTSC (1953)", - {{float2{0.67f, 0.33f}, {0.21f, 0.71f}, {0.14f, 0.08f}}}, - {0.310f, 0.316f}, - {1 / 0.45f, 1 / 1.099f, 0.099f / 1.099f, 1 / 4.5f, 0.081f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::BT709() { - return { - "Rec. ITU-R BT.709-5", - {{float2{0.640f, 0.330f}, {0.300f, 0.600f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f}, - {1 / 0.45f, 1 / 1.099f, 0.099f / 1.099f, 1 / 4.5f, 0.081f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::BT2020() { - return { - "Rec. ITU-R BT.2020-1", - {{float2{0.708f, 0.292f}, {0.170f, 0.797f}, {0.131f, 0.046f}}}, - {0.3127f, 0.3290f}, - {1 / 0.45f, 1 / 1.099f, 0.099f / 1.099f, 1 / 4.5f, 0.081f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::AdobeRGB() { - return { - "Adobe RGB (1998)", - {{float2{0.64f, 0.33f}, {0.21f, 0.71f}, {0.15f, 0.06f}}}, - {0.3127f, 0.3290f}, - 2.2f - }; -} - -const ColorSpace ColorSpace::ProPhotoRGB() { - return { - "ROMM RGB ISO 22028-2:2013", - {{float2{0.7347f, 0.2653f}, {0.1596f, 0.8404f}, {0.0366f, 0.0001f}}}, - {0.34567f, 0.35850f}, - {1.8f, 1.0f, 0.0f, 1 / 16.0f, 0.031248f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::DisplayP3() { - return { - "Display P3", - {{float2{0.680f, 0.320f}, {0.265f, 0.690f}, {0.150f, 0.060f}}}, - {0.3127f, 0.3290f}, - {2.4f, 1 / 1.055f, 0.055f / 1.055f, 1 / 12.92f, 0.039f, 0.0f, 0.0f} - }; -} - -const ColorSpace ColorSpace::DCIP3() { - return { - "SMPTE RP 431-2-2007 DCI (P3)", - {{float2{0.680f, 0.320f}, {0.265f, 0.690f}, {0.150f, 0.060f}}}, - {0.314f, 0.351f}, - 2.6f - }; -} - -const ColorSpace ColorSpace::ACES() { - return { - "SMPTE ST 2065-1:2012 ACES", - {{float2{0.73470f, 0.26530f}, {0.0f, 1.0f}, {0.00010f, -0.0770f}}}, - {0.32168f, 0.33767f}, - 1.0f, - std::bind(clamp<float>, _1, -65504.0f, 65504.0f) - }; -} - -const ColorSpace ColorSpace::ACEScg() { - return { - "Academy S-2014-004 ACEScg", - {{float2{0.713f, 0.293f}, {0.165f, 0.830f}, {0.128f, 0.044f}}}, - {0.32168f, 0.33767f}, - 1.0f, - std::bind(clamp<float>, _1, -65504.0f, 65504.0f) - }; -} - -std::unique_ptr<float3[]> ColorSpace::createLUT(uint32_t size, const ColorSpace& src, - const ColorSpace& dst) { - size = clamp(size, 2u, 256u); - float m = 1.0f / float(size - 1); - - std::unique_ptr<float3[]> lut(new float3[size * size * size]); - float3* data = lut.get(); - - ColorSpaceConnector connector(src, dst); - - for (uint32_t z = 0; z < size; z++) { - for (int32_t y = int32_t(size - 1); y >= 0; y--) { - for (uint32_t x = 0; x < size; x++) { - *data++ = connector.transform({x * m, y * m, z * m}); - } - } - } - - return lut; -} - -static const float2 ILLUMINANT_D50_XY = {0.34567f, 0.35850f}; -static const float3 ILLUMINANT_D50_XYZ = {0.964212f, 1.0f, 0.825188f}; -static const mat3 BRADFORD = mat3{ - float3{ 0.8951f, -0.7502f, 0.0389f}, - float3{ 0.2664f, 1.7135f, -0.0685f}, - float3{-0.1614f, 0.0367f, 1.0296f} -}; - -static mat3 adaptation(const mat3& matrix, const float3& srcWhitePoint, const float3& dstWhitePoint) { - float3 srcLMS = matrix * srcWhitePoint; - float3 dstLMS = matrix * dstWhitePoint; - return inverse(matrix) * mat3{dstLMS / srcLMS} * matrix; -} - -ColorSpaceConnector::ColorSpaceConnector( - const ColorSpace& src, - const ColorSpace& dst) noexcept - : mSource(src) - , mDestination(dst) { - - if (all(lessThan(abs(src.getWhitePoint() - dst.getWhitePoint()), float2{1e-3f}))) { - mTransform = dst.getXYZtoRGB() * src.getRGBtoXYZ(); - } else { - mat3 rgbToXYZ(src.getRGBtoXYZ()); - mat3 xyzToRGB(dst.getXYZtoRGB()); - - float3 srcXYZ = ColorSpace::XYZ(float3{src.getWhitePoint(), 1}); - float3 dstXYZ = ColorSpace::XYZ(float3{dst.getWhitePoint(), 1}); - - if (any(greaterThan(abs(src.getWhitePoint() - ILLUMINANT_D50_XY), float2{1e-3f}))) { - rgbToXYZ = adaptation(BRADFORD, srcXYZ, ILLUMINANT_D50_XYZ) * src.getRGBtoXYZ(); - } - - if (any(greaterThan(abs(dst.getWhitePoint() - ILLUMINANT_D50_XY), float2{1e-3f}))) { - xyzToRGB = inverse(adaptation(BRADFORD, dstXYZ, ILLUMINANT_D50_XYZ) * dst.getRGBtoXYZ()); - } - - mTransform = xyzToRGB * rgbToXYZ; - } -} - -}; // namespace android diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index bba9c9764eee..f84107e8792c 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -111,7 +111,11 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& : PointerController( policy, looper, spriteController, enabled, [](const sp<android::gui::WindowInfosListener>& listener) { - SurfaceComposerClient::getDefault()->addWindowInfosListener(listener); + auto initialInfo = std::make_pair(std::vector<android::gui::WindowInfo>{}, + std::vector<android::gui::DisplayInfo>{}); + SurfaceComposerClient::getDefault()->addWindowInfosListener(listener, + &initialInfo); + return initialInfo.second; }, [](const sp<android::gui::WindowInfosListener>& listener) { SurfaceComposerClient::getDefault()->removeWindowInfosListener(listener); @@ -119,8 +123,9 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& PointerController::PointerController(const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper, SpriteController& spriteController, - bool enabled, WindowListenerConsumer registerListener, - WindowListenerConsumer unregisterListener) + bool enabled, + const WindowListenerRegisterConsumer& registerListener, + WindowListenerUnregisterConsumer unregisterListener) : mEnabled(enabled), mContext(policy, looper, spriteController, *this), mCursorController(mContext), @@ -128,7 +133,8 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& mUnregisterWindowInfosListener(std::move(unregisterListener)) { std::scoped_lock lock(getLock()); mLocked.presentation = Presentation::SPOT; - registerListener(mDisplayInfoListener); + const auto& initialDisplayInfos = registerListener(mDisplayInfoListener); + onDisplayInfosChangedLocked(initialDisplayInfos); } PointerController::~PointerController() { diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index a8b963367f4c..6ee5707622ca 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -79,14 +79,16 @@ public: std::string dump() override; protected: - using WindowListenerConsumer = + using WindowListenerRegisterConsumer = std::function<std::vector<gui::DisplayInfo>( + const sp<android::gui::WindowInfosListener>&)>; + using WindowListenerUnregisterConsumer = std::function<void(const sp<android::gui::WindowInfosListener>&)>; // Constructor used to test WindowInfosListener registration. PointerController(const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper, SpriteController& spriteController, bool enabled, - WindowListenerConsumer registerListener, - WindowListenerConsumer unregisterListener); + const WindowListenerRegisterConsumer& registerListener, + WindowListenerUnregisterConsumer unregisterListener); PointerController(const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper, SpriteController& spriteController, bool enabled); @@ -129,7 +131,7 @@ private: }; sp<DisplayInfoListener> mDisplayInfoListener; - const WindowListenerConsumer mUnregisterWindowInfosListener; + const WindowListenerUnregisterConsumer mUnregisterWindowInfosListener; const ui::Transform& getTransformForDisplayLocked(int displayId) const REQUIRES(getLock()); diff --git a/libs/input/SpriteIcon.cpp b/libs/input/SpriteIcon.cpp index b7e51e22a214..59e36e4b0d1e 100644 --- a/libs/input/SpriteIcon.cpp +++ b/libs/input/SpriteIcon.cpp @@ -34,6 +34,9 @@ bool SpriteIcon::draw(sp<Surface> surface) const { graphics::Paint paint; paint.setBlendMode(ABLEND_MODE_SRC); + if (drawNativeDropShadow) { + paint.setImageFilter(AIMAGE_FILTER_DROP_SHADOW_FOR_POINTER_ICON); + } graphics::Canvas canvas(outBuffer, (int32_t)surface->getBuffersDataSpace()); canvas.drawBitmap(bitmap, 0, 0, &paint); diff --git a/libs/input/SpriteIcon.h b/libs/input/SpriteIcon.h index 5f085bbd2374..0939af46c258 100644 --- a/libs/input/SpriteIcon.h +++ b/libs/input/SpriteIcon.h @@ -27,26 +27,20 @@ namespace android { * Icon that a sprite displays, including its hotspot. */ struct SpriteIcon { - inline SpriteIcon() : style(PointerIconStyle::TYPE_NULL), hotSpotX(0), hotSpotY(0) {} - inline SpriteIcon(const graphics::Bitmap& bitmap, PointerIconStyle style, float hotSpotX, - float hotSpotY) - : bitmap(bitmap), style(style), hotSpotX(hotSpotX), hotSpotY(hotSpotY) {} - - graphics::Bitmap bitmap; - PointerIconStyle style; - float hotSpotX; - float hotSpotY; - - inline SpriteIcon copy() const { - return SpriteIcon(bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888), style, hotSpotX, hotSpotY); - } - - inline void reset() { - bitmap.reset(); - style = PointerIconStyle::TYPE_NULL; - hotSpotX = 0; - hotSpotY = 0; - } + explicit SpriteIcon() = default; + explicit SpriteIcon(const graphics::Bitmap& bitmap, PointerIconStyle style, float hotSpotX, + float hotSpotY, bool drawNativeDropShadow) + : bitmap(bitmap), + style(style), + hotSpotX(hotSpotX), + hotSpotY(hotSpotY), + drawNativeDropShadow(drawNativeDropShadow) {} + + graphics::Bitmap bitmap{}; + PointerIconStyle style{PointerIconStyle::TYPE_NULL}; + float hotSpotX{}; + float hotSpotY{}; + bool drawNativeDropShadow{false}; inline bool isValid() const { return bitmap.isValid() && !bitmap.isEmpty(); } diff --git a/libs/input/TouchSpotController.cpp b/libs/input/TouchSpotController.cpp index b8de919fbd8c..99952aa14904 100644 --- a/libs/input/TouchSpotController.cpp +++ b/libs/input/TouchSpotController.cpp @@ -93,7 +93,7 @@ void TouchSpotController::setSpots(const PointerCoords* spotCoords, const uint32 const PointerCoords& c = spotCoords[spotIdToIndex[id]]; ALOGD(" spot %d: position=(%0.3f, %0.3f), pressure=%0.3f, displayId=%" PRId32 ".", id, c.getAxisValue(AMOTION_EVENT_AXIS_X), c.getAxisValue(AMOTION_EVENT_AXIS_Y), - c.getAxisValue(AMOTION_EVENT_AXIS_PRESSURE), displayId); + c.getAxisValue(AMOTION_EVENT_AXIS_PRESSURE), mDisplayId); } #endif diff --git a/libs/input/tests/PointerController_test.cpp b/libs/input/tests/PointerController_test.cpp index adfa91e96ebb..a1bb5b3f1cc4 100644 --- a/libs/input/tests/PointerController_test.cpp +++ b/libs/input/tests/PointerController_test.cpp @@ -160,9 +160,11 @@ public: : PointerController( policy, looper, spriteController, /*enabled=*/true, - [®isteredListener](const sp<android::gui::WindowInfosListener>& listener) { + [®isteredListener](const sp<android::gui::WindowInfosListener>& listener) + -> std::vector<gui::DisplayInfo> { // Register listener registeredListener = listener; + return {}; }, [®isteredListener](const sp<android::gui::WindowInfosListener>& listener) { // Unregister listener |