out) {
- if (ShortcutUtil.supportsShortcuts(item) && FeatureFlags.ENABLE_TASKBAR_POPUP_MENU.get()) {
+ if (ShortcutUtil.supportsShortcuts(item)) {
out.add(mActions.get(NotificationListener.getInstanceIfConnected() != null
? SHORTCUTS_AND_NOTIFICATIONS : DEEP_SHORTCUTS));
}
@@ -112,7 +111,8 @@ public class TaskbarShortcutMenuAccessibilityDelegate
item.getIntent().getComponent(),
/* startActivityOptions= */null,
item.user),
- new Intent(), side, null, instanceIds.first);
+ item.user.getIdentifier(), new Intent(), side, null,
+ instanceIds.first);
}
return true;
} else if (action == DEEP_SHORTCUTS || action == SHORTCUTS_AND_NOTIFICATIONS) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarSpringOnStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarSpringOnStashController.java
index d65b5c0f61..f87c21ece0 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarSpringOnStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarSpringOnStashController.java
@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar;
import static com.android.launcher3.anim.AnimatedFloat.VALUE;
+import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import androidx.annotation.Nullable;
@@ -85,6 +86,15 @@ public class TaskbarSpringOnStashController implements LoggableTaskbarController
.build(mTranslationForStash, VALUE);
}
+ /**
+ * Returns an animation to reset the stash translation back to 0 when unstashing.
+ */
+ public @Nullable ObjectAnimator createResetAnimForUnstash() {
+ if (!mIsTransientTaskbar) {
+ return null;
+ }
+ return mTranslationForStash.animateToValue(0);
+ }
@Override
public void dumpLogs(String prefix, PrintWriter pw) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
index 69ea9fd03a..daf9c47eb0 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -18,11 +18,12 @@ package com.android.launcher3.taskbar;
import static android.view.HapticFeedbackConstants.LONG_PRESS;
import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS;
+import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING_KEY;
import static com.android.launcher3.anim.Interpolators.EMPHASIZED;
import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
import static com.android.launcher3.anim.Interpolators.INSTANT;
import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.FORCE_PERSISTENT_TASKBAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_PINNING;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_HIDE;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_HIDE;
@@ -65,7 +66,6 @@ import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatedFloat;
import com.android.launcher3.anim.AnimatorListeners;
-import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;
import com.android.quickstep.SystemUiProxy;
@@ -106,15 +106,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
| FLAG_STASHED_IN_APP_IME | FLAG_STASHED_IN_TASKBAR_ALL_APPS
| FLAG_STASHED_SMALL_SCREEN | FLAG_STASHED_IN_APP_AUTO;
- private static final int FLAGS_STASHED_IN_APP_IGNORING_IME =
- FLAGS_STASHED_IN_APP & ~FLAG_STASHED_IN_APP_IME;
-
// If any of these flags are enabled, inset apps by our stashed height instead of our unstashed
// height. This way the reported insets are consistent even during transitions out of the app.
// Currently any flag that causes us to stash in an app is included, except for IME or All Apps
// since those cover the underlying app anyway and thus the app shouldn't change insets.
private static final int FLAGS_REPORT_STASHED_INSETS_TO_APP = FLAGS_STASHED_IN_APP
- & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS;
+ & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS
+ & ~FLAG_STASHED_IN_APP_SYSUI;
// If any of these flags are enabled, the taskbar must be stashed.
private static final int FLAGS_FORCE_STASHED = FLAG_STASHED_SYSUI | FLAG_STASHED_DEVICE_LOCKED
@@ -234,6 +232,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
// Taskbar background properties.
private AnimatedFloat mTaskbarBackgroundOffset;
private AnimatedFloat mTaskbarImeBgAlpha;
+ private MultiProperty mTaskbarBackgroundAlphaForStash;
// TaskbarView icon properties.
private MultiProperty mIconAlphaForStash;
private AnimatedFloat mIconScaleForStash;
@@ -305,6 +304,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
TaskbarDragLayerController dragLayerController = controllers.taskbarDragLayerController;
mTaskbarBackgroundOffset = dragLayerController.getTaskbarBackgroundOffset();
mTaskbarImeBgAlpha = dragLayerController.getImeBgTaskbar();
+ mTaskbarBackgroundAlphaForStash = dragLayerController.getBackgroundRendererAlphaForStash();
TaskbarViewController taskbarViewController = controllers.taskbarViewController;
mIconAlphaForStash = taskbarViewController.getTaskbarIconAlpha().get(
@@ -324,7 +324,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
// that taskbar unstashes when going to 3 button mode (supportsVisualStashing() false).
boolean isManuallyStashedInApp = supportsVisualStashing()
&& !isTransientTaskbar
- && !FORCE_PERSISTENT_TASKBAR.get()
+ && !ENABLE_TASKBAR_PINNING.get()
&& mPrefs.getBoolean(SHARED_PREFS_STASHED_KEY, DEFAULT_STASHED_PREF);
boolean isInSetup = !mActivity.isUserSetupComplete() || setupUIVisible;
updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);
@@ -353,7 +353,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* Returns whether the user can manually stash the taskbar based on the current device state.
*/
protected boolean supportsManualStashing() {
- if (FORCE_PERSISTENT_TASKBAR.get()) {
+ if (ENABLE_TASKBAR_PINNING.get() && mPrefs.getBoolean(TASKBAR_PINNING_KEY, false)) {
return false;
}
return supportsVisualStashing()
@@ -413,13 +413,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return hasAnyFlag(FLAGS_STASHED_IN_APP);
}
- /**
- * Returns whether the taskbar should be stashed in apps regardless of the IME visibility.
- */
- public boolean isStashedInAppIgnoringIme() {
- return hasAnyFlag(FLAGS_STASHED_IN_APP_IGNORING_IME);
- }
-
/**
* Returns whether the taskbar should be stashed in the current LauncherState.
*/
@@ -510,24 +503,20 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return mStashedHeight;
}
- /**
- * Stash or unstashes the transient taskbar, using the default TASKBAR_STASH_DURATION.
- */
- public void updateAndAnimateTransientTaskbar(boolean stash) {
- updateAndAnimateTransientTaskbar(stash, TASKBAR_STASH_DURATION);
- }
-
/**
* Stash or unstashes the transient taskbar.
*/
- public void updateAndAnimateTransientTaskbar(boolean stash, long duration) {
+ public void updateAndAnimateTransientTaskbar(boolean stash) {
if (!DisplayController.isTransientTaskbar(mActivity)) {
return;
}
- if (stash && mControllers.taskbarAutohideSuspendController.isSuspended()
+ if (
+ stash
&& !mControllers.taskbarAutohideSuspendController
- .isSuspendedForTransientTaskbarInOverview()) {
+ .isSuspendedForTransientTaskbarInLauncher()
+ && mControllers.taskbarAutohideSuspendController
+ .isTransientTaskbarStashingSuspended()) {
// Avoid stashing if autohide is currently suspended.
return;
}
@@ -585,6 +574,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return false;
}
+ /** Toggles the Taskbar's stash state. */
+ public void toggleTaskbarStash() {
+ if (!DisplayController.isTransientTaskbar(mActivity) || !hasAnyFlag(FLAGS_IN_APP)) return;
+ updateAndAnimateTransientTaskbar(!hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));
+ }
+
/**
* Adds the Taskbar unstash to Hotseat animator to the animator set.
*
@@ -596,10 +591,14 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* actually be used since this animation tracks a swipe progress.
*/
protected void addUnstashToHotseatAnimation(AnimatorSet animation, int placeholderDuration) {
+ // Defer any UI updates now to avoid the UI becoming stale when the animation plays.
+ mControllers.taskbarViewController.setDeferUpdatesForSUW(true);
createAnimToIsStashed(
/* isStashed= */ false,
placeholderDuration,
TRANSITION_UNSTASH_SUW_MANUAL);
+ animation.addListener(AnimatorListeners.forEndCallback(
+ () -> mControllers.taskbarViewController.setDeferUpdatesForSUW(false)));
animation.play(mAnimator);
}
@@ -753,37 +752,42 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
final float backgroundOffsetTarget = isStashed ? 1 : 0;
final float iconAlphaTarget = isStashed ? 0 : 1;
final float stashedHandleAlphaTarget = isStashed ? 1 : 0;
+ final float backgroundAlphaTarget = isStashed ? 0 : 1;
// Timing for the alpha values depend on the animation played
- long iconAlphaStartDelay = 0, iconAlphaDuration = 0, stashedHandleAlphaDelay = 0,
- stashedHandleAlphaDuration = 0;
+ long iconAlphaStartDelay = 0, iconAlphaDuration = 0, backgroundAndHandleAlphaStartDelay = 0,
+ backgroundAndHandleAlphaDuration = 0;
if (duration > 0) {
if (animationType == TRANSITION_HANDLE_FADE) {
// When fading, the handle fades in/out at the beginning of the transition with
// TASKBAR_STASH_ALPHA_DURATION.
- stashedHandleAlphaDuration = TASKBAR_STASH_ALPHA_DURATION;
+ backgroundAndHandleAlphaDuration = TASKBAR_STASH_ALPHA_DURATION;
// The iconAlphaDuration must be set to duration for the skippable interpolators
// below to work.
iconAlphaDuration = duration;
} else {
iconAlphaStartDelay = TASKBAR_STASH_ALPHA_START_DELAY;
iconAlphaDuration = TASKBAR_STASH_ALPHA_DURATION;
- stashedHandleAlphaDuration = TASKBAR_STASH_ALPHA_DURATION;
+ backgroundAndHandleAlphaDuration = TASKBAR_STASH_ALPHA_DURATION;
if (isStashed) {
if (animationType == TRANSITION_HOME_TO_APP) {
iconAlphaStartDelay = TASKBAR_STASH_ICON_ALPHA_HOME_TO_APP_START_DELAY;
}
- stashedHandleAlphaDelay = iconAlphaStartDelay;
- stashedHandleAlphaDuration = Math.max(0, duration - iconAlphaStartDelay);
+ backgroundAndHandleAlphaStartDelay = iconAlphaStartDelay;
+ backgroundAndHandleAlphaDuration = Math.max(0, duration - iconAlphaStartDelay);
}
}
}
play(as, mTaskbarStashedHandleAlpha.animateToValue(stashedHandleAlphaTarget),
- stashedHandleAlphaDelay,
- stashedHandleAlphaDuration, LINEAR);
+ backgroundAndHandleAlphaStartDelay,
+ backgroundAndHandleAlphaDuration, LINEAR);
+
+ play(as, mTaskbarBackgroundAlphaForStash.animateToValue(backgroundAlphaTarget),
+ backgroundAndHandleAlphaStartDelay,
+ backgroundAndHandleAlphaDuration, LINEAR);
// The rest of the animations might be "skipped" in TRANSITION_HANDLE_FADE transitions.
AnimatorSet skippable = as;
@@ -809,10 +813,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
if (isStashed) {
play(skippable, mControllers.taskbarSpringOnStashController.createSpringToStash(),
0, duration, LINEAR);
+ } else {
+ play(skippable, mControllers.taskbarSpringOnStashController.createResetAnimForUnstash(),
+ 0, duration, LINEAR);
}
mControllers.taskbarViewController.addRevealAnimToIsStashed(skippable, isStashed, duration,
- EMPHASIZED);
+ EMPHASIZED, animationType == TRANSITION_UNSTASH_SUW_MANUAL);
play(skippable, mControllers.stashedHandleViewController
.createRevealAnimToIsStashed(isStashed), 0, duration, EMPHASIZED);
@@ -866,15 +873,18 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
/**
* Creates and starts a partial unstash animation, hinting at the new state that will trigger
* when long press is detected.
+ *
* @param animateForward Whether we are going towards the new unstashed state or returning to
* the stashed state.
+ * @param forceUnstash Whether we force the unstash hint to animate.
*/
- public void startUnstashHint(boolean animateForward) {
+ protected void startUnstashHint(boolean animateForward, boolean forceUnstash) {
if (!isStashed()) {
// Already unstashed, no need to hint in that direction.
return;
}
- if (!canCurrentlyManuallyUnstash()) {
+ // TODO(b/270395798): Clean up after removing long-press unstashing code path.
+ if (!canCurrentlyManuallyUnstash() && !forceUnstash) {
// If any other flags are causing us to be stashed, long press won't cause us to
// unstash, so don't hint that it will.
return;
@@ -940,20 +950,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
}
- /**
- * Resets the flag if no system gesture is in progress.
- *
- * Otherwise, the reset should be deferred until after the gesture is finished.
- *
- * @see #setSystemGestureInProgress
- */
- public void resetFlagIfNoGestureInProgress(int flag) {
- if (!mIsSystemGestureInProgress) {
- updateStateForFlag(flag, false);
- applyState(mControllers.taskbarOverlayController.getCloseDuration());
- }
- }
-
/**
* When hiding the IME, delay the unstash animation to align with the end of the transition.
*/
@@ -1021,10 +1017,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* unstashed.
*/
public void updateStateForFlag(int flag, boolean enabled) {
- if (flag == FLAG_IN_APP && TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.TASKBAR_IN_APP_STATE, String.format(
- "setting flag FLAG_IN_APP to: %b", enabled), new Exception());
- }
if (enabled) {
mState |= flag;
} else {
@@ -1057,17 +1049,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
mActivity.getStatsLogManager().logger().log(hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)
? LAUNCHER_TRANSIENT_TASKBAR_HIDE
: LAUNCHER_TRANSIENT_TASKBAR_SHOW);
+ mControllers.taskbarAutohideSuspendController.updateFlag(
+ TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR,
+ !hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));
}
}
private void notifyStashChange(boolean visible, boolean stashed) {
mSystemUiProxy.notifyTaskbarStatus(visible, stashed);
setUpTaskbarSystemAction(visible);
- // If stashing taskbar is caused by IME visibility, we could just skip updating rounded
- // corner insets since the rounded corners will be covered by IME during IME is showing and
- // taskbar will be restored back to unstashed when IME is hidden.
- mControllers.taskbarActivityContext.updateInsetRoundedCornerFrame(
- visible && !isStashedInAppIgnoringIme());
mControllers.rotationButtonController.onTaskbarStateChange(visible, stashed);
}
@@ -1154,7 +1144,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
private void onTaskbarTimeout(Alarm alarm) {
- if (mControllers.taskbarAutohideSuspendController.isSuspended()) {
+ if (mControllers.taskbarAutohideSuspendController.isTransientTaskbarStashingSuspended()) {
return;
}
updateAndAnimateTransientTaskbar(true);
@@ -1248,17 +1238,16 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
&& mLastStartedTransitionType == TRANSITION_DEFAULT
&& animationType != TRANSITION_DEFAULT;
+ // It is possible for stash=false to be requested by TRANSITION_HOME_TO_APP and
+ // TRANSITION_DEFAULT in quick succession. In this case, we should ignore
+ // transitionTypeChanged because the animations are exactly the same.
+ if (transitionTypeChanged
+ && (!mIsStashed && !isStashed)
+ && animationType == TRANSITION_HOME_TO_APP) {
+ transitionTypeChanged = false;
+ }
+
if (mIsStashed != isStashed || transitionTypeChanged) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.TASKBAR_IN_APP_STATE, String.format(
- "setState: mIsStashed=%b, isStashed=%b, "
- + "mAnimationType=%d, animationType=%d, duration=%d",
- mIsStashed,
- isStashed,
- mLastStartedTransitionType,
- animationType,
- duration));
- }
mIsStashed = isStashed;
mLastStartedTransitionType = animationType;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt
index 2373142074..1cc667211c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt
@@ -25,7 +25,7 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE
import com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL
import com.android.launcher3.util.DisplayController
import com.android.launcher3.util.TouchController
-import com.android.quickstep.inputconsumers.TaskbarStashInputConsumer
+import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer
/**
* A helper [TouchController] for [TaskbarDragLayerController], specifically to handle touch events
@@ -34,7 +34,7 @@ import com.android.quickstep.inputconsumers.TaskbarStashInputConsumer
* or [MotionEvent.ACTION_OUTSIDE].
* - Touches inside Transient Taskbar bounds will stash if it is detected as a swipe down gesture.
*
- * Note: touches to *unstash* Taskbar are handled by [TaskbarStashInputConsumer].
+ * Note: touches to *unstash* Taskbar are handled by [TaskbarUnstashInputConsumer].
*/
class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : TouchController {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java
index 4b18bb6556..065d1117c8 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java
@@ -54,7 +54,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
private boolean mHasSprungOnceThisGesture;
private @Nullable ValueAnimator mSpringBounce;
private boolean mGestureEnded;
- private boolean mGestureInProgress;
private boolean mAnimationToHomeRunning;
private final boolean mIsTransientTaskbar;
@@ -124,7 +123,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
private void reset() {
mGestureEnded = false;
- mGestureInProgress = false;
mHasSprungOnceThisGesture = false;
}
@@ -136,24 +134,18 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
}
/**
- * Returns {@code true} if we should reset the animation back to zero.
- *
- * Returns {@code false} if there is a gesture in progress, or if we are already animating
- * to 0 within the specified duration.
+ * Returns true if we will animate to zero before the input duration.
*/
- public boolean shouldResetBackToZero(long duration) {
- if (mGestureInProgress) {
- return false;
- }
+ public boolean willAnimateToZeroBefore(long duration) {
if (mSpringBounce != null && mSpringBounce.isRunning()) {
long springDuration = mSpringBounce.getDuration();
long current = mSpringBounce.getCurrentPlayTime();
- return (springDuration - current >= duration);
+ return (springDuration - current < duration);
}
if (mTranslationYForSwipe.isAnimatingToValue(0)) {
- return mTranslationYForSwipe.getRemainingTime() >= duration;
+ return mTranslationYForSwipe.getRemainingTime() < duration;
}
- return true;
+ return false;
}
/**
@@ -196,7 +188,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
mAnimationToHomeRunning = false;
cancelSpringIfExists();
reset();
- mGestureInProgress = true;
}
/**
* Called when there is movement to move the taskbar.
@@ -220,7 +211,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
mGestureEnded = true;
startSpring();
}
- mGestureInProgress = false;
}
}
@@ -232,7 +222,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
pw.println(prefix + "\tmHasSprungOnceThisGesture=" + mHasSprungOnceThisGesture);
pw.println(prefix + "\tmAnimationToHomeRunning=" + mAnimationToHomeRunning);
pw.println(prefix + "\tmGestureEnded=" + mGestureEnded);
- pw.println(prefix + "\tmGestureInProgress=" + mGestureInProgress);
pw.println(prefix + "\tmSpringBounce is running=" + (mSpringBounce != null
&& mSpringBounce.isRunning()));
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
index 1435cb0996..7154731ee5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
@@ -30,9 +30,10 @@ import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.android.launcher3.Utilities;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.popup.SystemShortcut;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.quickstep.util.GroupTask;
@@ -41,6 +42,7 @@ import com.android.quickstep.views.TaskView;
import com.android.quickstep.views.TaskView.TaskIdAttributeContainer;
import java.io.PrintWriter;
+import java.util.stream.Stream;
/**
* Base class for providing different taskbar UI
@@ -127,7 +129,7 @@ public class TaskbarUIController {
/**
* SysUI flags updated, see QuickStepContract.SYSUI_STATE_* values.
*/
- public void updateStateForSysuiFlags(int sysuiFlags, boolean skipAnim){
+ public void updateStateForSysuiFlags(int sysuiFlags) {
}
/**
@@ -202,11 +204,8 @@ public class TaskbarUIController {
return;
}
- ComponentKey componentToBeStaged = new ComponentKey(
- splitSelectSource.itemInfo.getTargetComponent(),
- splitSelectSource.itemInfo.user);
recentsView.getSplitSelectController().findLastActiveTaskAndRunCallback(
- componentToBeStaged,
+ splitSelectSource.itemInfo.getComponentKey(),
foundTask -> {
splitSelectSource.alreadyRunningTaskId = foundTask == null
? INVALID_TASK_ID
@@ -222,9 +221,8 @@ public class TaskbarUIController {
*/
public void triggerSecondAppForSplit(ItemInfoWithIcon info, Intent intent, View startingView) {
RecentsView recents = getRecentsView();
- ComponentKey secondAppComponent = new ComponentKey(info.getTargetComponent(), info.user);
recents.getSplitSelectController().findLastActiveTaskAndRunCallback(
- secondAppComponent,
+ info.getComponentKey(),
foundTask -> {
if (foundTask != null) {
TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id);
@@ -318,4 +316,19 @@ public class TaskbarUIController {
}
return null;
}
+
+ /**
+ * Refreshes the resumed state of this ui controller.
+ */
+ public void refreshResumedState() {}
+
+ /**
+ * Returns a stream of split screen menu options appropriate to the device.
+ */
+ Stream> getSplitMenuOptions() {
+ return Utilities
+ .getSplitPositionOptions(mControllers.taskbarActivityContext.getDeviceProfile())
+ .stream()
+ .map(mControllers.taskbarPopupController::createSplitShortcutFactory);
+ }
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUnfoldAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUnfoldAnimationController.java
index 4c937a7f9b..f12d518764 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUnfoldAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUnfoldAnimationController.java
@@ -33,11 +33,14 @@ import java.io.PrintWriter;
public class TaskbarUnfoldAnimationController implements
TaskbarControllers.LoggableTaskbarController {
+ private static final float MAX_WIDTH_INSET_FRACTION = 0.035f;
+
private final ScopedUnfoldTransitionProgressProvider mScopedUnfoldTransitionProgressProvider;
private final NaturalRotationUnfoldProgressProvider mNaturalUnfoldTransitionProgressProvider;
private final UnfoldMoveFromCenterAnimator mMoveFromCenterAnimator;
private final TransitionListener mTransitionListener = new TransitionListener();
private TaskbarViewController mTaskbarViewController;
+ private TaskbarDragLayerController mTaskbarDragLayerController;
public TaskbarUnfoldAnimationController(BaseTaskbarContext context,
ScopedUnfoldTransitionProgressProvider source,
@@ -63,6 +66,7 @@ public class TaskbarUnfoldAnimationController implements
mTaskbarViewController.addOneTimePreDrawListener(() ->
mScopedUnfoldTransitionProgressProvider.setReadyToHandleTransition(true));
mNaturalUnfoldTransitionProgressProvider.addCallback(mTransitionListener);
+ mTaskbarDragLayerController = taskbarControllers.taskbarDragLayerController;
}
/**
@@ -99,11 +103,14 @@ public class TaskbarUnfoldAnimationController implements
public void onTransitionFinished() {
mMoveFromCenterAnimator.onTransitionFinished();
mMoveFromCenterAnimator.clearRegisteredViews();
+ mTaskbarDragLayerController.setBackgroundHorizontalInsets(0f);
}
@Override
public void onTransitionProgress(float progress) {
mMoveFromCenterAnimator.onTransitionProgress(progress);
+ float insetPercentage = (1 - progress) * MAX_WIDTH_INSET_FRACTION;
+ mTaskbarDragLayerController.setBackgroundHorizontalInsets(insetPercentage);
}
}
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index a3e681403a..bf3b932424 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -18,6 +18,8 @@ package com.android.launcher3.taskbar;
import static android.content.pm.PackageManager.FEATURE_PC;
import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
+import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
+
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Canvas;
@@ -114,7 +116,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
mActivityContext = ActivityContext.lookupContext(context);
mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds();
Resources resources = getResources();
- boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivityContext);
+ boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivityContext)
+ && !TaskbarManager.isPhoneMode(mActivityContext.getDeviceProfile());
mIsRtl = Utilities.isRtl(resources);
mTransientTaskbarMinWidth = mContext.getResources().getDimension(
R.dimen.transient_taskbar_min_width);
@@ -127,12 +130,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
int actualIconSize = mActivityContext.getDeviceProfile().taskbarIconSize;
+ int visualIconSize = (int) (actualIconSize * ICON_VISIBLE_AREA_FACTOR);
mIconTouchSize = Math.max(actualIconSize,
resources.getDimensionPixelSize(R.dimen.taskbar_icon_min_touch_size));
// We layout the icons to be of mIconTouchSize in width and height
- mItemMarginLeftRight = actualMargin - (mIconTouchSize - actualIconSize) / 2;
+ mItemMarginLeftRight = actualMargin - (mIconTouchSize - visualIconSize) / 2;
mItemPadding = (mIconTouchSize - actualIconSize) / 2;
mFolderLeaveBehindColor = Themes.getAttrColor(mActivityContext,
@@ -207,6 +211,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
}
protected void init(TaskbarViewController.TaskbarViewCallbacks callbacks) {
+ // set taskbar pane title so that accessibility service know it window and focuses.
+ setAccessibilityPaneTitle(getContext().getString(R.string.taskbar_a11y_title));
mControllerCallbacks = callbacks;
mIconClickListener = mControllerCallbacks.getIconOnClickListener();
mIconLongClickListener = mControllerCallbacks.getIconOnLongClickListener();
@@ -217,7 +223,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
mAllAppsButton.setOnClickListener(mControllerCallbacks.getAllAppsButtonClickListener());
}
if (mTaskbarDivider != null) {
- //TODO(b/265434705): set long press listener
+ mTaskbarDivider.setOnLongClickListener(
+ mControllerCallbacks.getTaskbarDividerLongClickListener());
}
}
@@ -512,6 +519,14 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
return mAllAppsButton;
}
+ /**
+ * Returns the taskbar divider in the taskbar.
+ */
+ @Nullable
+ public View getTaskbarDividerView() {
+ return mTaskbarDivider;
+ }
+
/**
* Returns the QSB in the taskbar.
*/
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index 6eb409e35d..4abd9957b2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -30,6 +30,7 @@ import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VAL
import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_ALIGNMENT_ANIM;
import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_TASKBAR_REVEAL_ANIM;
+import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
@@ -286,7 +287,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
}
private ValueAnimator createRevealAnimForView(View view, boolean isStashed, float newWidth,
- boolean isQsb) {
+ boolean isQsb, boolean dispatchOnAnimationStart) {
Rect viewBounds = new Rect(0, 0, view.getWidth(), view.getHeight());
int centerY = viewBounds.centerY();
int halfHandleHeight = mStashedHandleHeight / 2;
@@ -318,8 +319,24 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
: 0f;
float stashedRadius = stashedRect.height() / 2f;
- return new RoundedRectRevealOutlineProvider(radius, stashedRadius, viewBounds, stashedRect)
+ ValueAnimator reveal = new RoundedRectRevealOutlineProvider(radius,
+ stashedRadius, viewBounds, stashedRect)
.createRevealAnimator(view, !isStashed, 0);
+ // SUW animation does not dispatch animation start until *after* the animation is complete.
+ // In order to work properly, the reveal animation start needs to be called immediately.
+ if (dispatchOnAnimationStart) {
+ for (Animator.AnimatorListener listener : reveal.getListeners()) {
+ listener.onAnimationStart(reveal);
+ }
+ }
+ return reveal;
+ }
+
+ /**
+ * Defers any updates to the UI for the setup wizard animation.
+ */
+ public void setDeferUpdatesForSUW(boolean defer) {
+ mModelCallbacks.setDeferUpdatesForSUW(defer);
}
/**
@@ -332,7 +349,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
* @param interpolator The interpolator to use for all animations.
*/
public void addRevealAnimToIsStashed(AnimatorSet as, boolean isStashed, long duration,
- Interpolator interpolator) {
+ Interpolator interpolator, boolean dispatchOnAnimationStart) {
AnimatorSet reveal = new AnimatorSet();
Rect stashedBounds = new Rect();
@@ -349,8 +366,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
boolean isQsb = child == mTaskbarView.getQsb();
// Crop the icons to/from the nav handle shape.
- reveal.play(createRevealAnimForView(child, isStashed, newChildWidth, isQsb)
- .setDuration(duration));
+ reveal.play(createRevealAnimForView(child, isStashed, newChildWidth, isQsb,
+ dispatchOnAnimationStart).setDuration(duration));
// Translate the icons to/from their locations as the "nav handle."
@@ -459,12 +476,14 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
for (int i = 0; i < mTaskbarView.getChildCount(); i++) {
View child = mTaskbarView.getChildAt(i);
boolean isAllAppsButton = child == mTaskbarView.getAllAppsButtonView();
+ boolean isTaskbarDividerView = child == mTaskbarView.getTaskbarDividerView();
if (!mIsHotseatIconOnTopWhenAligned) {
// When going to home, the EMPHASIZED interpolator in TaskbarLauncherStateController
// plays iconAlignment to 1 really fast, therefore moving the fading towards the end
// to avoid icons disappearing rather than fading out visually.
setter.setViewAlpha(child, 0, Interpolators.clampToProgress(LINEAR, 0.8f, 1f));
- } else if ((isAllAppsButton && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get())) {
+ } else if ((isAllAppsButton && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get())
+ || (isTaskbarDividerView && FeatureFlags.ENABLE_TASKBAR_PINNING.get())) {
if (!isToHome
&& mIsHotseatIconOnTopWhenAligned
&& mControllers.taskbarStashController.isStashed()) {
@@ -637,7 +656,14 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
public View.OnClickListener getAllAppsButtonClickListener() {
return v -> {
mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_ALLAPPS_BUTTON_TAP);
- mControllers.taskbarAllAppsController.show();
+ mControllers.taskbarAllAppsController.toggle();
+ };
+ }
+
+ public View.OnLongClickListener getTaskbarDividerLongClickListener() {
+ return v -> {
+ mControllers.taskbarPinningController.showPinningView(v);
+ return true;
};
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
index eeca329e80..b4b83f6f24 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java
@@ -18,17 +18,22 @@ package com.android.launcher3.taskbar.allapps;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
-import android.view.WindowInsets;
-import com.android.launcher3.DeviceProfile;
+import androidx.annotation.Nullable;
+
import com.android.launcher3.R;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
+import java.util.Optional;
+
/** All apps container accessible from taskbar. */
public class TaskbarAllAppsContainerView extends
ActivityAllAppsContainerView {
+ private @Nullable OnInvalidateHeaderListener mOnInvalidateHeaderListener;
+
public TaskbarAllAppsContainerView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
@@ -37,14 +42,16 @@ public class TaskbarAllAppsContainerView extends
super(context, attrs, defStyleAttr);
}
- @Override
- public WindowInsets onApplyWindowInsets(WindowInsets insets) {
- setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
- return super.onApplyWindowInsets(insets);
+ void setOnInvalidateHeaderListener(OnInvalidateHeaderListener onInvalidateHeaderListener) {
+ mOnInvalidateHeaderListener = onInvalidateHeaderListener;
}
@Override
protected View inflateSearchBox() {
+ if (isSearchSupported()) {
+ return super.inflateSearchBox();
+ }
+
// Remove top padding of header, since we do not have any search
mHeader.setPadding(mHeader.getPaddingLeft(), 0,
mHeader.getPaddingRight(), mHeader.getPaddingBottom());
@@ -57,15 +64,15 @@ public class TaskbarAllAppsContainerView extends
}
@Override
- protected boolean isSearchSupported() {
- return false;
+ public void invalidateHeader() {
+ super.invalidateHeader();
+ Optional.ofNullable(mOnInvalidateHeaderListener).ifPresent(
+ OnInvalidateHeaderListener::onInvalidateHeader);
}
@Override
- protected void updateBackground(DeviceProfile deviceProfile) {
- super.updateBackground(deviceProfile);
- // TODO(b/240670050): Remove this and add header protection for the taskbar entrypoint.
- mBottomSheetBackground.setBackgroundResource(R.drawable.bg_rounded_corner_bottom_sheet);
+ protected boolean isSearchSupported() {
+ return FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get();
}
@Override
@@ -73,4 +80,8 @@ public class TaskbarAllAppsContainerView extends
// All apps is always open
return true;
}
+
+ interface OnInvalidateHeaderListener {
+ void onInvalidateHeader();
+ }
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
index 4a95a8f718..e0a502bdb2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
@@ -24,8 +24,12 @@ import com.android.launcher3.model.data.AppInfo;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.taskbar.TaskbarControllers;
import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
+import com.android.launcher3.util.PackageUserKey;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
/**
* Handles the all apps overlay window initialization, updates, and its data.
@@ -51,6 +55,8 @@ public final class TaskbarAllAppsController {
private boolean mDisallowGlobalDrag;
private boolean mDisallowLongClick;
+ private Map mPackageUserKeytoUidMap = Collections.emptyMap();
+
/** Initialize the controller. */
public void init(TaskbarControllers controllers, boolean allAppsVisible) {
mControllers = controllers;
@@ -65,11 +71,12 @@ public final class TaskbarAllAppsController {
}
/** Updates the current {@link AppInfo} instances. */
- public void setApps(AppInfo[] apps, int flags) {
+ public void setApps(AppInfo[] apps, int flags, Map map) {
mApps = apps;
mAppsModelFlags = flags;
+ mPackageUserKeytoUidMap = map;
if (mAppsView != null) {
- mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags);
+ mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags, mPackageUserKeytoUidMap);
}
}
@@ -91,9 +98,20 @@ public final class TaskbarAllAppsController {
}
}
- /** Opens the {@link TaskbarAllAppsContainerView} in a new window. */
- public void show() {
- show(true);
+ /** Updates the current notification dots. */
+ public void updateNotificationDots(Predicate updatedDots) {
+ if (mAppsView != null) {
+ mAppsView.getAppsStore().updateNotificationDots(updatedDots);
+ }
+ }
+
+ /** Toggles visibility of {@link TaskbarAllAppsContainerView} in the overlay window. */
+ public void toggle() {
+ if (isOpen()) {
+ mSlideInView.close(true);
+ } else {
+ show(true);
+ }
}
/** Returns {@code true} if All Apps is open. */
@@ -123,7 +141,7 @@ public final class TaskbarAllAppsController {
viewController.show(animate);
mAppsView = overlayContext.getAppsView();
- mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags);
+ mAppsView.getAppsStore().setApps(mApps, mAppsModelFlags, mPackageUserKeytoUidMap);
mAppsView.getFloatingHeaderView()
.findFixedRowByType(PredictionRowView.class)
.setPredictedApps(mPredictedApps);
@@ -135,10 +153,15 @@ public final class TaskbarAllAppsController {
overlayContext.getDragController().setDisallowLongClick(mDisallowLongClick);
}
-
@VisibleForTesting
public int getTaskbarAllAppsTopPadding() {
// Allow null-pointer since this should only be null if the apps view is not showing.
return mAppsView.getActiveRecyclerView().getClipBounds().top;
}
+
+ @VisibleForTesting
+ public int getTaskbarAllAppsScroll() {
+ // Allow null-pointer since this should only be null if the apps view is not showing.
+ return mAppsView.getActiveRecyclerView().computeVerticalScrollOffset();
+ }
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
index c1597b6507..cfa1027dcc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
@@ -19,14 +19,17 @@ import static com.android.launcher3.anim.Interpolators.EMPHASIZED;
import android.animation.PropertyValuesHolder;
import android.content.Context;
+import android.graphics.Canvas;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.animation.Interpolator;
+import android.window.OnBackInvokedDispatcher;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Insettable;
import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsViewController.TaskbarAllAppsCallbacks;
import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
import com.android.launcher3.views.AbstractSlideInView;
@@ -97,6 +100,11 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView {
@@ -100,11 +101,6 @@ final class TaskbarAllAppsViewController {
if (DisplayController.isTransientTaskbar(mContext)) {
mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_TASKBAR_ALL_APPS, false);
mTaskbarStashController.applyState(mOverlayController.getCloseDuration());
- } else {
- // Post in case view is closing due to gesture navigation. If a gesture is in
- // progress, wait to unstash until after the gesture is finished.
- MAIN_EXECUTOR.post(() -> mTaskbarStashController.resetFlagIfNoGestureInProgress(
- FLAG_STASHED_IN_TASKBAR_ALL_APPS));
}
});
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt
new file mode 100644
index 0000000000..7397159f42
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt
@@ -0,0 +1,135 @@
+/*
+ * 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.launcher3.taskbar.bubbles
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.ShapeDrawable
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.Utilities.mapToRange
+import com.android.launcher3.anim.Interpolators
+import com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound
+import com.android.launcher3.taskbar.TaskbarActivityContext
+import com.android.wm.shell.common.TriangleShape
+
+/** Drawable for the background of the bubble bar. */
+class BubbleBarBackground(context: TaskbarActivityContext, private val backgroundHeight: Float) :
+ Drawable() {
+
+ private val DARK_THEME_SHADOW_ALPHA = 51f
+ private val LIGHT_THEME_SHADOW_ALPHA = 25f
+
+ private val paint: Paint = Paint()
+ private val pointerSize: Float
+
+ private val shadowAlpha: Float
+ private var shadowBlur = 0f
+ private var keyShadowDistance = 0f
+
+ var arrowPositionX: Float = 0f
+ private set
+ private var showingArrow: Boolean = false
+ private var arrowDrawable: ShapeDrawable
+
+ init {
+ paint.color = context.getColor(R.color.taskbar_background)
+ paint.flags = Paint.ANTI_ALIAS_FLAG
+ paint.style = Paint.Style.FILL
+
+ val res = context.resources
+ shadowBlur = res.getDimension(R.dimen.transient_taskbar_shadow_blur)
+ keyShadowDistance = res.getDimension(R.dimen.transient_taskbar_key_shadow_distance)
+ pointerSize = res.getDimension(R.dimen.bubblebar_pointer_size)
+
+ shadowAlpha =
+ if (Utilities.isDarkTheme(context)) DARK_THEME_SHADOW_ALPHA
+ else LIGHT_THEME_SHADOW_ALPHA
+
+ arrowDrawable =
+ ShapeDrawable(TriangleShape.create(pointerSize, pointerSize, /* pointUp= */ true))
+ arrowDrawable.setBounds(0, 0, pointerSize.toInt(), pointerSize.toInt())
+ arrowDrawable.paint.flags = Paint.ANTI_ALIAS_FLAG
+ arrowDrawable.paint.style = Paint.Style.FILL
+ arrowDrawable.paint.color = context.getColor(R.color.taskbar_background)
+ }
+
+ fun showArrow(show: Boolean) {
+ showingArrow = show
+ }
+
+ fun setArrowPosition(x: Float) {
+ arrowPositionX = x
+ }
+
+ /** Draws the background with the given paint and height, on the provided canvas. */
+ override fun draw(canvas: Canvas) {
+ canvas.save()
+
+ // TODO (b/277359345): Should animate the alpha similar to taskbar (see TaskbarDragLayer)
+ // Draw shadows.
+ val newShadowAlpha =
+ mapToRange(paint.alpha.toFloat(), 0f, 255f, 0f, shadowAlpha, Interpolators.LINEAR)
+ paint.setShadowLayer(
+ shadowBlur,
+ 0f,
+ keyShadowDistance,
+ setColorAlphaBound(Color.BLACK, Math.round(newShadowAlpha))
+ )
+ arrowDrawable.paint.setShadowLayer(
+ shadowBlur,
+ 0f,
+ keyShadowDistance,
+ setColorAlphaBound(Color.BLACK, Math.round(newShadowAlpha))
+ )
+
+ // Draw background.
+ val radius = backgroundHeight / 2f
+ canvas.drawRoundRect(
+ 0f,
+ 0f,
+ canvas.width.toFloat(),
+ canvas.height.toFloat(),
+ radius,
+ radius,
+ paint
+ )
+
+ if (showingArrow) {
+ // Draw arrow.
+ val transX = arrowPositionX - pointerSize / 2f
+ canvas.translate(transX, -pointerSize)
+ arrowDrawable.draw(canvas)
+ }
+
+ canvas.restore()
+ }
+
+ override fun getOpacity(): Int {
+ return paint.alpha
+ }
+
+ override fun setAlpha(alpha: Int) {
+ paint.alpha = alpha
+ }
+
+ override fun setColorFilter(colorFilter: ColorFilter?) {
+ paint.colorFilter = colorFilter
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBubble.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBubble.kt
new file mode 100644
index 0000000000..3cd5f75934
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBubble.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.launcher3.taskbar.bubbles
+
+import android.graphics.Bitmap
+import android.graphics.Path
+import com.android.wm.shell.common.bubbles.BubbleInfo
+
+/** Contains state info about a bubble in the bubble bar as well as presentation information. */
+data class BubbleBarBubble(
+ val info: BubbleInfo,
+ val view: BubbleView,
+ val badge: Bitmap,
+ val icon: Bitmap,
+ val dotColor: Int,
+ val dotPath: Path,
+ val appName: String
+) {
+
+ val key: String = info.key
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
new file mode 100644
index 0000000000..6d196924b3
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
@@ -0,0 +1,437 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_PERSONS_DATA;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER;
+import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
+
+import static com.android.launcher3.icons.FastBitmapDrawable.WHITE_SCRIM_ALPHA;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
+
+import android.annotation.BinderThread;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.LauncherApps;
+import android.content.pm.PackageManager;
+import android.content.pm.ShortcutInfo;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Path;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.PathParser;
+import android.view.LayoutInflater;
+
+import com.android.internal.graphics.ColorUtils;
+import com.android.launcher3.R;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.BubbleIconFactory;
+import com.android.launcher3.shortcuts.ShortcutRequest;
+import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.launcher3.util.Executors.SimpleThreadFactory;
+import com.android.quickstep.SystemUiProxy;
+import com.android.wm.shell.bubbles.IBubblesListener;
+import com.android.wm.shell.common.bubbles.BubbleBarUpdate;
+import com.android.wm.shell.common.bubbles.BubbleInfo;
+import com.android.wm.shell.common.bubbles.RemovedBubble;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+/**
+ * This registers a listener with SysUIProxy to get information about changes to the bubble
+ * stack state from WMShell (SysUI). The controller is also responsible for loading the necessary
+ * information to render each of the bubbles & dispatches changes to
+ * {@link BubbleBarViewController} which will then update {@link BubbleBarView} as needed.
+ *
+ * For details around the behavior of the bubble bar, see {@link BubbleBarView}.
+ */
+public class BubbleBarController extends IBubblesListener.Stub {
+
+ private static final String TAG = BubbleBarController.class.getSimpleName();
+ private static final boolean DEBUG = false;
+
+ // Whether bubbles are showing in the bubble bar from launcher
+ public static final boolean BUBBLE_BAR_ENABLED =
+ SystemProperties.getBoolean("persist.wm.debug.bubble_bar", false);
+
+ private static final int MASK_HIDE_BUBBLE_BAR = SYSUI_STATE_BOUNCER_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED
+ | SYSUI_STATE_IME_SHOWING
+ | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED
+ | SYSUI_STATE_QUICK_SETTINGS_EXPANDED
+ | SYSUI_STATE_IME_SWITCHER_SHOWING;
+
+ private static final int MASK_HIDE_HANDLE_VIEW = SYSUI_STATE_BOUNCER_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
+
+ private static final int MASK_SYSUI_LOCKED = SYSUI_STATE_BOUNCER_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
+ | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
+
+ private final Context mContext;
+ private final BubbleBarView mBarView;
+ private final ArrayMap mBubbles = new ArrayMap<>();
+
+ private static final Executor BUBBLE_STATE_EXECUTOR = Executors.newSingleThreadExecutor(
+ new SimpleThreadFactory("BubbleStateUpdates-", THREAD_PRIORITY_BACKGROUND));
+ private final Executor mMainExecutor;
+ private final LauncherApps mLauncherApps;
+ private final BubbleIconFactory mIconFactory;
+
+ private BubbleBarBubble mSelectedBubble;
+
+ private BubbleBarViewController mBubbleBarViewController;
+ private BubbleStashController mBubbleStashController;
+ private BubbleStashedHandleViewController mBubbleStashedHandleViewController;
+
+ /**
+ * Similar to {@link BubbleBarUpdate} but rather than {@link BubbleInfo}s it uses
+ * {@link BubbleBarBubble}s so that it can be used to update the views.
+ */
+ private static class BubbleBarViewUpdate {
+ boolean expandedChanged;
+ boolean expanded;
+ String selectedBubbleKey;
+ String suppressedBubbleKey;
+ String unsuppressedBubbleKey;
+ List removedBubbles;
+ List bubbleKeysInOrder;
+
+ // These need to be loaded in the background
+ BubbleBarBubble addedBubble;
+ BubbleBarBubble updatedBubble;
+ List currentBubbles;
+
+ BubbleBarViewUpdate(BubbleBarUpdate update) {
+ expandedChanged = update.expandedChanged;
+ expanded = update.expanded;
+ selectedBubbleKey = update.selectedBubbleKey;
+ suppressedBubbleKey = update.suppressedBubbleKey;
+ unsuppressedBubbleKey = update.unsupressedBubbleKey;
+ removedBubbles = update.removedBubbles;
+ bubbleKeysInOrder = update.bubbleKeysInOrder;
+ }
+ }
+
+ public BubbleBarController(Context context, BubbleBarView bubbleView) {
+ mContext = context;
+ mBarView = bubbleView; // Need the view for inflating bubble views.
+
+ if (BUBBLE_BAR_ENABLED) {
+ SystemUiProxy.INSTANCE.get(context).setBubblesListener(this);
+ }
+ mMainExecutor = MAIN_EXECUTOR;
+ mLauncherApps = context.getSystemService(LauncherApps.class);
+ mIconFactory = new BubbleIconFactory(context,
+ context.getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size),
+ context.getResources().getDimensionPixelSize(R.dimen.bubblebar_badge_size),
+ context.getResources().getColor(R.color.important_conversation),
+ context.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.importance_ring_stroke_width));
+ }
+
+ public void onDestroy() {
+ SystemUiProxy.INSTANCE.get(mContext).setBubblesListener(null);
+ }
+
+ public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) {
+ mBubbleBarViewController = bubbleControllers.bubbleBarViewController;
+ mBubbleStashController = bubbleControllers.bubbleStashController;
+ mBubbleStashedHandleViewController = bubbleControllers.bubbleStashedHandleViewController;
+
+ bubbleControllers.runAfterInit(() -> {
+ mBubbleBarViewController.setHiddenForBubbles(!BUBBLE_BAR_ENABLED);
+ mBubbleStashedHandleViewController.setHiddenForBubbles(!BUBBLE_BAR_ENABLED);
+ });
+ }
+
+ /**
+ * Updates the bubble bar, handle bar, and stash controllers based on sysui state flags.
+ */
+ public void updateStateForSysuiFlags(int flags) {
+ boolean hideBubbleBar = (flags & MASK_HIDE_BUBBLE_BAR) != 0;
+ mBubbleBarViewController.setHiddenForSysui(hideBubbleBar);
+
+ boolean hideHandleView = (flags & MASK_HIDE_HANDLE_VIEW) != 0;
+ mBubbleStashedHandleViewController.setHiddenForSysui(hideHandleView);
+
+ boolean sysuiLocked = (flags & MASK_SYSUI_LOCKED) != 0;
+ mBubbleStashController.onSysuiLockedStateChange(sysuiLocked);
+ }
+
+ //
+ // Bubble data changes
+ //
+
+ @BinderThread
+ @Override
+ public void onBubbleStateChange(Bundle bundle) {
+ bundle.setClassLoader(BubbleBarUpdate.class.getClassLoader());
+ BubbleBarUpdate update = bundle.getParcelable("update", BubbleBarUpdate.class);
+ BubbleBarViewUpdate viewUpdate = new BubbleBarViewUpdate(update);
+ if (update.addedBubble != null
+ || update.updatedBubble != null
+ || !update.currentBubbleList.isEmpty()) {
+ // We have bubbles to load
+ BUBBLE_STATE_EXECUTOR.execute(() -> {
+ if (update.addedBubble != null) {
+ viewUpdate.addedBubble = populateBubble(update.addedBubble, mContext, mBarView);
+ }
+ if (update.updatedBubble != null) {
+ viewUpdate.updatedBubble =
+ populateBubble(update.updatedBubble, mContext, mBarView);
+ }
+ if (update.currentBubbleList != null && !update.currentBubbleList.isEmpty()) {
+ List currentBubbles = new ArrayList<>();
+ for (int i = 0; i < update.currentBubbleList.size(); i++) {
+ BubbleBarBubble b =
+ populateBubble(update.currentBubbleList.get(i), mContext, mBarView);
+ currentBubbles.add(b);
+ }
+ viewUpdate.currentBubbles = currentBubbles;
+ }
+ mMainExecutor.execute(() -> applyViewChanges(viewUpdate));
+ });
+ } else {
+ // No bubbles to load, immediately apply the changes.
+ BUBBLE_STATE_EXECUTOR.execute(
+ () -> mMainExecutor.execute(() -> applyViewChanges(viewUpdate)));
+ }
+ }
+
+ private void applyViewChanges(BubbleBarViewUpdate update) {
+ final boolean isCollapsed = (update.expandedChanged && !update.expanded)
+ || (!update.expandedChanged && !mBubbleBarViewController.isExpanded());
+ BubbleBarBubble bubbleToSelect = null;
+ if (!update.removedBubbles.isEmpty()) {
+ for (int i = 0; i < update.removedBubbles.size(); i++) {
+ RemovedBubble removedBubble = update.removedBubbles.get(i);
+ BubbleBarBubble bubble = mBubbles.remove(removedBubble.getKey());
+ if (bubble != null) {
+ mBubbleBarViewController.removeBubble(bubble);
+ } else {
+ Log.w(TAG, "trying to remove bubble that doesn't exist: "
+ + removedBubble.getKey());
+ }
+ }
+ }
+ if (update.addedBubble != null) {
+ mBubbles.put(update.addedBubble.getKey(), update.addedBubble);
+ mBubbleBarViewController.addBubble(update.addedBubble);
+ if (isCollapsed) {
+ // If we're collapsed, the most recently added bubble will be selected.
+ bubbleToSelect = update.addedBubble;
+ }
+
+ }
+ if (update.currentBubbles != null && !update.currentBubbles.isEmpty()) {
+ // Iterate in reverse because new bubbles are added in front and the list is in order.
+ for (int i = update.currentBubbles.size() - 1; i >= 0; i--) {
+ BubbleBarBubble bubble = update.currentBubbles.get(i);
+ if (bubble != null) {
+ mBubbles.put(bubble.getKey(), bubble);
+ mBubbleBarViewController.addBubble(bubble);
+ if (isCollapsed) {
+ // If we're collapsed, the most recently added bubble will be selected.
+ bubbleToSelect = bubble;
+ }
+ } else {
+ Log.w(TAG, "trying to add bubble but null after loading! "
+ + update.addedBubble.getKey());
+ }
+ }
+ }
+
+ // Adds and removals have happened, update visibility before any other visual changes.
+ mBubbleBarViewController.setHiddenForBubbles(mBubbles.isEmpty());
+ mBubbleStashedHandleViewController.setHiddenForBubbles(mBubbles.isEmpty());
+
+ if (update.updatedBubble != null) {
+ // TODO: (b/269670235) handle updates:
+ // (1) if content / icons change -- requires reload & add back in place
+ // (2) if showing update dot changes -- tell the view to hide / show the dot
+ }
+ if (update.bubbleKeysInOrder != null && !update.bubbleKeysInOrder.isEmpty()) {
+ // Create the new list
+ List newOrder = update.bubbleKeysInOrder.stream()
+ .map(mBubbles::get).filter(Objects::nonNull).toList();
+ if (!newOrder.isEmpty()) {
+ mBubbleBarViewController.reorderBubbles(newOrder);
+ }
+ }
+ if (update.suppressedBubbleKey != null) {
+ // TODO: (b/273316505) handle suppression
+ }
+ if (update.unsuppressedBubbleKey != null) {
+ // TODO: (b/273316505) handle suppression
+ }
+ if (update.selectedBubbleKey != null) {
+ if (mSelectedBubble != null
+ && !update.selectedBubbleKey.equals(mSelectedBubble.getKey())) {
+ BubbleBarBubble newlySelected = mBubbles.get(update.selectedBubbleKey);
+ if (newlySelected != null) {
+ bubbleToSelect = newlySelected;
+ } else {
+ Log.w(TAG, "trying to select bubble that doesn't exist:"
+ + update.selectedBubbleKey);
+ }
+ }
+ }
+ if (bubbleToSelect != null) {
+ setSelectedBubble(bubbleToSelect);
+ }
+ if (update.expandedChanged) {
+ if (update.expanded != mBubbleBarViewController.isExpanded()) {
+ mBubbleBarViewController.setExpandedFromSysui(update.expanded);
+ } else {
+ Log.w(TAG, "expansion was changed but is the same");
+ }
+ }
+ }
+
+ /**
+ * Sets the bubble that should be selected. This notifies the views, it does not notify
+ * WMShell that the selection has changed, that should go through
+ * {@link SystemUiProxy#showBubble}.
+ */
+ public void setSelectedBubble(BubbleBarBubble b) {
+ if (!Objects.equals(b, mSelectedBubble)) {
+ if (DEBUG) Log.w(TAG, "selectingBubble: " + b.getKey());
+ mSelectedBubble = b;
+ mBubbleBarViewController.updateSelectedBubble(mSelectedBubble);
+ }
+ }
+
+ /**
+ * Returns the selected bubble or null if no bubble is selected.
+ */
+ @Nullable
+ public String getSelectedBubbleKey() {
+ if (mSelectedBubble != null) {
+ return mSelectedBubble.getKey();
+ }
+ return null;
+ }
+
+ //
+ // Loading data for the bubbles
+ //
+
+ @Nullable
+ private BubbleBarBubble populateBubble(BubbleInfo b, Context context, BubbleBarView bbv) {
+ String appName;
+ Bitmap badgeBitmap;
+ Bitmap bubbleBitmap;
+ Path dotPath;
+ int dotColor;
+
+ boolean isImportantConvo = b.isImportantConversation();
+
+ ShortcutRequest.QueryResult result = new ShortcutRequest(context,
+ new UserHandle(b.getUserId()))
+ .forPackage(b.getPackageName(), b.getShortcutId())
+ .query(FLAG_MATCH_DYNAMIC
+ | FLAG_MATCH_PINNED_BY_ANY_LAUNCHER
+ | FLAG_MATCH_CACHED
+ | FLAG_GET_PERSONS_DATA);
+
+ ShortcutInfo shortcutInfo = result.size() > 0 ? result.get(0) : null;
+ if (shortcutInfo == null) {
+ Log.w(TAG, "No shortcutInfo found for bubble: " + b.getKey()
+ + " with shortcutId: " + b.getShortcutId());
+ }
+
+ ApplicationInfo appInfo;
+ try {
+ appInfo = mLauncherApps.getApplicationInfo(
+ b.getPackageName(),
+ 0,
+ new UserHandle(b.getUserId()));
+ } catch (PackageManager.NameNotFoundException e) {
+ // If we can't find package... don't think we should show the bubble.
+ Log.w(TAG, "Unable to find packageName: " + b.getPackageName());
+ return null;
+ }
+ if (appInfo == null) {
+ Log.w(TAG, "Unable to find appInfo: " + b.getPackageName());
+ return null;
+ }
+ PackageManager pm = context.getPackageManager();
+ appName = String.valueOf(appInfo.loadLabel(pm));
+ Drawable appIcon = appInfo.loadUnbadgedIcon(pm);
+ Drawable badgedIcon = pm.getUserBadgedIcon(appIcon, new UserHandle(b.getUserId()));
+
+ // Badged bubble image
+ Drawable bubbleDrawable = mIconFactory.getBubbleDrawable(context, shortcutInfo,
+ b.getIcon());
+ if (bubbleDrawable == null) {
+ // Default to app icon
+ bubbleDrawable = appIcon;
+ }
+
+ BitmapInfo badgeBitmapInfo = mIconFactory.getBadgeBitmap(badgedIcon, isImportantConvo);
+ badgeBitmap = badgeBitmapInfo.icon;
+
+ float[] bubbleBitmapScale = new float[1];
+ bubbleBitmap = mIconFactory.getBubbleBitmap(bubbleDrawable, bubbleBitmapScale);
+
+ // Dot color & placement
+ Path iconPath = PathParser.createPathFromPathData(
+ context.getResources().getString(
+ com.android.internal.R.string.config_icon_mask));
+ Matrix matrix = new Matrix();
+ float scale = bubbleBitmapScale[0];
+ float radius = BubbleView.DEFAULT_PATH_SIZE / 2f;
+ matrix.setScale(scale /* x scale */, scale /* y scale */, radius /* pivot x */,
+ radius /* pivot y */);
+ iconPath.transform(matrix);
+ dotPath = iconPath;
+ dotColor = ColorUtils.blendARGB(badgeBitmapInfo.color,
+ Color.WHITE, WHITE_SCRIM_ALPHA);
+
+
+ LayoutInflater inflater = LayoutInflater.from(context);
+ BubbleView bubbleView = (BubbleView) inflater.inflate(
+ R.layout.bubblebar_item_view, bbv, false /* attachToRoot */);
+
+ BubbleBarBubble bubble = new BubbleBarBubble(b, bubbleView,
+ badgeBitmap, bubbleBitmap, dotColor, dotPath, appName);
+ bubbleView.setBubble(bubble);
+ return bubble;
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
new file mode 100644
index 0000000000..0e1e0e1a1b
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
@@ -0,0 +1,324 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import android.animation.ValueAnimator;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.android.launcher3.R;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
+import com.android.launcher3.views.ActivityContext;
+
+import java.util.List;
+
+/**
+ * The view that holds all the bubble views. Modifying this view should happen through
+ * {@link BubbleBarViewController}. Updates to the bubbles themselves (adds, removes, updates,
+ * selection) should happen through {@link BubbleBarController} which is the source of truth
+ * for state information about the bubbles.
+ *
+ * The bubble bar has a couple of visual states:
+ * - stashed as a handle
+ * - unstashed but collapsed, in this state the bar is showing but the bubbles are stacked within it
+ * - unstashed and expanded, in this state the bar is showing and the bubbles are shown in a row
+ * with one of the bubbles being selected. Additionally, WMShell will display the expanded bubble
+ * view above the bar.
+ *
+ * The bubble bar has some behavior related to taskbar:
+ * - When taskbar is unstashed, bubble bar will also become unstashed (but in its "collapsed"
+ * state)
+ * - When taskbar is stashed, bubble bar will also become stashed (unless bubble bar is in its
+ * "expanded" state)
+ * - When bubble bar is in its "expanded" state, taskbar becomes stashed
+ *
+ * If there are no bubbles, the bubble bar and bubble stashed handle are not shown. Additionally
+ * the bubble bar and stashed handle are not shown on lockscreen.
+ *
+ * When taskbar is in persistent or 3 button nav mode, the bubble bar is not available, and instead
+ * the bubbles are shown fully by WMShell in their floating mode.
+ */
+public class BubbleBarView extends FrameLayout {
+
+ private static final String TAG = BubbleBarView.class.getSimpleName();
+
+ // TODO: (b/273594744) calculate the amount of space we have and base the max on that
+ // if it's smaller than 5.
+ private static final int MAX_BUBBLES = 5;
+ private static final int ARROW_POSITION_ANIMATION_DURATION_MS = 200;
+
+ private final TaskbarActivityContext mActivityContext;
+ private final BubbleBarBackground mBubbleBarBackground;
+
+ // The current bounds of all the bubble bar.
+ private final Rect mBubbleBarBounds = new Rect();
+ // The amount the bubbles overlap when they are stacked in the bubble bar
+ private final float mIconOverlapAmount;
+ // The spacing between the bubbles when they are expanded in the bubble bar
+ private final float mIconSpacing;
+ // The size of a bubble in the bar
+ private final float mIconSize;
+ // The elevation of the bubbles within the bar
+ private final float mBubbleElevation;
+
+ // Whether the bar is expanded (i.e. the bubble activity is being displayed).
+ private boolean mIsBarExpanded = false;
+ // The currently selected bubble view.
+ private BubbleView mSelectedBubbleView;
+ // The click listener when the bubble bar is collapsed.
+ private View.OnClickListener mOnClickListener;
+
+ private final Rect mTempRect = new Rect();
+
+ // We don't reorder the bubbles when they are expanded as it could be jarring for the user
+ // this runnable will be populated with any reordering of the bubbles that should be applied
+ // once they are collapsed.
+ @Nullable
+ private Runnable mReorderRunnable;
+
+ public BubbleBarView(Context context) {
+ this(context, null);
+ }
+
+ public BubbleBarView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public BubbleBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public BubbleBarView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ mActivityContext = ActivityContext.lookupContext(context);
+
+ mIconOverlapAmount = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_overlap);
+ mIconSpacing = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_spacing);
+ mIconSize = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size);
+ mBubbleElevation = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_elevation);
+ setClipToPadding(false);
+
+ mBubbleBarBackground = new BubbleBarBackground(mActivityContext,
+ getResources().getDimensionPixelSize(R.dimen.bubblebar_size));
+ setBackgroundDrawable(mBubbleBarBackground);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ super.onLayout(changed, left, top, right, bottom);
+ mBubbleBarBounds.left = left;
+ mBubbleBarBounds.top = top;
+ mBubbleBarBounds.right = right;
+ mBubbleBarBounds.bottom = bottom;
+
+ // The bubble bar handle is aligned to the bottom edge of the screen so scale towards that.
+ setPivotX(getWidth());
+ setPivotY(getHeight());
+
+ // Position the views
+ updateChildrenRenderNodeProperties();
+ }
+
+ /**
+ * Returns the bounds of the bubble bar.
+ */
+ public Rect getBubbleBarBounds() {
+ return mBubbleBarBounds;
+ }
+
+ // TODO: (b/273592694) animate it
+ @Override
+ public void addView(View child, int index, ViewGroup.LayoutParams params) {
+ if (getChildCount() + 1 > MAX_BUBBLES) {
+ removeViewInLayout(getChildAt(getChildCount() - 1));
+ }
+ super.addView(child, index, params);
+ }
+
+ /**
+ * Updates the z order, positions, and badge visibility of the bubble views in the bar based
+ * on the expanded state.
+ */
+ // TODO: (b/273592694) animate it
+ private void updateChildrenRenderNodeProperties() {
+ int bubbleCount = getChildCount();
+ final float ty = (mBubbleBarBounds.height() - mIconSize) / 2f;
+ for (int i = 0; i < bubbleCount; i++) {
+ BubbleView bv = (BubbleView) getChildAt(i);
+ bv.setTranslationY(ty);
+ if (mIsBarExpanded) {
+ final float tx = i * (mIconSize + mIconSpacing);
+ bv.setTranslationX(tx);
+ bv.setZ(0);
+ bv.showBadge();
+ } else {
+ bv.setZ((MAX_BUBBLES * mBubbleElevation) - i);
+ bv.setTranslationX(i * mIconOverlapAmount);
+ if (i > 0) {
+ bv.hideBadge();
+ } else {
+ bv.showBadge();
+ }
+ }
+ }
+ }
+
+ /**
+ * Reorders the views to match the provided list.
+ */
+ public void reorder(List viewOrder) {
+ if (isExpanded()) {
+ mReorderRunnable = () -> doReorder(viewOrder);
+ } else {
+ doReorder(viewOrder);
+ }
+ }
+
+ // TODO: (b/273592694) animate it
+ private void doReorder(List viewOrder) {
+ if (!isExpanded()) {
+ for (int i = 0; i < viewOrder.size(); i++) {
+ View child = viewOrder.get(i);
+ if (child != null) {
+ removeViewInLayout(child);
+ addViewInLayout(child, i, child.getLayoutParams());
+ }
+ }
+ updateChildrenRenderNodeProperties();
+ }
+ }
+
+ /**
+ * Sets which bubble view should be shown as selected.
+ */
+ public void setSelectedBubble(BubbleView view) {
+ mSelectedBubbleView = view;
+ updateArrowForSelected(/* shouldAnimate= */ true);
+ }
+
+ /**
+ * Update the arrow position to match the selected bubble.
+ *
+ * @param shouldAnimate whether or not to animate the arrow. If the bar was just expanded, this
+ * should be set to {@code false}. Otherwise set this to {@code true}.
+ */
+ private void updateArrowForSelected(boolean shouldAnimate) {
+ if (mSelectedBubbleView == null) {
+ Log.w(TAG, "trying to update selection arrow without a selected view!");
+ return;
+ }
+ final int index = indexOfChild(mSelectedBubbleView);
+ // Find the center of the bubble when it's expanded, set the arrow position to it.
+ final float tx = getPaddingStart() + index * (mIconSize + mIconSpacing) + mIconSize / 2f;
+
+ if (shouldAnimate) {
+ final float currentArrowPosition = mBubbleBarBackground.getArrowPositionX();
+ ValueAnimator animator = ValueAnimator.ofFloat(currentArrowPosition, tx);
+ animator.setDuration(ARROW_POSITION_ANIMATION_DURATION_MS);
+ animator.addUpdateListener(animation -> {
+ float x = (float) animation.getAnimatedValue();
+ mBubbleBarBackground.setArrowPosition(x);
+ invalidate();
+ });
+ animator.start();
+ } else {
+ mBubbleBarBackground.setArrowPosition(tx);
+ invalidate();
+ }
+ }
+
+ @Override
+ public void setOnClickListener(View.OnClickListener listener) {
+ mOnClickListener = listener;
+ setOrUnsetClickListener();
+ }
+
+ /**
+ * The click listener used for the bubble view gets added / removed depending on whether
+ * the bar is expanded or collapsed, this updates whether the listener is set based on state.
+ */
+ private void setOrUnsetClickListener() {
+ super.setOnClickListener(mIsBarExpanded ? null : mOnClickListener);
+ }
+
+ /**
+ * Sets whether the bubble bar is expanded or collapsed.
+ */
+ // TODO: (b/273592694) animate it
+ public void setExpanded(boolean isBarExpanded) {
+ if (mIsBarExpanded != isBarExpanded) {
+ mIsBarExpanded = isBarExpanded;
+ updateArrowForSelected(/* shouldAnimate= */ false);
+ setOrUnsetClickListener();
+ if (!isBarExpanded && mReorderRunnable != null) {
+ mReorderRunnable.run();
+ mReorderRunnable = null;
+ }
+ mBubbleBarBackground.showArrow(mIsBarExpanded);
+ requestLayout(); // trigger layout to reposition views & update size for expansion
+ }
+ }
+
+ /**
+ * Returns whether the bubble bar is expanded.
+ */
+ public boolean isExpanded() {
+ return mIsBarExpanded;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final int childCount = getChildCount();
+ final float iconWidth = mIsBarExpanded
+ ? (childCount * (mIconSize + mIconSpacing))
+ : mIconSize + ((childCount - 1) * mIconOverlapAmount);
+ final int totalWidth = (int) iconWidth + getPaddingStart() + getPaddingEnd();
+ setMeasuredDimension(totalWidth, MeasureSpec.getSize(heightMeasureSpec));
+
+ for (int i = 0; i < childCount; i++) {
+ View child = getChildAt(i);
+ measureChild(child, (int) mIconSize, (int) mIconSize);
+ }
+ }
+
+ /**
+ * Returns whether the given MotionEvent, *in screen coordinates*, is within bubble bar
+ * touch bounds.
+ */
+ public boolean isEventOverAnyItem(MotionEvent ev) {
+ if (getVisibility() == View.VISIBLE) {
+ getBoundsOnScreen(mTempRect);
+ return mTempRect.contains((int) ev.getX(), (int) ev.getY());
+ }
+ return false;
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ if (!mIsBarExpanded) {
+ // When the bar is collapsed, all taps on it should expand it.
+ return true;
+ }
+ return super.onInterceptTouchEvent(ev);
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
new file mode 100644
index 0000000000..82494c6fda
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
@@ -0,0 +1,302 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.launcher3.R;
+import com.android.launcher3.anim.AnimatedFloat;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
+import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.launcher3.util.MultiPropertyFactory;
+import com.android.launcher3.util.MultiValueAlpha;
+import com.android.quickstep.SystemUiProxy;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Controller for {@link BubbleBarView}. Manages the visibility of the bubble bar as well as
+ * responding to changes in bubble state provided by BubbleBarController.
+ */
+public class BubbleBarViewController {
+
+ private static final String TAG = BubbleBarViewController.class.getSimpleName();
+
+ private final SystemUiProxy mSystemUiProxy;
+ private final TaskbarActivityContext mActivity;
+ private final BubbleBarView mBarView;
+ private final int mIconSize;
+
+ // Initialized in init.
+ private BubbleStashController mBubbleStashController;
+ private BubbleBarController mBubbleBarController;
+ private View.OnClickListener mBubbleClickListener;
+ private View.OnClickListener mBubbleBarClickListener;
+
+ // These are exposed to {@link BubbleStashController} to animate for stashing/un-stashing
+ private final MultiValueAlpha mBubbleBarAlpha;
+ private final AnimatedFloat mBubbleBarScale = new AnimatedFloat(this::updateScale);
+ private final AnimatedFloat mBubbleBarTranslationY = new AnimatedFloat(
+ this::updateTranslationY);
+
+ // Modified when swipe up is happening on the bubble bar or task bar.
+ private float mBubbleBarSwipeUpTranslationY;
+
+ // Whether the bar is hidden for a sysui state.
+ private boolean mHiddenForSysui;
+ // Whether the bar is hidden because there are no bubbles.
+ private boolean mHiddenForNoBubbles;
+
+ public BubbleBarViewController(TaskbarActivityContext activity, BubbleBarView barView) {
+ mActivity = activity;
+ mBarView = barView;
+ mSystemUiProxy = SystemUiProxy.INSTANCE.get(mActivity);
+ mBubbleBarAlpha = new MultiValueAlpha(mBarView, 1 /* num alpha channels */);
+ mBubbleBarAlpha.setUpdateVisibility(true);
+ mIconSize = activity.getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size);
+ }
+
+ public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) {
+ mBubbleStashController = bubbleControllers.bubbleStashController;
+ mBubbleBarController = bubbleControllers.bubbleBarController;
+
+ mActivity.addOnDeviceProfileChangeListener(dp ->
+ mBarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarHeight
+ );
+ mBarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarHeight;
+ mBubbleBarScale.updateValue(1f);
+ mBubbleClickListener = v -> onBubbleClicked(v);
+ mBubbleBarClickListener = v -> setExpanded(true);
+ mBarView.setOnClickListener(mBubbleBarClickListener);
+ // TODO: when barView layout changes tell taskbarInsetsController the insets have changed.
+ }
+
+ private void onBubbleClicked(View v) {
+ BubbleBarBubble bubble = ((BubbleView) v).getBubble();
+ if (bubble == null) {
+ Log.e(TAG, "bubble click listener, bubble was null");
+ }
+ final String currentlySelected = mBubbleBarController.getSelectedBubbleKey();
+ if (mBarView.isExpanded() && Objects.equals(bubble.getKey(), currentlySelected)) {
+ // Tapping the currently selected bubble while expanded collapses the view.
+ setExpanded(false);
+ mBubbleStashController.stashBubbleBar();
+ } else {
+ mBubbleBarController.setSelectedBubble(bubble);
+ mSystemUiProxy.showBubble(bubble.getKey(),
+ mBubbleStashController.isBubblesShowingOnHome());
+ }
+ }
+
+ //
+ // The below animators are exposed to BubbleStashController so it can manage the stashing
+ // animation.
+ //
+
+ public MultiPropertyFactory getBubbleBarAlpha() {
+ return mBubbleBarAlpha;
+ }
+
+ public AnimatedFloat getBubbleBarScale() {
+ return mBubbleBarScale;
+ }
+
+ public AnimatedFloat getBubbleBarTranslationY() {
+ return mBubbleBarTranslationY;
+ }
+
+ /**
+ * Whether the bubble bar is visible or not.
+ */
+ public boolean isBubbleBarVisible() {
+ return mBarView.getVisibility() == VISIBLE;
+ }
+
+ /**
+ * The bounds of the bubble bar.
+ */
+ public Rect getBubbleBarBounds() {
+ return mBarView.getBubbleBarBounds();
+ }
+
+ /**
+ * When the bubble bar is not stashed, it can be collapsed (the icons are in a stack) or
+ * expanded (the icons are in a row). This indicates whether the bubble bar is expanded.
+ */
+ public boolean isExpanded() {
+ return mBarView.isExpanded();
+ }
+
+ /**
+ * Whether the motion event is within the bounds of the bubble bar.
+ */
+ public boolean isEventOverAnyItem(MotionEvent ev) {
+ return mBarView.isEventOverAnyItem(ev);
+ }
+
+ //
+ // Visibility of the bubble bar
+ //
+
+ /**
+ * Returns whether the bubble bar is hidden because there are no bubbles.
+ */
+ public boolean isHiddenForNoBubbles() {
+ return mHiddenForNoBubbles;
+ }
+
+ /**
+ * Sets whether the bubble bar should be hidden because there are no bubbles.
+ */
+ public void setHiddenForBubbles(boolean hidden) {
+ if (mHiddenForNoBubbles != hidden) {
+ mHiddenForNoBubbles = hidden;
+ updateVisibilityForStateChange();
+ }
+ }
+
+ /**
+ * Sets whether the bubble bar should be hidden due to SysUI state (e.g. on lockscreen).
+ */
+ public void setHiddenForSysui(boolean hidden) {
+ if (mHiddenForSysui != hidden) {
+ mHiddenForSysui = hidden;
+ updateVisibilityForStateChange();
+ }
+ }
+
+ // TODO: (b/273592694) animate it
+ private void updateVisibilityForStateChange() {
+ if (!mHiddenForSysui && !mBubbleStashController.isStashed() && !mHiddenForNoBubbles) {
+ mBarView.setVisibility(VISIBLE);
+ } else {
+ mBarView.setVisibility(INVISIBLE);
+ }
+ }
+
+ //
+ // Modifying view related properties.
+ //
+
+ /**
+ * Sets the translation of the bubble bar during the swipe up gesture.
+ */
+ public void setTranslationYForSwipe(float transY) {
+ mBubbleBarSwipeUpTranslationY = transY;
+ updateTranslationY();
+ }
+
+ private void updateTranslationY() {
+ mBarView.setTranslationY(mBubbleBarTranslationY.value
+ + mBubbleBarSwipeUpTranslationY);
+ }
+
+ /**
+ * Applies scale properties for the entire bubble bar.
+ */
+ private void updateScale() {
+ float scale = mBubbleBarScale.value;
+ mBarView.setScaleX(scale);
+ mBarView.setScaleY(scale);
+ }
+
+ //
+ // Manipulating the specific bubble views in the bar
+ //
+
+ /**
+ * Removes the provided bubble from the bubble bar.
+ */
+ public void removeBubble(BubbleBarBubble b) {
+ if (b != null) {
+ mBarView.removeView(b.getView());
+ } else {
+ Log.w(TAG, "removeBubble, bubble was null!");
+ }
+ }
+
+ /**
+ * Adds the provided bubble to the bubble bar.
+ */
+ public void addBubble(BubbleBarBubble b) {
+ if (b != null) {
+ mBarView.addView(b.getView(), 0, new FrameLayout.LayoutParams(mIconSize, mIconSize));
+ b.getView().setOnClickListener(mBubbleClickListener);
+ } else {
+ Log.w(TAG, "addBubble, bubble was null!");
+ }
+ }
+
+ /**
+ * Reorders the bubbles based on the provided list.
+ */
+ public void reorderBubbles(List newOrder) {
+ List viewList = newOrder.stream().filter(Objects::nonNull)
+ .map(BubbleBarBubble::getView).toList();
+ mBarView.reorder(viewList);
+ }
+
+ /**
+ * Updates the selected bubble.
+ */
+ public void updateSelectedBubble(BubbleBarBubble newlySelected) {
+ mBarView.setSelectedBubble(newlySelected.getView());
+ }
+
+ /**
+ * Sets whether the bubble bar should be expanded (not unstashed, but have the contents
+ * within it expanded). This method notifies SystemUI that the bubble bar is expanded and
+ * showing a selected bubble. This method should ONLY be called from UI events originating
+ * from Launcher.
+ */
+ public void setExpanded(boolean isExpanded) {
+ if (isExpanded != mBarView.isExpanded()) {
+ mBarView.setExpanded(isExpanded);
+ if (!isExpanded) {
+ mSystemUiProxy.collapseBubbles();
+ } else {
+ final String selectedKey = mBubbleBarController.getSelectedBubbleKey();
+ if (selectedKey != null) {
+ mSystemUiProxy.showBubble(selectedKey,
+ mBubbleStashController.isBubblesShowingOnHome());
+ } else {
+ Log.w(TAG, "trying to expand bubbles when there isn't one selected");
+ }
+ // TODO: Tell taskbar stash controller to stash without bubbles following
+ }
+ }
+ }
+
+ /**
+ * Sets whether the bubble bar should be expanded. This method is used in response to UI events
+ * from SystemUI.
+ */
+ public void setExpandedFromSysui(boolean isExpanded) {
+ if (!isExpanded) {
+ mBubbleStashController.stashBubbleBar();
+ } else {
+ mBubbleStashController.showBubbleBar(true /* expand the bubbles */);
+ }
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java
new file mode 100644
index 0000000000..6417f3c585
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleControllers.java
@@ -0,0 +1,80 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.launcher3.util.RunnableList;
+
+/**
+ * Hosts various bubble controllers to facilitate passing between one another.
+ */
+public class BubbleControllers {
+
+ public final BubbleBarController bubbleBarController;
+ public final BubbleBarViewController bubbleBarViewController;
+ public final BubbleStashController bubbleStashController;
+ public final BubbleStashedHandleViewController bubbleStashedHandleViewController;
+
+ private final RunnableList mPostInitRunnables = new RunnableList();
+
+ /**
+ * Want to add a new controller? Don't forget to:
+ * * Call init
+ * * Call onDestroy
+ */
+ public BubbleControllers(
+ BubbleBarController bubbleBarController,
+ BubbleBarViewController bubbleBarViewController,
+ BubbleStashController bubbleStashController,
+ BubbleStashedHandleViewController bubbleStashedHandleViewController) {
+ this.bubbleBarController = bubbleBarController;
+ this.bubbleBarViewController = bubbleBarViewController;
+ this.bubbleStashController = bubbleStashController;
+ this.bubbleStashedHandleViewController = bubbleStashedHandleViewController;
+ }
+
+ /**
+ * Initializes all controllers. Note that controllers can now reference each other through this
+ * BubbleControllers instance, but should be careful to only access things that were created
+ * in constructors for now, as some controllers may still be waiting for init().
+ */
+ public void init(TaskbarControllers taskbarControllers) {
+ bubbleBarController.init(taskbarControllers, this);
+ bubbleBarViewController.init(taskbarControllers, this);
+ bubbleStashedHandleViewController.init(taskbarControllers, this);
+ bubbleStashController.init(taskbarControllers, this);
+
+ mPostInitRunnables.executeAllAndDestroy();
+ }
+
+ /**
+ * If all controllers are already initialized, runs the given callback immediately. Otherwise,
+ * queues it to run after calling init() on all controllers. This should likely be used in any
+ * case where one controller is telling another controller to do something inside init().
+ */
+ public void runAfterInit(Runnable runnable) {
+ // If this has been executed in init, it automatically runs adds to it.
+ mPostInitRunnables.add(runnable);
+ }
+
+ /**
+ * Cleans up all controllers.
+ */
+ public void onDestroy() {
+ bubbleStashedHandleViewController.onDestroy();
+ bubbleBarController.onDestroy();
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
new file mode 100644
index 0000000000..0ab53b0c20
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java
@@ -0,0 +1,277 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.annotation.Nullable;
+import android.view.InsetsController;
+
+import com.android.launcher3.anim.AnimatedFloat;
+import com.android.launcher3.taskbar.StashedHandleViewController;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
+import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.launcher3.taskbar.TaskbarStashController;
+import com.android.launcher3.util.MultiPropertyFactory;
+
+/**
+ * Coordinates between controllers such as BubbleBarView and BubbleHandleViewController to
+ * create a cohesive animation between stashed/unstashed states.
+ */
+public class BubbleStashController {
+
+ private static final String TAG = BubbleStashController.class.getSimpleName();
+
+ /**
+ * How long to stash/unstash.
+ */
+ public static final long BAR_STASH_DURATION = InsetsController.ANIMATION_DURATION_RESIZE;
+
+ /**
+ * The scale bubble bar animates to when being stashed.
+ */
+ private static final float STASHED_BAR_SCALE = 0.5f;
+
+ protected final TaskbarActivityContext mActivity;
+
+ // Initialized in init.
+ private TaskbarControllers mControllers;
+ private BubbleBarViewController mBarViewController;
+ private BubbleStashedHandleViewController mHandleViewController;
+ private TaskbarStashController mTaskbarStashController;
+
+ private MultiPropertyFactory.MultiProperty mIconAlphaForStash;
+ private AnimatedFloat mIconScaleForStash;
+ private AnimatedFloat mIconTranslationYForStash;
+ private MultiPropertyFactory.MultiProperty mBubbleStashedHandleAlpha;
+
+ private boolean mRequestedStashState;
+ private boolean mRequestedExpandedState;
+
+ private boolean mIsStashed;
+ private int mStashedHeight;
+ private int mUnstashedHeight;
+ private boolean mBubblesShowingOnHome;
+ private boolean mBubblesShowingOnOverview;
+
+ @Nullable
+ private AnimatorSet mAnimator;
+
+ public BubbleStashController(TaskbarActivityContext activity) {
+ mActivity = activity;
+ }
+
+ public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) {
+ mControllers = controllers;
+ mBarViewController = bubbleControllers.bubbleBarViewController;
+ mHandleViewController = bubbleControllers.bubbleStashedHandleViewController;
+ mTaskbarStashController = controllers.taskbarStashController;
+
+ mIconAlphaForStash = mBarViewController.getBubbleBarAlpha().get(0);
+ mIconScaleForStash = mBarViewController.getBubbleBarScale();
+ mIconTranslationYForStash = mBarViewController.getBubbleBarTranslationY();
+
+ mBubbleStashedHandleAlpha = mHandleViewController.getStashedHandleAlpha().get(
+ StashedHandleViewController.ALPHA_INDEX_STASHED);
+
+ mStashedHeight = mHandleViewController.getStashedHeight();
+ mUnstashedHeight = mHandleViewController.getUnstashedHeight();
+
+ bubbleControllers.runAfterInit(() -> {
+ if (mTaskbarStashController.isStashed()) {
+ stashBubbleBar();
+ } else {
+ showBubbleBar(false /* expandBubbles */);
+ }
+ });
+ }
+
+ /**
+ * Returns the touchable height of the bubble bar based on it's stashed state.
+ */
+ public int getTouchableHeight() {
+ return mIsStashed ? mStashedHeight : mUnstashedHeight;
+ }
+
+ /**
+ * Returns whether the bubble bar is currently stashed.
+ */
+ public boolean isStashed() {
+ return mIsStashed;
+ }
+
+ /**
+ * Called when launcher enters or exits the home page. Bubbles are unstashed on home.
+ */
+ public void setBubblesShowingOnHome(boolean onHome) {
+ if (mBubblesShowingOnHome != onHome) {
+ mBubblesShowingOnHome = onHome;
+ if (mBubblesShowingOnHome) {
+ showBubbleBar(/* expanded= */ false);
+ } else if (!mBarViewController.isExpanded()) {
+ stashBubbleBar();
+ }
+ }
+ }
+
+ /** Whether bubbles are showing on the launcher home page. */
+ public boolean isBubblesShowingOnHome() {
+ return mBubblesShowingOnHome;
+ }
+
+ // TODO: when tapping on an app in overview, this is a bit delayed compared to taskbar stashing
+ /** Called when launcher enters or exits overview. Bubbles are unstashed on overview. */
+ public void setBubblesShowingOnOverview(boolean onOverview) {
+ if (mBubblesShowingOnOverview != onOverview) {
+ mBubblesShowingOnOverview = onOverview;
+ if (!mBubblesShowingOnOverview && !mBarViewController.isExpanded()) {
+ stashBubbleBar();
+ }
+ }
+ }
+
+ /** Called when sysui locked state changes, when locked, bubble bar is stashed. */
+ public void onSysuiLockedStateChange(boolean isSysuiLocked) {
+ if (isSysuiLocked) {
+ // TODO: should the normal path flip mBubblesOnHome / check if this is needed
+ // If we're locked, we're no longer showing on home.
+ mBubblesShowingOnHome = false;
+ mBubblesShowingOnOverview = false;
+ stashBubbleBar();
+ }
+ }
+
+ /**
+ * Stashes the bubble bar if allowed based on other state (e.g. on home and overview the
+ * bar does not stash).
+ */
+ public void stashBubbleBar() {
+ mRequestedStashState = true;
+ mRequestedExpandedState = false;
+ updateStashedAndExpandedState();
+ }
+
+ /**
+ * Shows the bubble bar, and expands bubbles depending on {@param expandBubbles}.
+ */
+ public void showBubbleBar(boolean expandBubbles) {
+ mRequestedStashState = false;
+ mRequestedExpandedState = expandBubbles;
+ updateStashedAndExpandedState();
+ }
+
+ private void updateStashedAndExpandedState() {
+ if (mBarViewController.isHiddenForNoBubbles()) {
+ // If there are no bubbles the bar and handle are invisible, nothing to do here.
+ return;
+ }
+ boolean isStashed = mRequestedStashState
+ && !mBubblesShowingOnHome
+ && !mBubblesShowingOnOverview;
+ if (mIsStashed != isStashed) {
+ mIsStashed = isStashed;
+ if (mAnimator != null) {
+ mAnimator.cancel();
+ }
+ mAnimator = createStashAnimator(mIsStashed, BAR_STASH_DURATION);
+ mAnimator.start();
+ onIsStashedChanged();
+ }
+ if (mBarViewController.isExpanded() != mRequestedExpandedState) {
+ mBarViewController.setExpanded(mRequestedExpandedState);
+ }
+ }
+
+ /**
+ * Create a stash animation.
+ *
+ * @param isStashed whether it's a stash animation or an unstash animation
+ * @param duration duration of the animation
+ * @return the animation
+ */
+ private AnimatorSet createStashAnimator(boolean isStashed, long duration) {
+ AnimatorSet animatorSet = new AnimatorSet();
+ final float stashTranslation = (mUnstashedHeight - mStashedHeight) / 2f;
+
+ AnimatorSet fullLengthAnimatorSet = new AnimatorSet();
+ // Not exactly half and may overlap. See [first|second]HalfDurationScale below.
+ AnimatorSet firstHalfAnimatorSet = new AnimatorSet();
+ AnimatorSet secondHalfAnimatorSet = new AnimatorSet();
+
+ final float firstHalfDurationScale;
+ final float secondHalfDurationScale;
+
+ if (isStashed) {
+ firstHalfDurationScale = 0.75f;
+ secondHalfDurationScale = 0.5f;
+
+ fullLengthAnimatorSet.play(mIconTranslationYForStash.animateToValue(stashTranslation));
+
+ firstHalfAnimatorSet.playTogether(
+ mIconAlphaForStash.animateToValue(0),
+ mIconScaleForStash.animateToValue(STASHED_BAR_SCALE));
+ secondHalfAnimatorSet.playTogether(
+ mBubbleStashedHandleAlpha.animateToValue(1));
+ } else {
+ firstHalfDurationScale = 0.5f;
+ secondHalfDurationScale = 0.75f;
+
+ // If we're on home, adjust the translation so the bubble bar aligns with hotseat.
+ final float hotseatTransY = mActivity.getDeviceProfile().getTaskbarOffsetY();
+ final float translationY = mBubblesShowingOnHome ? hotseatTransY : 0;
+ fullLengthAnimatorSet.playTogether(
+ mIconScaleForStash.animateToValue(1),
+ mIconTranslationYForStash.animateToValue(translationY));
+
+ firstHalfAnimatorSet.playTogether(
+ mBubbleStashedHandleAlpha.animateToValue(0)
+ );
+ secondHalfAnimatorSet.playTogether(
+ mIconAlphaForStash.animateToValue(1)
+ );
+ }
+
+ fullLengthAnimatorSet.play(mHandleViewController.createRevealAnimToIsStashed(isStashed));
+
+ fullLengthAnimatorSet.setDuration(duration);
+ firstHalfAnimatorSet.setDuration((long) (duration * firstHalfDurationScale));
+ secondHalfAnimatorSet.setDuration((long) (duration * secondHalfDurationScale));
+ secondHalfAnimatorSet.setStartDelay((long) (duration * (1 - secondHalfDurationScale)));
+
+ animatorSet.playTogether(fullLengthAnimatorSet, firstHalfAnimatorSet,
+ secondHalfAnimatorSet);
+ animatorSet.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mAnimator = null;
+ mControllers.runAfterInit(() -> {
+ if (isStashed) {
+ mBarViewController.setExpanded(false);
+ }
+ });
+ }
+ });
+ return animatorSet;
+ }
+
+ private void onIsStashedChanged() {
+ mControllers.runAfterInit(() -> {
+ mHandleViewController.onIsStashedChanged();
+ // TODO: when stash changes tell taskbarInsetsController the insets have changed.
+ });
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java
new file mode 100644
index 0000000000..2170a5dc5b
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashedHandleViewController.java
@@ -0,0 +1,262 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.content.res.Resources;
+import android.graphics.Outline;
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+
+import com.android.launcher3.R;
+import com.android.launcher3.anim.RevealOutlineAnimation;
+import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
+import com.android.launcher3.taskbar.StashedHandleView;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
+import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.launcher3.util.Executors;
+import com.android.launcher3.util.MultiPropertyFactory;
+import com.android.launcher3.util.MultiValueAlpha;
+import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
+
+/**
+ * Handles properties/data collection, then passes the results to our stashed handle View to render.
+ */
+public class BubbleStashedHandleViewController {
+
+ private final TaskbarActivityContext mActivity;
+ private final StashedHandleView mStashedHandleView;
+ private final MultiValueAlpha mTaskbarStashedHandleAlpha;
+
+ // Initialized in init.
+ private BubbleBarViewController mBarViewController;
+ private BubbleStashController mBubbleStashController;
+ private RegionSamplingHelper mRegionSamplingHelper;
+ private int mBarSize;
+ private int mStashedHandleWidth;
+ private int mStashedHandleHeight;
+
+ // The bounds we want to clip to in the settled state when showing the stashed handle.
+ private final Rect mStashedHandleBounds = new Rect();
+
+ // When the reveal animation is cancelled, we can assume it's about to create a new animation,
+ // which should start off at the same point the cancelled one left off.
+ private float mStartProgressForNextRevealAnim;
+ private boolean mWasLastRevealAnimReversed;
+
+ // XXX: if there are more of these maybe do state flags instead
+ private boolean mHiddenForSysui;
+ private boolean mHiddenForNoBubbles;
+ private boolean mHiddenForHomeButtonDisabled;
+
+ public BubbleStashedHandleViewController(TaskbarActivityContext activity,
+ StashedHandleView stashedHandleView) {
+ mActivity = activity;
+ mStashedHandleView = stashedHandleView;
+ mTaskbarStashedHandleAlpha = new MultiValueAlpha(mStashedHandleView, 1);
+ }
+
+ public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) {
+ mBarViewController = bubbleControllers.bubbleBarViewController;
+ mBubbleStashController = bubbleControllers.bubbleStashController;
+
+ Resources resources = mActivity.getResources();
+ mStashedHandleHeight = resources.getDimensionPixelSize(
+ R.dimen.bubblebar_stashed_handle_height);
+ mStashedHandleWidth = resources.getDimensionPixelSize(
+ R.dimen.bubblebar_stashed_handle_width);
+ mBarSize = resources.getDimensionPixelSize(R.dimen.bubblebar_size);
+
+ final int bottomMargin = resources.getDimensionPixelSize(
+ R.dimen.transient_taskbar_bottom_margin);
+ mStashedHandleView.getLayoutParams().height = mBarSize + bottomMargin;
+
+ mTaskbarStashedHandleAlpha.get(0).setValue(0);
+
+ final int stashedTaskbarHeight = resources.getDimensionPixelSize(
+ R.dimen.bubblebar_stashed_size);
+ mStashedHandleView.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ float stashedHandleRadius = view.getHeight() / 2f;
+ outline.setRoundRect(mStashedHandleBounds, stashedHandleRadius);
+ }
+ });
+
+ mRegionSamplingHelper = new RegionSamplingHelper(mStashedHandleView,
+ new RegionSamplingHelper.SamplingCallback() {
+ @Override
+ public void onRegionDarknessChanged(boolean isRegionDark) {
+ mStashedHandleView.updateHandleColor(isRegionDark, true /* animate */);
+ }
+
+ @Override
+ public Rect getSampledRegion(View sampledView) {
+ return mStashedHandleView.getSampledRegion();
+ }
+ }, Executors.UI_HELPER_EXECUTOR);
+
+ mStashedHandleView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) -> {
+ // As more bubbles get added, the icon bounds become larger. To ensure a consistent
+ // handle bar position, we pin it to the edge of the screen.
+ Rect bubblebarRect = mBarViewController.getBubbleBarBounds();
+ final int stashedCenterY = view.getHeight() - stashedTaskbarHeight / 2;
+
+ mStashedHandleBounds.set(
+ bubblebarRect.right - mStashedHandleWidth,
+ stashedCenterY - mStashedHandleHeight / 2,
+ bubblebarRect.right,
+ stashedCenterY + mStashedHandleHeight / 2);
+ mStashedHandleView.updateSampledRegion(mStashedHandleBounds);
+
+ view.setPivotX(view.getWidth());
+ view.setPivotY(view.getHeight() - stashedTaskbarHeight / 2f);
+ });
+ }
+
+ public void onDestroy() {
+ mRegionSamplingHelper.stopAndDestroy();
+ mRegionSamplingHelper = null;
+ }
+
+ /**
+ * Returns the height of the stashed handle.
+ */
+ public int getStashedHeight() {
+ return mStashedHandleHeight;
+ }
+
+ /**
+ * Returns the height when the bubble bar is unstashed (so the height of the bubble bar).
+ */
+ public int getUnstashedHeight() {
+ return mBarSize;
+ }
+
+ /**
+ * Called when system ui state changes. Bubbles don't show when the device is locked.
+ */
+ public void setHiddenForSysui(boolean hidden) {
+ if (mHiddenForSysui != hidden) {
+ mHiddenForSysui = hidden;
+ updateVisibilityForStateChange();
+ }
+ }
+
+ /**
+ * Called when the handle should be hidden (or shown) because there are no bubbles
+ * (or 1+ bubbles).
+ */
+ public void setHiddenForBubbles(boolean hidden) {
+ if (mHiddenForNoBubbles != hidden) {
+ mHiddenForNoBubbles = hidden;
+ updateVisibilityForStateChange();
+ }
+ }
+
+ /**
+ * Called when the home button is enabled / disabled. Bubbles don't show if home is disabled.
+ */
+ // TODO: is this needed for bubbles?
+ public void setIsHomeButtonDisabled(boolean homeDisabled) {
+ mHiddenForHomeButtonDisabled = homeDisabled;
+ updateVisibilityForStateChange();
+ }
+
+ // TODO: (b/273592694) animate it?
+ private void updateVisibilityForStateChange() {
+ if (!mHiddenForSysui && !mHiddenForHomeButtonDisabled && !mHiddenForNoBubbles) {
+ mStashedHandleView.setVisibility(VISIBLE);
+ } else {
+ mStashedHandleView.setVisibility(INVISIBLE);
+ }
+ updateRegionSampling();
+ }
+
+ /**
+ * Called when bubble bar is stash state changes so that updates to the stashed handle color
+ * can be started or stopped.
+ */
+ public void onIsStashedChanged() {
+ updateRegionSampling();
+ }
+
+ private void updateRegionSampling() {
+ boolean handleVisible = mStashedHandleView.getVisibility() == VISIBLE
+ && mBubbleStashController.isStashed();
+ mRegionSamplingHelper.setWindowVisible(handleVisible);
+ if (handleVisible) {
+ mStashedHandleView.updateSampledRegion(mStashedHandleBounds);
+ mRegionSamplingHelper.start(mStashedHandleView.getSampledRegion());
+ } else {
+ mRegionSamplingHelper.stop();
+ }
+ }
+
+ /**
+ * Sets the translation of the stashed handle during the swipe up gesture.
+ */
+ public void setTranslationYForSwipe(float transY) {
+ mStashedHandleView.setTranslationY(transY);
+ }
+
+ /**
+ * Used by {@link BubbleStashController} to animate the handle when stashing or un stashing.
+ */
+ public MultiPropertyFactory getStashedHandleAlpha() {
+ return mTaskbarStashedHandleAlpha;
+ }
+
+ /**
+ * Creates and returns an Animator that updates the stashed handle shape and size.
+ * When stashed, the shape is a thin rounded pill. When unstashed, the shape morphs into
+ * the size of where the bubble bar icons will be.
+ */
+ public Animator createRevealAnimToIsStashed(boolean isStashed) {
+ Rect bubbleBarBounds = new Rect(mBarViewController.getBubbleBarBounds());
+
+ // Account for the full visual height of the bubble bar
+ int heightDiff = (mBarSize - bubbleBarBounds.height()) / 2;
+ bubbleBarBounds.top -= heightDiff;
+ bubbleBarBounds.bottom += heightDiff;
+ float stashedHandleRadius = mStashedHandleView.getHeight() / 2f;
+ final RevealOutlineAnimation handleRevealProvider = new RoundedRectRevealOutlineProvider(
+ stashedHandleRadius, stashedHandleRadius, bubbleBarBounds, mStashedHandleBounds);
+
+ boolean isReversed = !isStashed;
+ boolean changingDirection = mWasLastRevealAnimReversed != isReversed;
+ mWasLastRevealAnimReversed = isReversed;
+ if (changingDirection) {
+ mStartProgressForNextRevealAnim = 1f - mStartProgressForNextRevealAnim;
+ }
+
+ ValueAnimator revealAnim = handleRevealProvider.createRevealAnimator(mStashedHandleView,
+ isReversed, mStartProgressForNextRevealAnim);
+ revealAnim.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mStartProgressForNextRevealAnim = ((ValueAnimator) animation).getAnimatedFraction();
+ }
+ });
+ return revealAnim;
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java
new file mode 100644
index 0000000000..e22e63aa36
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleView.java
@@ -0,0 +1,134 @@
+/*
+ * 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.launcher3.taskbar.bubbles;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Outline;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.widget.ImageView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.launcher3.R;
+import com.android.launcher3.icons.IconNormalizer;
+
+// TODO: (b/276978250) This is will be similar to WMShell's BadgedImageView, it'd be nice to share.
+// TODO: (b/269670235) currently this doesn't show the 'update dot'
+/**
+ * View that displays a bubble icon, along with an app badge on either the left or
+ * right side of the view.
+ */
+public class BubbleView extends ConstraintLayout {
+
+ // TODO: (b/269670235) currently we don't render the 'update dot', this will be used for that.
+ public static final int DEFAULT_PATH_SIZE = 100;
+
+ private final ImageView mBubbleIcon;
+ private final ImageView mAppIcon;
+ private final int mBubbleSize;
+
+ // TODO: (b/273310265) handle RTL
+ private boolean mOnLeft = false;
+
+ private BubbleBarBubble mBubble;
+
+ public BubbleView(Context context) {
+ this(context, null);
+ }
+
+ public BubbleView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public BubbleView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public BubbleView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ // We manage positioning the badge ourselves
+ setLayoutDirection(LAYOUT_DIRECTION_LTR);
+
+ LayoutInflater.from(context).inflate(R.layout.bubble_view, this);
+
+ mBubbleSize = getResources().getDimensionPixelSize(R.dimen.bubblebar_icon_size);
+ mBubbleIcon = findViewById(R.id.icon_view);
+ mAppIcon = findViewById(R.id.app_icon_view);
+
+ setFocusable(true);
+ setClickable(true);
+ setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ BubbleView.this.getOutline(outline);
+ }
+ });
+ }
+
+ private void getOutline(Outline outline) {
+ final int normalizedSize = IconNormalizer.getNormalizedCircleSize(mBubbleSize);
+ final int inset = (mBubbleSize - normalizedSize) / 2;
+ outline.setOval(inset, inset, inset + normalizedSize, inset + normalizedSize);
+ }
+
+ /** Sets the bubble being rendered in this view. */
+ void setBubble(BubbleBarBubble bubble) {
+ mBubble = bubble;
+ mBubbleIcon.setImageBitmap(bubble.getIcon());
+ mAppIcon.setImageBitmap(bubble.getBadge());
+ }
+
+ /** Returns the bubble being rendered in this view. */
+ @Nullable
+ BubbleBarBubble getBubble() {
+ return mBubble;
+ }
+
+ /** Shows the app badge on this bubble. */
+ void showBadge() {
+ Bitmap appBadgeBitmap = mBubble.getBadge();
+ if (appBadgeBitmap == null) {
+ mAppIcon.setVisibility(GONE);
+ return;
+ }
+
+ int translationX;
+ if (mOnLeft) {
+ translationX = -(mBubble.getIcon().getWidth() - appBadgeBitmap.getWidth());
+ } else {
+ translationX = 0;
+ }
+
+ mAppIcon.setTranslationX(translationX);
+ mAppIcon.setVisibility(VISIBLE);
+ }
+
+ /** Hides the app badge on this bubble. */
+ void hideBadge() {
+ mAppIcon.setVisibility(GONE);
+ }
+
+ @Override
+ public String toString() {
+ return "BubbleView{" + mBubble + "}";
+ }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt
index c093c9240a..468a1a7093 100644
--- a/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt
@@ -25,14 +25,7 @@ import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.LinearLayout
import com.android.launcher3.DeviceProfile
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_BACK_BUTTON_LEFT_MARGIN_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_HOME_BUTTON_LEFT_MARGIN_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_ICON_SIZE_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_NAV_BUTTONS_CORNER_RADIUS_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_NAV_BUTTONS_HEIGHT_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DIMEN_TASKBAR_NAV_BUTTONS_WIDTH_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DRAWABLE_SYSBAR_BACK_KIDS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.DRAWABLE_SYSBAR_HOME_KIDS
+import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.*
class KidsNavLayoutter(
resources: Resources,
diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt
index b730b215cd..000778d9df 100644
--- a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt
@@ -21,9 +21,7 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.android.launcher3.DeviceProfile
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_END_CONTEXTUAL_BUTTONS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_END_NAV_BUTTONS
-import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.ID_START_CONTEXTUAL_BUTTONS
+import com.android.launcher3.taskbar.navbutton.LayoutResourceHelper.*
import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory.Companion
import com.android.launcher3.taskbar.navbutton.NavButtonLayoutFactory.NavButtonLayoutter
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
index 66d591889b..a642693137 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
@@ -27,7 +27,6 @@ import com.android.launcher3.taskbar.BaseTaskbarContext;
import com.android.launcher3.taskbar.TaskbarActivityContext;
import com.android.launcher3.taskbar.TaskbarControllers;
import com.android.launcher3.taskbar.TaskbarDragController;
-import com.android.launcher3.taskbar.TaskbarStashController;
import com.android.launcher3.taskbar.TaskbarUIController;
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView;
import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource;
@@ -45,8 +44,6 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
private final TaskbarDragController mDragController;
private final TaskbarOverlayDragLayer mDragLayer;
- // We automatically stash taskbar when All Apps is opened in gesture navigation mode.
- private final boolean mWillTaskbarBeVisuallyStashed;
private final int mStashedTaskbarHeight;
private final TaskbarUIController mUiController;
@@ -60,18 +57,11 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
mDragController = new TaskbarDragController(this);
mDragController.init(controllers);
mDragLayer = new TaskbarOverlayDragLayer(this);
-
- TaskbarStashController taskbarStashController = controllers.taskbarStashController;
- mWillTaskbarBeVisuallyStashed = taskbarStashController.supportsVisualStashing();
- mStashedTaskbarHeight = taskbarStashController.getStashedHeight();
+ mStashedTaskbarHeight = controllers.taskbarStashController.getStashedHeight();
mUiController = controllers.uiController;
}
- boolean willTaskbarBeVisuallyStashed() {
- return mWillTaskbarBeVisuallyStashed;
- }
-
int getStashedTaskbarHeight() {
return mStashedTaskbarHeight;
}
@@ -80,11 +70,22 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
return mOverlayController;
}
+ /** Returns {@code true} if overlay or Taskbar windows are handling a system drag. */
+ boolean isAnySystemDragInProgress() {
+ return mDragController.isSystemDragInProgress()
+ || mTaskbarContext.getDragController().isSystemDragInProgress();
+ }
+
@Override
public DeviceProfile getDeviceProfile() {
return mOverlayController.getLauncherDeviceProfile();
}
+ @Override
+ public View.AccessibilityDelegate getAccessibilityDelegate() {
+ return mTaskbarContext.getAccessibilityDelegate();
+ }
+
@Override
public TaskbarDragController getDragController() {
return mDragController;
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
index 476e0a8bab..d4e2be9b49 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
import static com.android.launcher3.LauncherState.ALL_APPS;
import android.annotation.SuppressLint;
+import android.content.ComponentName;
import android.content.Context;
import android.graphics.PixelFormat;
import android.view.Gravity;
@@ -59,13 +60,15 @@ public final class TaskbarOverlayController {
private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {
@Override
- public void onTaskStackChanged() {
- mProxyView.close(false);
+ public void onTaskCreated(int taskId, ComponentName componentName) {
+ // Created task will be below existing overlay, so move out of the way.
+ hideWindow();
}
@Override
public void onTaskMovedToFront(int taskId) {
- mProxyView.close(false);
+ // New front task will be below existing overlay, so move out of the way.
+ hideWindow();
}
};
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
index ec64128c91..add72791d4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
@@ -32,6 +32,7 @@ import androidx.annotation.NonNull;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.testing.TestLogging;
import com.android.launcher3.testing.shared.TestProtocol;
+import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.TouchController;
import com.android.launcher3.views.BaseDragLayer;
@@ -112,7 +113,7 @@ public class TaskbarOverlayDragLayer extends
@Override
public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) {
- if (mActivity.getDragController().isSystemDragInProgress()) {
+ if (mActivity.isAnySystemDragInProgress()) {
inoutInfo.touchableRegion.setEmpty();
inoutInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
}
@@ -120,7 +121,9 @@ public class TaskbarOverlayDragLayer extends
@Override
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
- return updateInsetsDueToStashing(insets);
+ insets = updateInsetsDueToStashing(insets);
+ setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
+ return insets;
}
@Override
@@ -183,7 +186,7 @@ public class TaskbarOverlayDragLayer extends
* 2) Sets tappableInsets bottom inset to 0.
*/
private WindowInsets updateInsetsDueToStashing(WindowInsets oldInsets) {
- if (!mActivity.willTaskbarBeVisuallyStashed()) {
+ if (!DisplayController.isTransientTaskbar(mActivity)) {
return oldInsets;
}
WindowInsets.Builder updatedInsetsBuilder = new WindowInsets.Builder(oldInsets);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
index ca7ce746b6..a53dc1545f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
@@ -17,10 +17,15 @@
package com.android.launcher3.uioverrides;
import android.app.Person;
+import android.content.Context;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
import android.content.pm.ShortcutInfo;
import com.android.launcher3.Utilities;
+import java.util.Map;
+
/**
* A wrapper for the hidden API calls
*/
@@ -32,4 +37,8 @@ public class ApiWrapper {
Person[] persons = si.getPersons();
return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;
}
+
+ public static Map getActivityOverrides(Context context) {
+ return context.getSystemService(LauncherApps.class).getActivityOverrides();
+ }
}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 3990dade70..3e1d0f137a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -57,7 +57,6 @@ import com.android.launcher3.icons.IconNormalizer;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.model.data.ItemInfoWithIcon;
import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
import com.android.launcher3.touch.ItemLongClickListener;
import com.android.launcher3.util.SafeCloseable;
import com.android.launcher3.views.ActivityContext;
@@ -183,7 +182,16 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
: null;
super.applyFromWorkspaceItem(info, animate, staggerIndex);
int oldPlateColor = mPlateColor;
- int newPlateColor = ColorUtils.setAlphaComponent(mDotParams.appColor, 200);
+
+ int newPlateColor;
+ if (getIcon().isThemed()) {
+ newPlateColor = getResources().getColor(android.R.color.system_accent1_300);
+ } else {
+ float[] hctPlateColor = new float[3];
+ ColorUtils.colorToM3HCT(mDotParams.appColor, hctPlateColor);
+ newPlateColor = ColorUtils.M3HCTToColor(hctPlateColor[0], 36, 85);
+ }
+
if (!animate) {
mPlateColor = newPlateColor;
}
@@ -402,8 +410,9 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
PredictedAppIcon icon = (PredictedAppIcon) LayoutInflater.from(parent.getContext())
.inflate(R.layout.predicted_app_icon, parent, false);
icon.applyFromWorkspaceItem(info);
- icon.setOnClickListener(ItemClickHandler.INSTANCE);
- icon.setOnFocusChangeListener(Launcher.getLauncher(parent.getContext()).getFocusHandler());
+ Launcher launcher = Launcher.getLauncher(parent.getContext());
+ icon.setOnClickListener(launcher.getItemOnClickListener());
+ icon.setOnFocusChangeListener(launcher.getFocusHandler());
return icon;
}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 08d147f7cf..f5ba8f9cc5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -56,6 +56,10 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
return RemoteViews.startPendingIntent(hostView, pendingIntent,
remoteResponse.getLaunchOptions(view));
}
+ if (mLauncher.getSplitToWorkspaceController().handleSecondWidgetSelectionForSplit(view,
+ pendingIntent)) {
+ return true;
+ }
Pair options = remoteResponse.getLaunchOptions(view);
ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
.getActivityLaunchOptions(hostView);
@@ -80,6 +84,8 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
}
activityOptions.options.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+ activityOptions.options.setPendingIntentBackgroundActivityStartMode(
+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
options = Pair.create(options.first, activityOptions.options);
if (pendingIntent.isActivity()) {
logAppLaunch(itemInfo);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 243ed5c2ee..3139e4d91a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -68,12 +68,14 @@ import android.content.Intent;
import android.content.IntentSender;
import android.content.SharedPreferences;
import android.content.res.Configuration;
+import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.RectF;
import android.hardware.SensorManager;
import android.hardware.devicestate.DeviceStateManager;
import android.hardware.display.DisplayManager;
import android.media.permission.SafeCloseable;
+import android.os.Build;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.IBinder;
@@ -91,6 +93,7 @@ import android.window.SplashScreen;
import androidx.annotation.BinderThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.launcher3.AbstractFloatingView;
@@ -98,7 +101,6 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.LauncherState;
-import com.android.launcher3.OnBackPressedHandler;
import com.android.launcher3.QuickstepAccessibilityDelegate;
import com.android.launcher3.QuickstepTransitionManager;
import com.android.launcher3.R;
@@ -140,8 +142,8 @@ import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchControlle
import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarTouchController;
import com.android.launcher3.util.ActivityOptionsWrapper;
-import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.Executors;
import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.NavigationMode;
import com.android.launcher3.util.ObjectWrapper;
@@ -342,14 +344,18 @@ public class QuickstepLauncher extends Launcher {
}
@Override
- public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
- // Only pause is taskbar controller is not present
+ public RunnableList startActivitySafely(View v, Intent intent, ItemInfo item) {
+ // Only pause is taskbar controller is not present until the transition (if it exists) ends
mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
- boolean started = super.startActivitySafely(v, intent, item);
- if (getTaskbarUIController() == null && !started) {
- mHotseatPredictionController.setPauseUIUpdate(false);
+ RunnableList result = super.startActivitySafely(v, intent, item);
+ if (result == null) {
+ if (getTaskbarUIController() == null) {
+ mHotseatPredictionController.setPauseUIUpdate(false);
+ }
+ } else {
+ result.add(() -> mHotseatPredictionController.setPauseUIUpdate(false));
}
- return started;
+ return result;
}
@Override
@@ -369,11 +375,6 @@ public class QuickstepLauncher extends Launcher {
| ACTIVITY_STATE_USER_ACTIVE | ACTIVITY_STATE_TRANSITION_ACTIVE)) != 0) {
onStateOrResumeChanging((getActivityFlags() & ACTIVITY_STATE_TRANSITION_ACTIVE) == 0);
}
-
- if (((changeBits & ACTIVITY_STATE_STARTED) != 0
- || (changeBits & getActivityFlags() & ACTIVITY_STATE_DEFERRED_RESUMED) != 0)) {
- mHotseatPredictionController.setPauseUIUpdate(false);
- }
}
@Override
@@ -471,6 +472,10 @@ public class QuickstepLauncher extends Launcher {
public void onDestroy() {
mAppTransitionManager.onActivityDestroyed();
if (mUnfoldTransitionProgressProvider != null) {
+ if (FeatureFlags.RECEIVE_UNFOLD_EVENTS_FROM_SYSUI.get()) {
+ SystemUiProxy.INSTANCE.get(this).setUnfoldAnimationListener(null);
+ }
+
mUnfoldTransitionProgressProvider.destroy();
}
@@ -583,6 +588,9 @@ public class QuickstepLauncher extends Launcher {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ if (Utilities.ATLEAST_U && FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get()) {
+ getApplicationInfo().setEnableOnBackInvokedCallback(true);
+ }
if (savedInstanceState != null) {
mPendingSplitSelectInfo = ObjectWrapper.unwrap(
savedInstanceState.getIBinder(PENDING_SPLIT_SELECT_INFO));
@@ -598,13 +606,10 @@ public class QuickstepLauncher extends Launcher {
@Override
public void startSplitSelection(SplitSelectSource splitSelectSource) {
RecentsView recentsView = getOverviewPanel();
- ComponentKey componentToBeStaged = new ComponentKey(
- splitSelectSource.itemInfo.getTargetComponent(),
- splitSelectSource.itemInfo.user);
// Check if there is already an instance of this app running, if so, initiate the split
// using that.
mSplitSelectStateController.findLastActiveTaskAndRunCallback(
- componentToBeStaged,
+ splitSelectSource.itemInfo.getComponentKey(),
foundTask -> {
splitSelectSource.alreadyRunningTaskId = foundTask == null
? INVALID_TASK_ID
@@ -743,52 +748,59 @@ public class QuickstepLauncher extends Launcher {
@Override
protected void registerBackDispatcher() {
+ if (!FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get()) {
+ super.registerBackDispatcher();
+ return;
+ }
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
OnBackInvokedDispatcher.PRIORITY_DEFAULT,
new OnBackAnimationCallback() {
- @Nullable OnBackPressedHandler mActiveOnBackPressedHandler;
+ @Nullable OnBackAnimationCallback mActiveOnBackAnimationCallback;
@Override
public void onBackStarted(@NonNull BackEvent backEvent) {
- if (mActiveOnBackPressedHandler != null) {
- mActiveOnBackPressedHandler.onBackCancelled();
+ if (mActiveOnBackAnimationCallback != null) {
+ mActiveOnBackAnimationCallback.onBackCancelled();
}
- mActiveOnBackPressedHandler = getOnBackPressedHandler();
- mActiveOnBackPressedHandler.onBackStarted();
+ mActiveOnBackAnimationCallback = getOnBackAnimationCallback();
+ mActiveOnBackAnimationCallback.onBackStarted(backEvent);
}
+ @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
@Override
public void onBackInvoked() {
- // Recreate mActiveOnBackPressedHandler if necessary to avoid NPE because:
+ // Recreate mActiveOnBackAnimationCallback if necessary to avoid NPE
+ // because:
// 1. b/260636433: In 3-button-navigation mode, onBackStarted() is not
// called on ACTION_DOWN before onBackInvoked() is called in ACTION_UP.
// 2. Launcher#onBackPressed() will call onBackInvoked() without calling
// onBackInvoked() beforehand.
- if (mActiveOnBackPressedHandler == null) {
- mActiveOnBackPressedHandler = getOnBackPressedHandler();
+ if (mActiveOnBackAnimationCallback == null) {
+ mActiveOnBackAnimationCallback = getOnBackAnimationCallback();
}
- mActiveOnBackPressedHandler.onBackInvoked();
- mActiveOnBackPressedHandler = null;
+ mActiveOnBackAnimationCallback.onBackInvoked();
+ mActiveOnBackAnimationCallback = null;
TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onBackInvoked");
}
@Override
public void onBackProgressed(@NonNull BackEvent backEvent) {
- if (!FeatureFlags.IS_STUDIO_BUILD && mActiveOnBackPressedHandler == null) {
+ if (!FeatureFlags.IS_STUDIO_BUILD
+ && mActiveOnBackAnimationCallback == null) {
return;
}
- mActiveOnBackPressedHandler
- .onBackProgressed(backEvent.getProgress());
+ mActiveOnBackAnimationCallback.onBackProgressed(backEvent);
}
@Override
public void onBackCancelled() {
- if (!FeatureFlags.IS_STUDIO_BUILD && mActiveOnBackPressedHandler == null) {
+ if (!FeatureFlags.IS_STUDIO_BUILD
+ && mActiveOnBackAnimationCallback == null) {
return;
}
- mActiveOnBackPressedHandler.onBackCancelled();
- mActiveOnBackPressedHandler = null;
+ mActiveOnBackAnimationCallback.onBackCancelled();
+ mActiveOnBackAnimationCallback = null;
}
});
}
@@ -868,7 +880,9 @@ public class QuickstepLauncher extends Launcher {
private void onTISConnected(TISBinder binder) {
mTaskbarManager = binder.getTaskbarManager();
- mTaskbarManager.setActivity(this);
+ if (mTaskbarManager != null) {
+ mTaskbarManager.setActivity(this);
+ }
mOverviewCommandHelper = binder.getOverviewCommandHelper();
}
@@ -962,8 +976,8 @@ public class QuickstepLauncher extends Launcher {
return mTaskbarUIController;
}
- public SplitSelectStateController getSplitSelectStateController() {
- return mSplitSelectStateController;
+ public SplitToWorkspaceController getSplitToWorkspaceController() {
+ return mSplitToWorkspaceController;
}
public T getActionsView() {
@@ -1052,7 +1066,8 @@ public class QuickstepLauncher extends Launcher {
}
@Override
- public void onInitialBindComplete(IntSet boundPages, RunnableList pendingTasks) {
+ public void onInitialBindComplete(IntSet boundPages, RunnableList pendingTasks,
+ int workspaceItemCount, boolean isBindSync) {
pendingTasks.add(() -> {
// This is added in pending task as we need to wait for views to be positioned
// correctly before registering them for the animation.
@@ -1062,7 +1077,7 @@ public class QuickstepLauncher extends Launcher {
mLauncherUnfoldAnimationController.updateRegisteredViewsIfNeeded();
}
});
- super.onInitialBindComplete(boundPages, pendingTasks);
+ super.onInitialBindComplete(boundPages, pendingTasks, workspaceItemCount, isBindSync);
}
@Override
@@ -1089,6 +1104,17 @@ public class QuickstepLauncher extends Launcher {
return activityOptions;
}
+ @Override
+ public ActivityOptionsWrapper makeDefaultActivityOptions(int splashScreenStyle) {
+ RunnableList callbacks = new RunnableList();
+ ActivityOptions options = ActivityOptions.makeCustomAnimation(
+ this, 0, 0, Color.TRANSPARENT,
+ Executors.MAIN_EXECUTOR.getHandler(), null,
+ elapsedRealTime -> callbacks.executeAllAndDestroy());
+ options.setSplashScreenStyle(splashScreenStyle);
+ return new ActivityOptionsWrapper(options, callbacks);
+ }
+
@Override
@BinderThread
public void enterStageSplitFromRunningApp(boolean leftOrTop) {
@@ -1170,6 +1196,11 @@ public class QuickstepLauncher extends Launcher {
}
}
+ @Override
+ public void tryClearAccessibilityFocus(View view) {
+ view.clearAccessibilityFocus();
+ }
+
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
@@ -1255,7 +1286,8 @@ public class QuickstepLauncher extends Launcher {
getActivityLaunchOptions(taskView, null).options));
return;
}
- mSplitSelectStateController.launchTasks(
+ mSplitSelectStateController.launchExistingSplitPair(
+ null /* launchingTaskView */,
groupTask.task1.key.id,
groupTask.task2.key.id,
SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT,
@@ -1301,5 +1333,8 @@ public class QuickstepLauncher extends Launcher {
writer.println("\nQuickstepLauncher:");
writer.println(prefix + "\tmOrientationState: " + (recentsView == null ? "recentsNull" :
recentsView.getPagedViewOrientedState()));
+ if (recentsView != null) {
+ recentsView.getSplitSelectController().dump(prefix, writer);
+ }
}
}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
index b318100205..39543b0d7d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
@@ -95,7 +95,11 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
i -> MAIN_EXECUTOR.execute(() ->
sHolders.forEach(h -> h.mAppWidgetRemovedCallback.accept(i))),
() -> MAIN_EXECUTOR.execute(() ->
- sHolders.forEach(h -> h.mProviderChangedListeners.forEach(
+ sHolders.forEach(h ->
+ // Listeners might remove themselves from the list during the
+ // iteration. Creating a copy of the list to avoid exceptions
+ // for concurrent modification.
+ new ArrayList<>(h.mProviderChangedListeners).forEach(
ProviderChangedListener::notifyWidgetProvidersChanged))),
UI_HELPER_EXECUTOR.getLooper());
if (!WidgetsModel.GO_DISABLE_WIDGETS) {
@@ -155,7 +159,6 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
} else if (KEY_VIEWS_UPDATE.equals(key)) {
// For views update, remove all previous updates, except the provider
pendingUpdate.remoteViews = (RemoteViews) data;
- pendingUpdate.changedViews.clear();
} else if (KEY_VIEW_DATA_CHANGED.equals(key)) {
pendingUpdate.changedViews.add((Integer) data);
}
@@ -197,7 +200,7 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
@Override
public void addProviderChangeListener(
@NonNull LauncherWidgetHolder.ProviderChangedListener listener) {
- mProviderChangedListeners.add(listener);
+ MAIN_EXECUTOR.execute(() -> mProviderChangedListeners.add(listener));
}
/**
@@ -207,7 +210,7 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
@Override
public void removeProviderChangeListener(
LauncherWidgetHolder.ProviderChangedListener listener) {
- mProviderChangedListeners.remove(listener);
+ MAIN_EXECUTOR.execute(() -> mProviderChangedListeners.remove(listener));
}
/**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DebugFlag.java b/quickstep/src/com/android/launcher3/uioverrides/flags/DebugFlag.java
index d4944d0315..481e20007e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/DebugFlag.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DebugFlag.java
@@ -15,16 +15,20 @@
*/
package com.android.launcher3.uioverrides.flags;
+import androidx.annotation.NonNull;
+
import com.android.launcher3.config.FeatureFlags.BooleanFlag;
+import com.android.launcher3.config.FeatureFlags.FlagState;
class DebugFlag extends BooleanFlag {
public final String key;
public final String description;
- public final boolean defaultValue;
+ @NonNull
+ public final FlagState defaultValue;
- public DebugFlag(String key, String description, boolean defaultValue, boolean currentValue) {
+ DebugFlag(String key, String description, FlagState defaultValue, boolean currentValue) {
super(currentValue);
this.key = key;
this.defaultValue = defaultValue;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsFragment.java b/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsFragment.java
index 67ea1af056..b901a87753 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsFragment.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsFragment.java
@@ -39,6 +39,7 @@ import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.text.Editable;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.ArrayMap;
import android.util.Pair;
@@ -182,9 +183,16 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
}
private PreferenceCategory newCategory(String title) {
+ return newCategory(title, null);
+ }
+
+ private PreferenceCategory newCategory(String title, @Nullable String summary) {
PreferenceCategory category = new PreferenceCategory(getContext());
category.setOrder(Preference.DEFAULT_ORDER);
category.setTitle(title);
+ if (!TextUtils.isEmpty(summary)) {
+ category.setSummary(summary);
+ }
mPreferenceScreen.addPreference(category);
return category;
}
@@ -195,7 +203,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
}
mFlagTogglerPrefUi = new FlagTogglerPrefUi(this);
- mFlagTogglerPrefUi.applyTo(newCategory("Feature flags"));
+ mFlagTogglerPrefUi.applyTo(newCategory("Feature flags", "Long press to reset"));
}
@Override
@@ -351,29 +359,6 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
return true;
});
sandboxCategory.addPreference(launchOverviewTutorialPreference);
- Preference launchAssistantTutorialPreference = new Preference(context);
- launchAssistantTutorialPreference.setKey("launchAssistantTutorial");
- launchAssistantTutorialPreference.setTitle("Launch Assistant Tutorial");
- launchAssistantTutorialPreference.setSummary("Learn how to use the Assistant gesture");
- launchAssistantTutorialPreference.setOnPreferenceClickListener(preference -> {
- startActivity(launchSandboxIntent
- .putExtra("use_tutorial_menu", false)
- .putExtra("tutorial_steps", new String[] {"ASSISTANT"}));
- return true;
- });
- sandboxCategory.addPreference(launchAssistantTutorialPreference);
- Preference launchSandboxModeTutorialPreference = new Preference(context);
- launchSandboxModeTutorialPreference.setKey("launchSandboxMode");
- launchSandboxModeTutorialPreference.setTitle("Launch Sandbox Mode");
- launchSandboxModeTutorialPreference.setSummary("Practice navigation gestures");
- launchSandboxModeTutorialPreference.setOnPreferenceClickListener(preference -> {
- startActivity(launchSandboxIntent
- .putExtra("use_tutorial_menu", false)
- .putExtra("tutorial_steps", new String[] {"SANDBOX_MODE"}));
- return true;
- });
- sandboxCategory.addPreference(launchSandboxModeTutorialPreference);
-
Preference launchSecondaryDisplayPreference = new Preference(context);
launchSecondaryDisplayPreference.setKey("launchSecondaryDisplay");
launchSecondaryDisplayPreference.setTitle("Launch Secondary Display");
diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DeviceFlag.java b/quickstep/src/com/android/launcher3/uioverrides/flags/DeviceFlag.java
index 3900ebb549..035beb4df1 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/DeviceFlag.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DeviceFlag.java
@@ -16,11 +16,13 @@
package com.android.launcher3.uioverrides.flags;
+import com.android.launcher3.config.FeatureFlags.FlagState;
+
class DeviceFlag extends DebugFlag {
private final boolean mDefaultValueInCode;
- public DeviceFlag(String key, String description, boolean defaultValue,
+ DeviceFlag(String key, String description, FlagState defaultValue,
boolean currentValue, boolean defaultValueInCode) {
super(key, description, defaultValue, currentValue);
mDefaultValueInCode = defaultValueInCode;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagTogglerPrefUi.java b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagTogglerPrefUi.java
index b7fb2ed827..87c836bbac 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagTogglerPrefUi.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagTogglerPrefUi.java
@@ -16,12 +16,14 @@
package com.android.launcher3.uioverrides.flags;
-import static com.android.launcher3.config.FeatureFlags.FLAGS_PREF_NAME;
+import static com.android.launcher3.config.FeatureFlags.FlagState.TEAMFOOD;
+import static com.android.launcher3.uioverrides.flags.FlagsFactory.TEAMFOOD_FLAG;
import android.content.Context;
-import android.content.SharedPreferences;
+import android.os.Handler;
import android.os.Process;
import android.text.Html;
+import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -30,6 +32,7 @@ import android.widget.Toast;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
import com.android.launcher3.R;
@@ -47,36 +50,27 @@ public final class FlagTogglerPrefUi {
private final PreferenceFragmentCompat mFragment;
private final Context mContext;
- private final SharedPreferences mSharedPreferences;
-
private final PreferenceDataStore mDataStore = new PreferenceDataStore() {
@Override
public void putBoolean(String key, boolean value) {
- mSharedPreferences.edit().putBoolean(key, value).apply();
+ FlagsFactory.getSharedPreferences().edit().putBoolean(key, value).apply();
updateMenu();
}
@Override
public boolean getBoolean(String key, boolean defaultValue) {
- for (DebugFlag flag : FlagsFactory.getDebugFlags()) {
- if (flag.key.equals(key)) {
- return mSharedPreferences.getBoolean(key, flag.defaultValue);
- }
- }
- return defaultValue;
+ return FlagsFactory.getSharedPreferences().getBoolean(key, defaultValue);
}
};
public FlagTogglerPrefUi(PreferenceFragmentCompat fragment) {
mFragment = fragment;
mContext = fragment.getActivity();
- mSharedPreferences = mContext.getSharedPreferences(
- FLAGS_PREF_NAME, Context.MODE_PRIVATE);
}
public void applyTo(PreferenceGroup parent) {
- Set modifiedPrefs = mSharedPreferences.getAll().keySet();
+ Set modifiedPrefs = FlagsFactory.getSharedPreferences().getAll().keySet();
List flags = FlagsFactory.getDebugFlags();
flags.sort((f1, f2) -> {
// Sort first by any prefs that the user has changed, then alphabetically.
@@ -87,18 +81,41 @@ public final class FlagTogglerPrefUi {
: f1.key.compareToIgnoreCase(f2.key);
});
+ // Ensure that teamfood flag comes on the top
+ if (flags.remove(TEAMFOOD_FLAG)) {
+ flags.add(0, (DebugFlag) TEAMFOOD_FLAG);
+ }
+
// For flag overrides we only want to store when the engineer chose to override the
// flag with a different value than the default. That way, when we flip flags in
// future, engineers will pick up the new value immediately. To accomplish this, we use a
// custom preference data store.
for (DebugFlag flag : flags) {
- SwitchPreference switchPreference = new SwitchPreference(mContext);
+ SwitchPreference switchPreference = new SwitchPreference(mContext) {
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ holder.itemView.setOnLongClickListener(v -> {
+ FlagsFactory.getSharedPreferences().edit().remove(flag.key).apply();
+ setChecked(getFlagStateFromSharedPrefs(flag));
+ updateSummary(this, flag);
+ updateMenu();
+ return true;
+ });
+ }
+ };
switchPreference.setKey(flag.key);
- switchPreference.setDefaultValue(flag.defaultValue);
+ switchPreference.setDefaultValue(FlagsFactory.getEnabledValue(flag.defaultValue));
switchPreference.setChecked(getFlagStateFromSharedPrefs(flag));
switchPreference.setTitle(flag.key);
updateSummary(switchPreference, flag);
switchPreference.setPreferenceDataStore(mDataStore);
+ switchPreference.setOnPreferenceChangeListener((p, v) -> {
+ new Handler().post(() -> updateSummary(switchPreference, flag));
+ return true;
+ });
+
+
parent.addPreference(switchPreference);
}
updateMenu();
@@ -108,10 +125,15 @@ public final class FlagTogglerPrefUi {
* Updates the summary to show the description and whether the flag overrides the default value.
*/
private void updateSummary(SwitchPreference switchPreference, DebugFlag flag) {
- String onWarning = flag.defaultValue ? "" : "OVERRIDDEN
";
- String offWarning = flag.defaultValue ? "OVERRIDDEN
" : "";
- switchPreference.setSummaryOn(Html.fromHtml(onWarning + flag.description));
- switchPreference.setSummaryOff(Html.fromHtml(offWarning + flag.description));
+ String summary = flag.defaultValue == TEAMFOOD
+ ? "[TEAMFOOD] " : "";
+ if (FlagsFactory.getSharedPreferences().contains(flag.key)) {
+ summary += "[OVERRIDDEN] ";
+ }
+ if (!TextUtils.isEmpty(summary)) {
+ summary += "
";
+ }
+ switchPreference.setSummary(Html.fromHtml(summary + flag.description));
}
private void updateMenu() {
@@ -128,7 +150,7 @@ public final class FlagTogglerPrefUi {
public void onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_apply_flags) {
- mSharedPreferences.edit().commit();
+ FlagsFactory.getSharedPreferences().edit().commit();
Log.e(TAG,
"Killing launcher process " + Process.myPid() + " to apply new flag values");
System.exit(0);
@@ -143,7 +165,8 @@ public final class FlagTogglerPrefUi {
}
private boolean getFlagStateFromSharedPrefs(DebugFlag flag) {
- return mDataStore.getBoolean(flag.key, flag.defaultValue);
+ boolean defaultValue = FlagsFactory.getEnabledValue(flag.defaultValue);
+ return mDataStore.getBoolean(flag.key, defaultValue);
}
private boolean anyChanged() {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
index 888cc9d63a..a68e753589 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
@@ -18,6 +18,9 @@ package com.android.launcher3.uioverrides.flags;
import static android.app.ActivityThread.currentApplication;
+import static com.android.launcher3.BuildConfig.IS_DEBUG_DEVICE;
+import static com.android.launcher3.config.FeatureFlags.FlagState.DISABLED;
+import static com.android.launcher3.config.FeatureFlags.FlagState.ENABLED;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import android.content.Context;
@@ -26,8 +29,10 @@ import android.provider.DeviceConfig;
import android.provider.DeviceConfig.Properties;
import android.util.Log;
-import com.android.launcher3.Utilities;
+import androidx.annotation.NonNull;
+
import com.android.launcher3.config.FeatureFlags.BooleanFlag;
+import com.android.launcher3.config.FeatureFlags.FlagState;
import com.android.launcher3.config.FeatureFlags.IntFlag;
import com.android.launcher3.util.ScreenOnTracker;
@@ -46,12 +51,16 @@ public class FlagsFactory {
private static final String TAG = "FlagsFactory";
private static final FlagsFactory INSTANCE = new FlagsFactory();
- private static final boolean FLAG_AUTO_APPLY_ENABLED = false;
+ private static final boolean FLAG_AUTO_APPLY_ENABLED = true;
- public static final String FLAGS_PREF_NAME = "featureFlags";
+ private static final String FLAGS_PREF_NAME = "featureFlags";
public static final String NAMESPACE_LAUNCHER = "launcher";
private static final List sDebugFlags = new ArrayList<>();
+ private static SharedPreferences sSharedPreferences;
+
+ static final BooleanFlag TEAMFOOD_FLAG = getReleaseFlag(
+ 0, "LAUNCHER_TEAMFOOD", DISABLED, "Enable this flag to opt-in all team food flags");
private final Set mKeySet = new HashSet<>();
private boolean mRestartRequested = false;
@@ -64,35 +73,50 @@ public class FlagsFactory {
NAMESPACE_LAUNCHER, UI_HELPER_EXECUTOR, this::onPropertiesChanged);
}
- /**
- * Creates a new debug flag
- */
- public static BooleanFlag getDebugFlag(
- int bugId, String key, boolean defaultValue, String description) {
- if (Utilities.IS_DEBUG_DEVICE) {
- SharedPreferences prefs = currentApplication()
- .getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
- boolean currentValue = prefs.getBoolean(key, defaultValue);
- DebugFlag flag = new DebugFlag(key, description, defaultValue, currentValue);
- sDebugFlags.add(flag);
- return flag;
+ static boolean getEnabledValue(FlagState flagState) {
+ if (IS_DEBUG_DEVICE) {
+ switch (flagState) {
+ case ENABLED:
+ return true;
+ case TEAMFOOD:
+ return TEAMFOOD_FLAG.get();
+ default:
+ return false;
+ }
} else {
- return new BooleanFlag(defaultValue);
+ return flagState == ENABLED;
}
}
/**
- * Creates a new release flag
+ * Creates a new debug flag. Debug flags always take their default value in release builds. On
+ * dogfood builds, they can be manually turned on using the flag toggle UI.
+ */
+ public static BooleanFlag getDebugFlag(
+ int bugId, String key, FlagState flagState, String description) {
+ if (IS_DEBUG_DEVICE) {
+ boolean defaultValue = getEnabledValue(flagState);
+ boolean currentValue = getSharedPreferences().getBoolean(key, defaultValue);
+ DebugFlag flag = new DebugFlag(key, description, flagState, currentValue);
+ sDebugFlags.add(flag);
+ return flag;
+ } else {
+ return new BooleanFlag(getEnabledValue(flagState));
+ }
+ }
+
+ /**
+ * Creates a new release flag. Release flags can be rolled out using server configurations and
+ * also allow manual overrides on debug builds.
*/
public static BooleanFlag getReleaseFlag(
- int bugId, String key, boolean defaultValueInCode, String description) {
+ int bugId, String key, FlagState flagState, String description) {
INSTANCE.mKeySet.add(key);
+ boolean defaultValueInCode = getEnabledValue(flagState);
boolean defaultValue = DeviceConfig.getBoolean(NAMESPACE_LAUNCHER, key, defaultValueInCode);
- if (Utilities.IS_DEBUG_DEVICE) {
- SharedPreferences prefs = currentApplication()
- .getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
- boolean currentValue = prefs.getBoolean(key, defaultValue);
- DebugFlag flag = new DeviceFlag(key, description, defaultValue, currentValue,
+ if (IS_DEBUG_DEVICE) {
+ boolean currentValue = getSharedPreferences().getBoolean(key, defaultValue);
+ DebugFlag flag = new DeviceFlag(key, description, flagState, currentValue,
defaultValueInCode);
sDebugFlags.add(flag);
return flag;
@@ -111,7 +135,7 @@ public class FlagsFactory {
}
static List getDebugFlags() {
- if (!Utilities.IS_DEBUG_DEVICE) {
+ if (!IS_DEBUG_DEVICE) {
return Collections.emptyList();
}
synchronized (sDebugFlags) {
@@ -119,11 +143,22 @@ public class FlagsFactory {
}
}
+ /** Returns the SharedPreferences instance backing Debug FeatureFlags. */
+ @NonNull
+ static SharedPreferences getSharedPreferences() {
+ if (sSharedPreferences == null) {
+ sSharedPreferences = currentApplication()
+ .createDeviceProtectedStorageContext()
+ .getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
+ }
+ return sSharedPreferences;
+ }
+
/**
* Dumps the current flags state to the print writer
*/
public static void dump(PrintWriter pw) {
- if (!Utilities.IS_DEBUG_DEVICE) {
+ if (!IS_DEBUG_DEVICE) {
return;
}
pw.println("DeviceFlags:");
diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
index e3d386cae6..7f7871380d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
@@ -61,7 +61,7 @@ public class PluginManagerWrapper {
List privilegedPlugins = Collections.emptyList();
PluginInstance.Factory instanceFactory = new PluginInstance.Factory(
getClass().getClassLoader(), new PluginInstance.InstanceFactory<>(),
- new PluginInstance.VersionChecker(), privilegedPlugins,
+ new PluginInstance.VersionCheckerImpl(), privilegedPlugins,
Utilities.IS_DEBUG_DEVICE);
PluginActionManager.Factory instanceManagerFactory = new PluginActionManager.Factory(
c, c.getPackageManager(), c.getMainExecutor(), MODEL_EXECUTOR,
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index c7cd39c100..a8d7538687 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -94,8 +94,12 @@ public class QuickstepAtomicAnimationFactory extends
@Override
public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,
StateAnimationConfig config) {
+
RecentsView overview = mActivity.getOverviewPanel();
if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) {
+ overview.switchToScreenshot(() ->
+ overview.finishRecentsAnimation(true /* toRecents */, null));
+
if (fromState == OVERVIEW_SPLIT_SELECT) {
config.setInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN,
clampToProgress(EMPHASIZED_ACCELERATE, 0, 0.4f));
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 40dfd82f5d..8cbd6e8b47 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -41,11 +41,9 @@ import com.android.launcher3.allapps.AllAppsTransitionController;
import com.android.launcher3.anim.AnimatorPlaybackController;
import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.compat.AccessibilityManagerCompat;
-import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.touch.SingleAxisSwipeDetector;
import com.android.launcher3.util.TouchController;
import com.android.quickstep.TaskUtils;
-import com.android.quickstep.TopTaskTracker;
import com.android.quickstep.util.AnimatorControllerWithResistance;
import com.android.quickstep.util.OverviewToHomeAnim;
import com.android.quickstep.views.RecentsView;
@@ -108,11 +106,6 @@ public class NavBarToHomeTouchController implements TouchController,
if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {
return true;
}
- if (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
- && TopTaskTracker.INSTANCE.get(mLauncher).getCachedTopTask(false)
- .isExcludedAssistant()) {
- return true;
- }
return false;
}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 847114a960..80f5558315 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,11 +15,16 @@
*/
package com.android.launcher3.uioverrides.touchcontrollers;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+
import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
import static com.android.launcher3.LauncherState.QUICK_SWITCH_FROM_HOME;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadFourFingerSwipe;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
@@ -105,6 +110,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
newCancelListener(this::clearState);
private boolean mNoIntercept;
+ private Boolean mIsTrackpadFourFingerSwipe;
private LauncherState mStartState;
private boolean mIsHomeScreenVisible = true;
@@ -130,7 +136,9 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
@Override
public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
- if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+ int action = ev.getActionMasked();
+ if (action == ACTION_DOWN) {
+ mIsTrackpadFourFingerSwipe = null;
mNoIntercept = !canInterceptTouch(ev);
if (mNoIntercept) {
return false;
@@ -139,6 +147,13 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
// Only detect horizontal swipe for intercept, then we will allow swipe up as well.
mSwipeDetector.setDetectableScrollConditions(DIRECTION_RIGHT,
false /* ignoreSlopWhenSettling */);
+ } else if (isTrackpadMultiFingerSwipe(ev) && mIsTrackpadFourFingerSwipe == null
+ && action == ACTION_MOVE) {
+ mIsTrackpadFourFingerSwipe = isTrackpadFourFingerSwipe(ev);
+ mNoIntercept = !mIsTrackpadFourFingerSwipe;
+ if (mNoIntercept) {
+ return false;
+ }
}
if (mNoIntercept) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index 1bc789bd6e..395833ffea 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -90,10 +90,11 @@ public class StatusBarTouchController implements TouchController {
if (!mCanIntercept) {
return false;
}
+ mDownEvents.clear();
mDownEvents.put(pid, new PointF(ev.getX(), ev.getY()));
} else if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) {
- // Check!! should only set it only when threshold is not entered.
- mDownEvents.put(pid, new PointF(ev.getX(idx), ev.getY(idx)));
+ // Check!! should only set it only when threshold is not entered.
+ mDownEvents.put(pid, new PointF(ev.getX(idx), ev.getY(idx)));
}
if (!mCanIntercept) {
return false;
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index f3fb259aa5..43db7c380c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -39,6 +39,7 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
+import static com.android.quickstep.GestureState.GestureEndTarget.ALL_APPS;
import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK;
@@ -62,6 +63,7 @@ import android.animation.ValueAnimator;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ActivityManager;
+import android.app.TaskInfo;
import android.app.WindowConfiguration;
import android.content.Context;
import android.content.Intent;
@@ -104,6 +106,7 @@ import com.android.launcher3.statemanager.StatefulActivity;
import com.android.launcher3.taskbar.TaskbarUIController;
import com.android.launcher3.tracing.InputConsumerProto;
import com.android.launcher3.tracing.SwipeHandlerProto;
+import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.TraceHelper;
@@ -135,6 +138,7 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
+import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.shared.system.TaskStackChangeListeners;
import com.android.wm.shell.common.TransactionPool;
@@ -143,6 +147,7 @@ import com.android.wm.shell.startingsurface.SplashScreenExitAnimationUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Objects;
import java.util.Optional;
import java.util.function.Consumer;
@@ -158,6 +163,9 @@ public abstract class AbsSwipeUpHandler,
private static final ArrayList STATE_NAMES = new ArrayList<>();
+ /** Shift distance to transition to All Apps if ENABLE_ALL_APPS_FROM_OVERVIEW. */
+ public static final float ALL_APPS_SHIFT_THRESHOLD = 2f;
+
protected final BaseActivityInterface mActivityInterface;
protected final InputConsumerProxy mInputConsumerProxy;
protected final ActivityInitListener mActivityInitListener;
@@ -170,7 +178,7 @@ public abstract class AbsSwipeUpHandler,
protected @Nullable RecentsAnimationController mDeferredCleanupRecentsAnimationController;
protected RecentsAnimationTargets mRecentsAnimationTargets;
protected T mActivity;
- protected Q mRecentsView;
+ protected @Nullable Q mRecentsView;
protected Runnable mGestureEndCallback;
protected MultiStateCallback mStateCallback;
protected boolean mCanceled;
@@ -244,6 +252,8 @@ public abstract class AbsSwipeUpHandler,
getNextStateFlag("STATE_CURRENT_TASK_FINISHED");
private static final int STATE_FINISH_WITH_NO_END =
getNextStateFlag("STATE_FINISH_WITH_NO_END");
+ private static final int STATE_SETTLED_ON_ALL_APPS =
+ getNextStateFlag("STATE_SETTLED_ON_ALL_APPS");
private static final int LAUNCHER_UI_STATES =
STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED |
@@ -295,8 +305,8 @@ public abstract class AbsSwipeUpHandler,
private boolean mGestureStarted;
private boolean mLogDirectionUpOrLeft = true;
- private PointF mDownPos;
private boolean mIsLikelyToStartNewTask;
+ private boolean mIsInAllAppsRegion;
private final long mTouchTimeMs;
private long mLauncherFrameDrawnTime;
@@ -325,6 +335,7 @@ public abstract class AbsSwipeUpHandler,
private boolean mCanSlowSwipeGoHome = true;
// Indicates whether the divider is shown, only used when split screen is activated.
private boolean mIsDividerShown = true;
+ private boolean mStartMovingTasks;
@Nullable
private RemoteAnimationTargets.ReleaseCheck mSwipePipToHomeReleaseCheck = null;
@@ -368,7 +379,7 @@ public abstract class AbsSwipeUpHandler,
mIsTaskbarAllAppsOpen = controller != null && controller.isTaskbarAllAppsOpen();
mTaskbarAppWindowThreshold =
res.getDimensionPixelSize(R.dimen.taskbar_app_window_threshold);
- boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen;
+ boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen || mGestureState.isTrackpadGesture();
mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar
? 0
: res.getDimensionPixelSize(R.dimen.taskbar_home_overview_threshold);
@@ -430,6 +441,9 @@ public abstract class AbsSwipeUpHandler,
this::finishCurrentTransitionToHome);
mStateCallback.runOnceAtState(STATE_SCALED_CONTROLLER_HOME | STATE_CURRENT_TASK_FINISHED,
this::reset);
+ mStateCallback.runOnceAtState(STATE_SETTLED_ON_ALL_APPS | STATE_SCREENSHOT_CAPTURED
+ | STATE_GESTURE_COMPLETED,
+ this::finishCurrentTransitionToAllApps);
mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_APP_CONTROLLER_RECEIVED
| STATE_LAUNCHER_DRAWN | STATE_SCALED_CONTROLLER_RECENTS
@@ -623,7 +637,7 @@ public abstract class AbsSwipeUpHandler,
mActivityInterface);
});
- notifyGestureStartedAsync();
+ notifyGestureStarted();
}
private void onDeferredActivityLaunch() {
@@ -649,6 +663,14 @@ public abstract class AbsSwipeUpHandler,
} else {
runningTasks = mGestureState.getRunningTask().getPlaceholderTasks();
}
+
+ // Safeguard against any null tasks being sent to recents view, happens when quickswitching
+ // very quickly w/ split tasks because TopTaskTracker provides stale information compared to
+ // actual running tasks in the recents animation.
+ // TODO(b/236226779), Proper fix (ag/22237143)
+ if (Arrays.stream(runningTasks).anyMatch(Objects::isNull)) {
+ return;
+ }
mRecentsView.onGestureAnimationStart(runningTasks, mDeviceState.getRotationTouchHelper());
}
@@ -679,7 +701,9 @@ public abstract class AbsSwipeUpHandler,
maybeUpdateRecentsAttachedState(true/* animate */, true/* moveRunningTask */);
Optional.ofNullable(mActivityInterface.getTaskbarController())
.ifPresent(TaskbarUIController::startTranslationSpring);
- performHapticFeedback();
+ if (!mIsInAllAppsRegion) {
+ performHapticFeedback();
+ }
}
@Override
@@ -693,7 +717,7 @@ public abstract class AbsSwipeUpHandler,
maybeUpdateRecentsAttachedState(true /* animate */);
}
- private void maybeUpdateRecentsAttachedState(boolean animate) {
+ protected void maybeUpdateRecentsAttachedState(boolean animate) {
maybeUpdateRecentsAttachedState(animate, false /* moveRunningTask */);
}
@@ -714,7 +738,9 @@ public abstract class AbsSwipeUpHandler,
? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
: null;
final boolean recentsAttachedToAppWindow;
- if (mGestureState.getEndTarget() != null) {
+ if (mIsInAllAppsRegion) {
+ recentsAttachedToAppWindow = false;
+ } else if (mGestureState.getEndTarget() != null) {
recentsAttachedToAppWindow = mGestureState.getEndTarget().recentsAttachedToAppWindow;
} else if (mContinuingLastGesture
&& mRecentsView.getRunningTaskIndex() != mRecentsView.getNextPage()) {
@@ -770,6 +796,26 @@ public abstract class AbsSwipeUpHandler,
}
}
+ /**
+ * Update whether user is currently dragging in a region that will trigger all apps.
+ */
+ private void setIsInAllAppsRegion(boolean isInAllAppsRegion) {
+ if (mIsInAllAppsRegion == isInAllAppsRegion
+ || !mActivityInterface.allowAllAppsFromOverview()) {
+ return;
+ }
+ mIsInAllAppsRegion = isInAllAppsRegion;
+
+ // Newly entering or exiting the zone - do haptic and animate recent tasks.
+ VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
+ maybeUpdateRecentsAttachedState(true);
+
+ // Draw active task below Launcher so that All Apps can appear over it.
+ runActionOnRemoteHandles(remoteTargetHandle ->
+ remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(isInAllAppsRegion));
+ }
+
+
private void buildAnimationController() {
if (!canCreateNewOrUpdateExistingLauncherTransitionController()) {
return;
@@ -784,16 +830,22 @@ public abstract class AbsSwipeUpHandler,
* @return Whether we can create the launcher controller or update its progress.
*/
private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
- return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
+ return mGestureState.getEndTarget() != HOME
+ && !mHasEndedLauncherTransition && mActivity != null;
}
@Override
public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
WindowInsets result = view.onApplyWindowInsets(windowInsets);
+ // Don't rebuild animation when we are animating the IME, because it will cause a loop
+ // where the insets change -> animation changes (updating ime) -> insets change -> ...
+ if (windowInsets.isVisible(WindowInsets.Type.ime())) {
+ return result;
+ }
buildAnimationController();
// Reapply the current shift to ensure it takes new insets into account, e.g. when long
// pressing to stash taskbar without moving the finger.
- updateFinalShift();
+ onCurrentShiftUpdated();
return result;
}
@@ -820,7 +872,8 @@ public abstract class AbsSwipeUpHandler,
*/
@UiThread
@Override
- public void updateFinalShift() {
+ public void onCurrentShiftUpdated() {
+ setIsInAllAppsRegion(mCurrentShift.value >= ALL_APPS_SHIFT_THRESHOLD);
updateSysUiFlags(mCurrentShift.value);
applyScrollAndTransform();
@@ -872,7 +925,12 @@ public abstract class AbsSwipeUpHandler,
if (DesktopTaskView.DESKTOP_MODE_SUPPORTED && targets.hasDesktopTasks()) {
mRemoteTargetHandles = mTargetGluer.assignTargetsForDesktop(targets);
} else {
+ int untrimmedAppCount = mRemoteTargetHandles.length;
mRemoteTargetHandles = mTargetGluer.assignTargetsForSplitScreen(targets);
+ if (mRemoteTargetHandles.length < untrimmedAppCount && mIsSwipeForSplit) {
+ updateIsGestureForSplit(mRemoteTargetHandles.length);
+ setupRecentsViewUi();
+ }
}
mRecentsAnimationController = controller;
mRecentsAnimationTargets = targets;
@@ -960,7 +1018,7 @@ public abstract class AbsSwipeUpHandler,
}
});
}
- notifyGestureStartedAsync();
+ notifyGestureStarted();
setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
if (mIsTransientTaskbar && !mTaskbarAlreadyOpen && !isLikelyToStartNewTask) {
@@ -993,7 +1051,7 @@ public abstract class AbsSwipeUpHandler,
* Notifies the launcher that the swipe gesture has started. This can be called multiple times.
*/
@UiThread
- private void notifyGestureStartedAsync() {
+ private void notifyGestureStarted() {
final T curActivity = mActivity;
if (curActivity != null) {
// Once the gesture starts, we can no longer transition home through the button, so
@@ -1016,10 +1074,9 @@ public abstract class AbsSwipeUpHandler,
* @param endVelocityPxPerMs The velocity in the direction of the nav bar to the middle of the
* screen.
* @param velocityPxPerMs The x and y components of the velocity when the gesture ends.
- * @param downPos The x and y value of where the gesture started.
*/
@UiThread
- public void onGestureEnded(float endVelocityPxPerMs, PointF velocityPxPerMs, PointF downPos) {
+ public void onGestureEnded(float endVelocityPxPerMs, PointF velocityPxPerMs) {
float flingThreshold = mContext.getResources()
.getDimension(R.dimen.quickstep_fling_threshold_speed);
boolean isFling = mGestureStarted && !mIsMotionPaused
@@ -1031,7 +1088,6 @@ public abstract class AbsSwipeUpHandler,
} else {
mLogDirectionUpOrLeft = velocityPxPerMs.x < 0;
}
- mDownPos = downPos;
Runnable handleNormalGestureEndCallback = () -> handleNormalGestureEnd(
endVelocityPxPerMs, isFling, velocityPxPerMs, /* isCancel= */ false);
if (mRecentsView != null) {
@@ -1085,6 +1141,9 @@ public abstract class AbsSwipeUpHandler,
}
switch (endTarget) {
+ case ALL_APPS:
+ mStateCallback.setState(STATE_SETTLED_ON_ALL_APPS | STATE_CAPTURE_SCREENSHOT);
+ break;
case HOME:
mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);
// Notify the SysUI to use fade-in animation when entering PiP
@@ -1173,6 +1232,9 @@ public abstract class AbsSwipeUpHandler,
final boolean willGoToNewTask =
isScrollingToNewTask() && Math.abs(velocity.x) > Math.abs(endVelocity);
final boolean isSwipeUp = endVelocity < 0;
+ if (mIsInAllAppsRegion) {
+ return isSwipeUp ? ALL_APPS : LAST_TASK;
+ }
if (!isSwipeUp) {
final boolean isCenteredOnNewTask =
mRecentsView.getDestinationPage() != mRecentsView.getRunningTaskIndex();
@@ -1188,7 +1250,9 @@ public abstract class AbsSwipeUpHandler,
// Fully gestural mode.
final boolean isFlingX = Math.abs(velocity.x) > mContext.getResources()
.getDimension(R.dimen.quickstep_fling_threshold_speed);
- if (isScrollingToNewTask && isFlingX) {
+ if (mIsInAllAppsRegion) {
+ return ALL_APPS;
+ } else if (isScrollingToNewTask && isFlingX) {
// Flinging towards new task takes precedence over mIsMotionPaused (which only
// checks y-velocity).
return NEW_TASK;
@@ -1236,7 +1300,8 @@ public abstract class AbsSwipeUpHandler,
mGestureState.setEndTarget(endTarget, false /* isAtomic */);
mAnimationFactory.setEndTarget(endTarget);
- float endShift = endTarget.isLauncher ? 1 : 0;
+ float endShift = endTarget == ALL_APPS ? mDragLengthFactor
+ : endTarget.isLauncher ? 1 : 0;
final float startShift;
if (!isFling) {
long expectedDuration = Math.abs(Math.round((endShift - currentShift)
@@ -1325,7 +1390,7 @@ public abstract class AbsSwipeUpHandler,
}
private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) {
- if (mDp == null || !mDp.isGestureMode || mDownPos == null) {
+ if (mDp == null || !mDp.isGestureMode) {
// We probably never received an animation controller, skip logging.
return;
}
@@ -1348,7 +1413,10 @@ public abstract class AbsSwipeUpHandler,
}
StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
.withSrcState(LAUNCHER_STATE_BACKGROUND)
- .withDstState(endTarget.containerType);
+ .withDstState(endTarget.containerType)
+ .withInputType(mGestureState.isTrackpadGesture()
+ ? SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__TRACKPAD
+ : SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__TOUCH);
if (targetTask != null) {
logger.withItemInfo(targetTask.getItemInfo());
}
@@ -1447,6 +1515,20 @@ public abstract class AbsSwipeUpHandler,
if (mSwipePipToHomeReleaseCheck != null) {
mSwipePipToHomeReleaseCheck.setCanRelease(false);
}
+
+ // grab a screenshot before the PipContentOverlay gets parented on top of the task
+ UI_HELPER_EXECUTOR.execute(() -> {
+ mTaskSnapshot = mRecentsAnimationController.screenshotTask(
+ mGestureState.getRunningTaskId());
+ });
+
+ // let SystemUi reparent the overlay leash as soon as possible
+ SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
+ mSwipePipToHomeAnimator.getTaskId(),
+ mSwipePipToHomeAnimator.getComponentName(),
+ mSwipePipToHomeAnimator.getDestinationBounds(),
+ mSwipePipToHomeAnimator.getContentOverlay());
+
windowAnim = mSwipePipToHomeAnimators;
} else {
mSwipePipToHomeAnimator = null;
@@ -1670,12 +1752,19 @@ public abstract class AbsSwipeUpHandler,
return keepClearArea;
}
+ /**
+ * Notifies to start intercepting touches in the app window and hide the divider bar if needed.
+ * @see RecentsAnimationController#enableInputConsumer()
+ */
private void startInterceptingTouchesForGesture() {
- if (mRecentsAnimationController == null) {
+ if (mRecentsAnimationController == null || !mStartMovingTasks) {
return;
}
mRecentsAnimationController.enableInputConsumer();
+
+ // Hide the divider as it starts intercepting touches in the app window.
+ setDividerShown(false);
}
private void computeRecentsScrollIfInvisible() {
@@ -1790,6 +1879,12 @@ public abstract class AbsSwipeUpHandler,
reset();
}
+ @UiThread
+ private void finishCurrentTransitionToAllApps() {
+ finishCurrentTransitionToHome();
+ reset();
+ }
+
private void reset() {
mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
if (mActivity != null) {
@@ -1837,7 +1932,9 @@ public abstract class AbsSwipeUpHandler,
private void invalidateHandlerWithLauncher() {
endLauncherTransitionController();
- mRecentsView.onGestureAnimationEnd();
+ if (mRecentsView != null) {
+ mRecentsView.onGestureAnimationEnd();
+ }
resetLauncherListeners();
}
@@ -1864,7 +1961,9 @@ public abstract class AbsSwipeUpHandler,
private void resetLauncherListeners() {
mActivity.getRootView().setOnApplyWindowInsetsListener(null);
- mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
+ if (mRecentsView != null) {
+ mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
+ }
}
private void resetStateForAnimationCancel() {
@@ -1923,7 +2022,10 @@ public abstract class AbsSwipeUpHandler,
private boolean updateThumbnail(int runningTaskId, boolean refreshView) {
boolean finishTransitionPosted = false;
final TaskView taskView;
- if (mGestureState.getEndTarget() == HOME || mGestureState.getEndTarget() == NEW_TASK) {
+ if (mGestureState.getEndTarget() == HOME
+ || mGestureState.getEndTarget() == NEW_TASK
+ || mGestureState.getEndTarget() == ALL_APPS
+ || mRecentsView == null) {
// Capture the screenshot before finishing the transition to home or quickswitching to
// ensure it's taken in the correct orientation, but no need to update the thumbnail.
taskView = null;
@@ -1968,8 +2070,9 @@ public abstract class AbsSwipeUpHandler,
if (!hasTargets() || mRecentsAnimationController == null) {
// If there are no targets or the animation not started, then there is nothing to finish
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
+ maybeAbortSwipePipToHome();
} else {
- maybeFinishSwipeToHome();
+ maybeFinishSwipePipToHome();
finishRecentsControllerToHome(
() -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
}
@@ -1980,18 +2083,26 @@ public abstract class AbsSwipeUpHandler,
doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
}
+ /**
+ * Notifies SysUI that transition is aborted if applicable and also pass leash transactions
+ * from Launcher to WM.
+ */
+ private void maybeAbortSwipePipToHome() {
+ if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {
+ SystemUiProxy.INSTANCE.get(mContext).abortSwipePipToHome(
+ mSwipePipToHomeAnimator.getTaskId(),
+ mSwipePipToHomeAnimator.getComponentName());
+ mIsSwipingPipToHome = false;
+ }
+ }
+
/**
* Notifies SysUI that transition is finished if applicable and also pass leash transactions
* from Launcher to WM.
* This should happen before {@link #finishRecentsControllerToHome(Runnable)}.
*/
- private void maybeFinishSwipeToHome() {
+ private void maybeFinishSwipePipToHome() {
if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {
- SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
- mSwipePipToHomeAnimator.getTaskId(),
- mSwipePipToHomeAnimator.getComponentName(),
- mSwipePipToHomeAnimator.getDestinationBounds(),
- mSwipePipToHomeAnimator.getContentOverlay());
mRecentsAnimationController.setFinishTaskTransaction(
mSwipePipToHomeAnimator.getTaskId(),
mSwipePipToHomeAnimator.getFinishTransaction(),
@@ -2049,38 +2160,44 @@ public abstract class AbsSwipeUpHandler,
}
protected void linkRecentsViewScroll() {
- SurfaceTransactionApplier.create(mRecentsView, applier -> {
- runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams()
- .setSyncTransactionApplier(applier));
- runOnRecentsAnimationAndLauncherBound(() ->
- mRecentsAnimationTargets.addReleaseCheck(applier));
- });
+ SurfaceTransactionApplier applier = new SurfaceTransactionApplier(mRecentsView);
+ runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams()
+ .setSyncTransactionApplier(applier));
+ runOnRecentsAnimationAndLauncherBound(() ->
+ mRecentsAnimationTargets.addReleaseCheck(applier));
mRecentsView.addOnScrollChangedListener(mOnRecentsScrollListener);
runOnRecentsAnimationAndLauncherBound(() ->
mRecentsView.setRecentsAnimationTargets(mRecentsAnimationController,
mRecentsAnimationTargets));
- mRecentsViewScrollLinked = true;
+
+ // Disable scrolling in RecentsView for trackpad 3-finger swipe up gesture.
+ if (!mGestureState.isThreeFingerTrackpadGesture()) {
+ mRecentsViewScrollLinked = true;
+ }
}
private void onRecentsViewScroll() {
if (moveWindowWithRecentsScroll()) {
- updateFinalShift();
+ onCurrentShiftUpdated();
}
}
protected void startNewTask(Consumer resultCallback) {
// Launch the task user scrolled to (mRecentsView.getNextPage()).
if (!mCanceled) {
- TaskView nextTask = mRecentsView.getNextPageTaskView();
+ TaskView nextTask = mRecentsView == null ? null : mRecentsView.getNextPageTaskView();
if (nextTask != null) {
- int taskId = nextTask.getTask().key.id;
+ Task.TaskKey nextTaskKey = nextTask.getTask().key;
+ int taskId = nextTaskKey.id;
mGestureState.updateLastStartedTaskId(taskId);
boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()
.contains(taskId);
if (!hasTaskPreviouslyAppeared) {
ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED);
}
+ ActiveGestureLog.INSTANCE.addLog("Launching task: id=" + taskId
+ + " pkg=" + nextTaskKey.getPackageName());
nextTask.launchTask(success -> {
resultCallback.accept(success);
if (success) {
@@ -2149,24 +2266,43 @@ public abstract class AbsSwipeUpHandler,
@Override
public void onTasksAppeared(RemoteAnimationTarget[] appearedTaskTargets) {
if (mRecentsAnimationController != null) {
- if (handleTaskAppeared(appearedTaskTargets)) {
+ boolean hasStartedTaskBefore = Arrays.stream(appearedTaskTargets).anyMatch(
+ targetCompat -> targetCompat.taskId == mGestureState.getLastStartedTaskId());
+ if (!mStateCallback.hasStates(STATE_GESTURE_COMPLETED) && !hasStartedTaskBefore) {
+ // This is a special case, if a task is started mid-gesture that wasn't a part of a
+ // previous quickswitch task launch, then cancel the animation back to the app
+ RemoteAnimationTarget appearedTaskTarget = appearedTaskTargets[0];
+ TaskInfo taskInfo = appearedTaskTarget.taskInfo;
+ ActiveGestureLog.INSTANCE.addLog("Unexpected task appeared"
+ + " id=" + taskInfo.taskId
+ + " pkg=" + taskInfo.baseIntent.getComponent().getPackageName());
+ finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */);
+ } else if (handleTaskAppeared(appearedTaskTargets)) {
Optional taskTargetOptional =
Arrays.stream(appearedTaskTargets)
.filter(targetCompat ->
targetCompat.taskId == mGestureState.getLastStartedTaskId())
.findFirst();
if (!taskTargetOptional.isPresent()) {
- finishRecentsAnimationOnTasksAppeared();
+ ActiveGestureLog.INSTANCE.addLog("No appeared task matching started task id");
+ finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */);
return;
}
RemoteAnimationTarget taskTarget = taskTargetOptional.get();
- TaskView taskView = mRecentsView.getTaskViewByTaskId(taskTarget.taskId);
+ TaskView taskView = mRecentsView == null
+ ? null : mRecentsView.getTaskViewByTaskId(taskTarget.taskId);
if (taskView == null || !taskView.getThumbnail().shouldShowSplashView()) {
- finishRecentsAnimationOnTasksAppeared();
+ ActiveGestureLog.INSTANCE.addLog("Invalid task view splash state");
+ finishRecentsAnimationOnTasksAppeared(null /* onFinishComplete */);
return;
}
ViewGroup splashView = mActivity.getDragLayer();
+ final QuickstepLauncher quickstepLauncher = mActivity instanceof QuickstepLauncher
+ ? (QuickstepLauncher) mActivity : null;
+ if (quickstepLauncher != null) {
+ quickstepLauncher.getDepthController().pauseBlursOnWindows(true);
+ }
// When revealing the app with launcher splash screen, make the app visible
// and behind the splash view before the splash is animated away.
@@ -2174,7 +2310,7 @@ public abstract class AbsSwipeUpHandler,
new SurfaceTransactionApplier(splashView);
SurfaceTransaction transaction = new SurfaceTransaction();
for (RemoteAnimationTarget target : appearedTaskTargets) {
- transaction.forSurface(target.leash).setAlpha(1).setLayer(-1);
+ transaction.forSurface(target.leash).setAlpha(1).setLayer(-1).setShow();
}
surfaceApplier.scheduleApply(transaction);
@@ -2186,18 +2322,27 @@ public abstract class AbsSwipeUpHandler,
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- finishRecentsAnimationOnTasksAppeared();
+ // Hiding launcher which shows the app surface behind, then
+ // finishing recents to the app. After transition finish, showing
+ // the views on launcher again, so it can be visible when next
+ // animation starts.
+ splashView.setAlpha(0);
+ if (quickstepLauncher != null) {
+ quickstepLauncher.getDepthController()
+ .pauseBlursOnWindows(false);
+ }
+ finishRecentsAnimationOnTasksAppeared(() -> splashView.setAlpha(1));
}
});
}
}
}
- private void finishRecentsAnimationOnTasksAppeared() {
+ private void finishRecentsAnimationOnTasksAppeared(Runnable onFinishComplete) {
if (mRecentsAnimationController != null) {
- mRecentsAnimationController.finish(false /* toRecents */, null /* onFinishComplete */);
+ mRecentsAnimationController.finish(false /* toRecents */, onFinishComplete);
}
- ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
+ ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimationOnTasksAppeared");
}
/**
@@ -2205,9 +2350,11 @@ public abstract class AbsSwipeUpHandler,
* resume if we finish the controller.
*/
protected int getLastAppearedTaskIndex() {
- return mGestureState.getLastAppearedTaskId() != -1
- ? mRecentsView.getTaskIndexForId(mGestureState.getLastAppearedTaskId())
- : mRecentsView.getRunningTaskIndex();
+ return mRecentsView == null
+ ? -1
+ : mGestureState.getLastAppearedTaskId() != -1
+ ? mRecentsView.getTaskIndexForId(mGestureState.getLastAppearedTaskId())
+ : mRecentsView.getRunningTaskIndex();
}
/**
@@ -2240,9 +2387,9 @@ public abstract class AbsSwipeUpHandler,
boolean setRecentsScroll = mRecentsViewScrollLinked && mRecentsView != null;
float progress = Math.max(mCurrentShift.value, getScaleProgressDueToScroll());
int scrollOffset = setRecentsScroll ? mRecentsView.getScrollOffset() : 0;
- if (progress > 0 || scrollOffset != 0) {
- // Hide the divider as the tasks start moving.
- setDividerShown(false);
+ if (!mStartMovingTasks && (progress > 0 || scrollOffset != 0)) {
+ mStartMovingTasks = true;
+ startInterceptingTouchesForGesture();
}
for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) {
AnimatorControllerWithResistance playbackController =
@@ -2303,7 +2450,7 @@ public abstract class AbsSwipeUpHandler,
return displacement;
}
- if (mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen) {
+ if (mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen || mGestureState.isTrackpadGesture()) {
return displacement;
}
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index ce41c60e89..60083c67e7 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -16,6 +16,7 @@
package com.android.quickstep;
import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
import static com.android.launcher3.anim.Interpolators.ACCEL_2;
import static com.android.launcher3.anim.Interpolators.INSTANT;
import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -186,8 +187,12 @@ public abstract class BaseActivityInterface TYPE_NO_OP;
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index ea9f032000..0e0b02262b 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -15,6 +15,7 @@
*/
package com.android.quickstep;
+import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.BACKGROUND_APP;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -39,6 +40,7 @@ import com.android.launcher3.LauncherAnimUtils;
import com.android.launcher3.LauncherInitListener;
import com.android.launcher3.LauncherState;
import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.statehandlers.DesktopVisibilityController;
import com.android.launcher3.statemanager.StateManager;
@@ -263,6 +265,11 @@ public final class LauncherActivityInterface extends
return true;
}
+ @Override
+ public boolean allowAllAppsFromOverview() {
+ return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get();
+ }
+
@Override
public boolean isInLiveTileMode() {
Launcher launcher = getCreatedActivity();
@@ -347,6 +354,8 @@ public final class LauncherActivityInterface extends
case NEW_TASK:
case LAST_TASK:
return BACKGROUND_APP;
+ case ALL_APPS:
+ return ALL_APPS;
case HOME:
default:
return NORMAL;
diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
index 03042c95fb..c18ad5a626 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -16,6 +16,9 @@
package com.android.quickstep;
+import static android.view.RemoteAnimationTarget.MODE_CLOSING;
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
+
import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
@@ -30,9 +33,15 @@ import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.Handler;
+import android.os.RemoteException;
+import android.util.Log;
import android.util.Pair;
+import android.view.IRemoteAnimationFinishedCallback;
+import android.view.IRemoteAnimationRunner;
import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
+import android.view.View;
+import android.view.ViewRootImpl;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.window.BackEvent;
@@ -40,6 +49,7 @@ import android.window.BackMotionEvent;
import android.window.BackProgressAnimator;
import android.window.IOnBackInvokedCallback;
+import com.android.internal.view.AppearanceRegion;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.QuickstepTransitionManager;
import com.android.launcher3.R;
@@ -66,7 +76,12 @@ import com.android.systemui.shared.system.QuickStepContract;
*/
public class LauncherBackAnimationController {
private static final int CANCEL_TRANSITION_DURATION = 233;
- private static final float MIN_WINDOW_SCALE = 0.7f;
+ private static final int SCRIM_FADE_DURATION = 233;
+ private static final float MIN_WINDOW_SCALE = 0.85f;
+ private static final float MAX_SCRIM_ALPHA_DARK = 0.8f;
+ private static final float MAX_SCRIM_ALPHA_LIGHT = 0.2f;
+ private static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.20f;
+
private final QuickstepTransitionManager mQuickstepTransitionManager;
private final Matrix mTransformMatrix = new Matrix();
/** The window position at the beginning of the back animation. */
@@ -91,7 +106,12 @@ public class LauncherBackAnimationController {
private float mBackProgress = 0;
private boolean mBackInProgress = false;
private IOnBackInvokedCallback mBackCallback;
+ private IRemoteAnimationFinishedCallback mAnimationFinishedCallback;
private BackProgressAnimator mProgressAnimator = new BackProgressAnimator();
+ private SurfaceControl mScrimLayer;
+ private ValueAnimator mScrimAlphaAnimator;
+ private float mScrimAlpha;
+ private boolean mOverridingStatusBarFlags;
public LauncherBackAnimationController(
QuickstepLauncher launcher,
@@ -121,8 +141,8 @@ public class LauncherBackAnimationController {
@Override
public void onBackCancelled() {
handler.post(() -> {
- resetPositionAnimated();
- mProgressAnimator.reset();
+ mProgressAnimator.onBackCancelled(
+ LauncherBackAnimationController.this::resetPositionAnimated);
});
}
@@ -156,7 +176,26 @@ public class LauncherBackAnimationController {
});
}
};
- SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback);
+
+ final IRemoteAnimationRunner runner = new IRemoteAnimationRunner.Stub() {
+ @Override
+ public void onAnimationStart(int transit, RemoteAnimationTarget[] apps,
+ RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,
+ IRemoteAnimationFinishedCallback finishedCallback) {
+ for (final RemoteAnimationTarget target : apps) {
+ if (MODE_CLOSING == target.mode) {
+ mBackTarget = target;
+ break;
+ }
+ }
+ mAnimationFinishedCallback = finishedCallback;
+ }
+
+ @Override
+ public void onAnimationCancelled() {}
+ };
+
+ SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner);
}
private void resetPositionAnimated() {
@@ -171,6 +210,8 @@ public class LauncherBackAnimationController {
cancelAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
+ // Refresh the status bar appearance to the original one.
+ customizeStatusBarAppearance(false);
finishAnimation();
}
});
@@ -194,14 +235,50 @@ public class LauncherBackAnimationController {
return;
}
- mTransaction.show(appTarget.leash).apply();
- mTransaction.setAnimationTransaction();
+ mTransaction
+ .show(appTarget.leash)
+ .setAnimationTransaction();
mBackTarget = appTarget;
mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY());
// TODO(b/218916755): Offset start rectangle in multiwindow mode.
- mStartRect.set(mBackTarget.windowConfiguration.getMaxBounds());
+ mStartRect.set(appTarget.windowConfiguration.getMaxBounds());
mCurrentRect.set(mStartRect);
+ addScrimLayer();
+ mTransaction.apply();
+ }
+
+ void addScrimLayer() {
+ ViewRootImpl viewRootImpl = mLauncher.getDragLayer().getViewRootImpl();
+ SurfaceControl parent = viewRootImpl != null
+ ? viewRootImpl.getSurfaceControl()
+ : null;
+ boolean isDarkTheme = Utilities.isDarkTheme(mLauncher);
+ mScrimLayer = new SurfaceControl.Builder()
+ .setName("Back to launcher background scrim")
+ .setCallsite("LauncherBackAnimationController")
+ .setColorLayer()
+ .setParent(parent)
+ .setOpaque(false)
+ .setHidden(false)
+ .build();
+ final float[] colorComponents = new float[] { 0f, 0f, 0f };
+ mScrimAlpha = (isDarkTheme)
+ ? MAX_SCRIM_ALPHA_DARK : MAX_SCRIM_ALPHA_LIGHT;
+ mTransaction
+ .setColor(mScrimLayer, colorComponents)
+ .setAlpha(mScrimLayer, mScrimAlpha)
+ .show(mScrimLayer);
+ }
+
+ void removeScrimLayer() {
+ if (mScrimLayer == null) {
+ return;
+ }
+ if (mScrimLayer.isValid()) {
+ mTransaction.remove(mScrimLayer).apply();
+ }
+ mScrimLayer = null;
}
private void updateBackProgress(float progress, BackEvent event) {
@@ -226,6 +303,8 @@ public class LauncherBackAnimationController {
float cornerRadius = Utilities.mapRange(
progress, mWindowScaleStartCornerRadius, mWindowScaleEndCornerRadius);
applyTransform(mCurrentRect, cornerRadius);
+
+ customizeStatusBarAppearance(progress > UPDATE_SYSUI_FLAGS_THRESHOLD);
}
private void updateCancelProgress(float progress) {
@@ -307,7 +386,21 @@ public class LauncherBackAnimationController {
mInitialTouchPos.set(0, 0);
mAnimatorSetInProgress = false;
mSpringAnimationInProgress = false;
- SystemUiProxy.INSTANCE.get(mLauncher).onBackToLauncherAnimationFinished();
+ // We don't call customizeStatusBarAppearance here to prevent the status bar update with
+ // the legacy appearance. It should be refreshed after the transition done.
+ mOverridingStatusBarFlags = false;
+ if (mAnimationFinishedCallback != null) {
+ try {
+ mAnimationFinishedCallback.onAnimationFinished();
+ } catch (RemoteException e) {
+ Log.w("ShellBackPreview", "Failed call onBackAnimationFinished", e);
+ }
+ mAnimationFinishedCallback = null;
+ }
+ if (mScrimAlphaAnimator != null && mScrimAlphaAnimator.isRunning()) {
+ mScrimAlphaAnimator.cancel();
+ mScrimAlphaAnimator = null;
+ }
}
private void startTransitionAnimations(RectFSpringAnim springAnim, AnimatorSet anim) {
@@ -331,12 +424,48 @@ public class LauncherBackAnimationController {
tryFinishBackAnimation();
}
});
+ mScrimAlphaAnimator = new ValueAnimator().ofFloat(1, 0);
+ mScrimAlphaAnimator.addUpdateListener(animation -> {
+ float value = (Float) animation.getAnimatedValue();
+ if (mScrimLayer.isValid()) {
+ mTransaction.setAlpha(mScrimLayer, value * mScrimAlpha);
+ mTransaction.apply();
+ }
+ });
+ mScrimAlphaAnimator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ resetScrim();
+ }
+ });
+ mScrimAlphaAnimator.setDuration(SCRIM_FADE_DURATION).start();
anim.start();
}
+ private void resetScrim() {
+ removeScrimLayer();
+ mScrimAlpha = 0;
+ }
+
private void tryFinishBackAnimation() {
if (!mSpringAnimationInProgress && !mAnimatorSetInProgress) {
finishAnimation();
}
}
+
+ private void customizeStatusBarAppearance(boolean overridingStatusBarFlags) {
+ if (mOverridingStatusBarFlags == overridingStatusBarFlags) {
+ return;
+ }
+
+ mOverridingStatusBarFlags = overridingStatusBarFlags;
+ final boolean isBackgroundDark =
+ (mLauncher.getWindow().getDecorView().getSystemUiVisibility()
+ & View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) == 0;
+ final AppearanceRegion region = mOverridingStatusBarFlags
+ ? new AppearanceRegion(!isBackgroundDark ? APPEARANCE_LIGHT_STATUS_BARS : 0,
+ mBackTarget.windowConfiguration.getBounds())
+ : null;
+ SystemUiProxy.INSTANCE.get(mLauncher).customizeStatusBarAppearance(region);
+ }
}
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 43ad175b6f..fd5c1a7a78 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -47,6 +47,7 @@ import com.android.launcher3.views.FloatingView;
import com.android.launcher3.widget.LauncherAppWidgetHostView;
import com.android.quickstep.util.RectFSpringAnim;
import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.util.TaskViewSimulator;
import com.android.quickstep.views.FloatingWidgetView;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.TaskView;
@@ -160,13 +161,16 @@ public class LauncherSwipeHandlerV2 extends
Rect crop = new Rect();
// We can assume there is only one remote target here because staged split never animates
// into the app icon, only into the homescreen
- mRemoteTargetHandles[0].getTaskViewSimulator().getCurrentCropRect().roundOut(crop);
+ RemoteTargetGluer.RemoteTargetHandle remoteTargetHandle = mRemoteTargetHandles[0];
+ TaskViewSimulator tvs = remoteTargetHandle.getTaskViewSimulator();
+ // This is to set up the inverse matrix in the simulator
+ tvs.apply(remoteTargetHandle.getTransformParams());
+ tvs.getCurrentCropRect().roundOut(crop);
Size windowSize = new Size(crop.width(), crop.height());
int fallbackBackgroundColor =
FloatingWidgetView.getDefaultBackgroundColor(mContext, runningTaskTarget);
FloatingWidgetView floatingWidgetView = FloatingWidgetView.getFloatingWidgetView(mActivity,
- hostView, backgroundLocation, windowSize,
- mRemoteTargetHandles[0].getTaskViewSimulator().getCurrentCornerRadius(),
+ hostView, backgroundLocation, windowSize, tvs.getCurrentCornerRadius(),
isTargetTranslucent, fallbackBackgroundColor);
return new FloatingViewHomeAnimationFactory(floatingWidgetView) {
diff --git a/quickstep/src/com/android/quickstep/MultiStateCallback.java b/quickstep/src/com/android/quickstep/MultiStateCallback.java
index a68bea2cc0..df42efcc4e 100644
--- a/quickstep/src/com/android/quickstep/MultiStateCallback.java
+++ b/quickstep/src/com/android/quickstep/MultiStateCallback.java
@@ -86,9 +86,7 @@ public class MultiStateCallback {
Log.d(TAG, "[" + System.identityHashCode(this) + "] Adding "
+ convertToFlagNames(stateFlag) + " to " + convertToFlagNames(mState));
}
- if (FeatureFlags.ENABLE_GESTURE_ERROR_DETECTION.get()) {
- trackGestureEvents(stateFlag);
- }
+ trackGestureEvents(stateFlag);
final int oldState = mState;
mState = mState | stateFlag;
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 5b85249dfa..07db194ff4 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -248,7 +248,8 @@ public class OverviewCommandHelper {
InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
}
- GestureState gestureState = mService.createGestureState(GestureState.DEFAULT_STATE);
+ GestureState gestureState = mService.createGestureState(GestureState.DEFAULT_STATE,
+ GestureState.TrackpadGestureType.NONE);
gestureState.setHandlingAtomicEvent(true);
AbsSwipeUpHandler interactionHandler = mService.getSwipeUpHandlerFactory()
.newHandler(gestureState, cmd.createTime);
@@ -261,7 +262,7 @@ public class OverviewCommandHelper {
public void onRecentsAnimationStart(RecentsAnimationController controller,
RecentsAnimationTargets targets) {
activityInterface.runOnInitBackgroundStateUI(() ->
- interactionHandler.onGestureEnded(0, new PointF(), new PointF()));
+ interactionHandler.onGestureEnded(0, new PointF()));
cmd.removeListener(this);
}
diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index 5391f4d46c..4c9cf8b897 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -1,6 +1,5 @@
package com.android.quickstep;
-import static com.android.launcher3.testing.shared.TestProtocol.NPE_TRANSIENT_TASKBAR;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import android.app.Activity;
@@ -8,7 +7,6 @@ import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect;
import android.os.Bundle;
-import android.util.Log;
import androidx.annotation.Nullable;
@@ -118,6 +116,16 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
return response;
}
+ case TestProtocol.REQUEST_STASHED_TASKBAR_SCALE: {
+ runOnTISBinder(tisBinder -> {
+ response.putFloat(TestProtocol.TEST_INFO_RESPONSE_FIELD,
+ tisBinder.getTaskbarManager()
+ .getCurrentActivityContext()
+ .getStashedTaskbarScale());
+ });
+ return response;
+ }
+
case TestProtocol.REQUEST_TASKBAR_ALL_APPS_TOP_PADDING: {
return getTISBinderUIProperty(Bundle::putInt, tisBinder ->
tisBinder.getTaskbarManager()
@@ -125,6 +133,13 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
.getTaskbarAllAppsTopPadding());
}
+ case TestProtocol.REQUEST_TASKBAR_APPS_LIST_SCROLL_Y: {
+ return getTISBinderUIProperty(Bundle::putInt, tisBinder ->
+ tisBinder.getTaskbarManager()
+ .getCurrentActivityContext()
+ .getTaskbarAllAppsScroll());
+ }
+
case TestProtocol.REQUEST_ENABLE_BLOCK_TIMEOUT:
runOnTISBinder(tisBinder -> {
enableBlockingTimeout(tisBinder, true);
@@ -144,6 +159,11 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
case TestProtocol.REQUEST_DISABLE_TRANSIENT_TASKBAR:
enableTransientTaskbar(false);
return response;
+
+ case TestProtocol.REQUEST_SHELL_DRAG_READY:
+ response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
+ SystemUiProxy.INSTANCE.get(mContext).isDragAndDropReady());
+ return response;
}
return super.call(method, arg, extras);
@@ -177,13 +197,9 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
TouchInteractionService.TISBinder tisBinder, boolean enable) {
TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();
if (context == null) {
- if (TestProtocol.sDebugTracing) {
- Log.d(NPE_TRANSIENT_TASKBAR, "enableBlockingTimeout: enable=" + enable,
- new Exception());
- }
- } else {
- context.enableBlockingTimeoutDuringTests(enable);
+ return;
}
+ context.enableBlockingTimeoutDuringTests(enable);
}
private void enableTransientTaskbar(boolean enable) {
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 3f8da56de4..39af7fd6dd 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -144,7 +144,9 @@ public final class RecentsActivity extends StatefulActivity {
private void onTISConnected(TouchInteractionService.TISBinder binder) {
mTaskbarManager = binder.getTaskbarManager();
- mTaskbarManager.setActivity(this);
+ if (mTaskbarManager != null) {
+ mTaskbarManager.setActivity(this);
+ }
}
@Override
@@ -267,7 +269,8 @@ public final class RecentsActivity extends StatefulActivity {
new RemoteAnimationAdapter(wrapper, RECENTS_LAUNCH_DURATION,
RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
- STATUS_BAR_TRANSITION_PRE_DELAY),
- new RemoteTransition(wrapper.toRemoteTransition(), getIApplicationThread()));
+ new RemoteTransition(wrapper.toRemoteTransition(), getIApplicationThread(),
+ "LaunchFromRecents"));
final ActivityOptionsWrapper activityOptions = new ActivityOptionsWrapper(options,
onEndCallback);
activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
@@ -405,7 +408,8 @@ public final class RecentsActivity extends StatefulActivity {
getMainThreadHandler(), mAnimationToHomeFactory, true);
ActivityOptions options = ActivityOptions.makeRemoteAnimation(
new RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0),
- new RemoteTransition(runner.toRemoteTransition(), getIApplicationThread()));
+ new RemoteTransition(runner.toRemoteTransition(), getIApplicationThread(),
+ "StartHomeFromRecents"));
startHomeIntentSafely(this, options.toBundle());
}
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
index b82ff03b34..2256cbf14b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
@@ -15,6 +15,9 @@
*/
package com.android.quickstep;
+import static android.view.RemoteAnimationTarget.MODE_CLOSING;
+import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
+
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;
@@ -34,6 +37,8 @@ import com.android.quickstep.util.ActiveGestureLog;
import com.android.systemui.shared.recents.model.ThumbnailData;
import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
@@ -98,15 +103,36 @@ public class RecentsAnimationCallbacks implements
RemoteAnimationTarget[] appTargets,
RemoteAnimationTarget[] wallpaperTargets,
Rect homeContentInsets, Rect minimizedHomeBounds) {
+ long appCount = Arrays.stream(appTargets)
+ .filter(app -> app.mode == MODE_CLOSING)
+ .count();
+ if (appCount == 0) {
+ // Edge case, if there are no closing app targets, then Launcher has nothing to handle
+ ActiveGestureLog.INSTANCE.addLog(
+ /* event= */ "RecentsAnimationCallbacks.onAnimationStart (canceled)",
+ /* extras= */ 0,
+ /* gestureEvent= */ START_RECENTS_ANIMATION);
+ notifyAnimationCanceled();
+ animationController.finish(false /* toHome */, false /* sendUserLeaveHint */);
+ return;
+ }
+
mController = new RecentsAnimationController(animationController,
mAllowMinimizeSplitScreen, this::onAnimationFinished);
-
if (mCancelled) {
Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(),
mController::finishAnimationToApp);
} else {
- RemoteAnimationTarget[] nonAppTargets =
- mSystemUiProxy.onGoingToRecentsLegacy(appTargets);
+ RemoteAnimationTarget[] nonAppTargets;
+ if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+ nonAppTargets = mSystemUiProxy.onGoingToRecentsLegacy(appTargets);
+ } else {
+ final ArrayList apps = new ArrayList<>();
+ final ArrayList nonApps = new ArrayList<>();
+ classifyTargets(appTargets, apps, nonApps);
+ appTargets = apps.toArray(new RemoteAnimationTarget[apps.size()]);
+ nonAppTargets = nonApps.toArray(new RemoteAnimationTarget[nonApps.size()]);
+ }
if (nonAppTargets == null) {
nonAppTargets = new RemoteAnimationTarget[0];
}
@@ -176,6 +202,18 @@ public class RecentsAnimationCallbacks implements
return mListeners.toArray(new RecentsAnimationListener[mListeners.size()]);
}
+ private void classifyTargets(RemoteAnimationTarget[] appTargets,
+ ArrayList apps, ArrayList nonApps) {
+ for (int i = 0; i < appTargets.length; i++) {
+ RemoteAnimationTarget target = appTargets[i];
+ if (target.windowType == TYPE_DOCK_DIVIDER) {
+ nonApps.add(target);
+ } else {
+ apps.add(target);
+ }
+ }
+ }
+
/**
* Listener for the recents animation callbacks.
*/
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 4adfae5ee8..f8e09e1e88 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -150,10 +150,17 @@ public class RecentsAnimationController {
@UiThread
public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint) {
- if (mFinishRequested) {
- // If finishing, add to pending finish callbacks, otherwise, if finished, adding to the
- // destroyed RunnableList will just trigger the callback to be called immediately
- mPendingFinishCallbacks.add(callback);
+ finishController(toRecents, callback, sendUserLeaveHint, false /* forceFinish */);
+ }
+
+ @UiThread
+ public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint,
+ boolean forceFinish) {
+ mPendingFinishCallbacks.add(callback);
+ if (!forceFinish && mFinishRequested) {
+ // If finish has already been requested, then add the callback to the pending list.
+ // If already finished, then adding it to the destroyed RunnableList will just
+ // trigger the callback to be called immediately
return;
}
ActiveGestureLog.INSTANCE.addLog(
@@ -165,15 +172,19 @@ public class RecentsAnimationController {
mFinishRequested = true;
mFinishTargetIsLauncher = toRecents;
mOnFinishedListener.accept(this);
- mPendingFinishCallbacks.add(callback);
- UI_HELPER_EXECUTOR.execute(() -> {
+ Runnable finishCb = () -> {
mController.finish(toRecents, sendUserLeaveHint);
InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
InteractionJankMonitorWrapper.end(
InteractionJankMonitorWrapper.CUJ_APP_SWIPE_TO_RECENTS);
MAIN_EXECUTOR.execute(mPendingFinishCallbacks::executeAllAndDestroy);
- });
+ };
+ if (forceFinish) {
+ finishCb.run();
+ } else {
+ UI_HELPER_EXECUTOR.execute(finishCb);
+ }
}
/**
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index d34153160d..64ec1d8a6d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -33,6 +33,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DIALOG_SHOWING;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
@@ -57,6 +58,7 @@ import android.os.SystemProperties;
import android.os.UserManager;
import android.provider.Settings;
import android.view.MotionEvent;
+import android.view.ViewConfiguration;
import androidx.annotation.BinderThread;
import androidx.annotation.NonNull;
@@ -86,6 +88,10 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
+ // TODO: Move to quickstep contract
+ private static final float QUICKSTEP_TOUCH_SLOP_RATIO_TWO_BUTTON = 9;
+ private static final float QUICKSTEP_TOUCH_SLOP_RATIO_GESTURAL = 2;
+
private final Context mContext;
private final DisplayController mDisplayController;
private final int mDisplayId;
@@ -97,7 +103,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
private final ArrayList mOnDestroyActions = new ArrayList<>();
- private @SystemUiStateFlags int mSystemUiStateFlags;
+ private @SystemUiStateFlags int mSystemUiStateFlags = QuickStepContract.SYSUI_STATE_AWAKE;
private NavigationMode mMode = THREE_BUTTONS;
private NavBarPosition mNavBarPosition;
@@ -386,7 +392,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
&& (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
&& ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0
- || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0);
+ || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0)
+ && (mSystemUiStateFlags & SYSUI_STATE_DEVICE_DREAMING) == 0;
}
/**
@@ -575,6 +582,19 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
&& ((mSystemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0);
}
+ /**
+ * Returns the touch slop for {@link InputConsumer}s to compare against before pilfering
+ * pointers. Note that this is squared because it expects to be compared against
+ * {@link com.android.launcher3.Utilities#squaredHypot} (to avoid square root on each event).
+ */
+ public float getSquaredTouchSlop() {
+ float slopMultiplier = isFullyGesturalNavMode()
+ ? QUICKSTEP_TOUCH_SLOP_RATIO_GESTURAL
+ : QUICKSTEP_TOUCH_SLOP_RATIO_TWO_BUTTON;
+ float touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();
+ return slopMultiplier * touchSlop * touchSlop;
+ }
+
public String getSystemUiStateString() {
return QuickStepContract.getSystemUiStateString(mSystemUiStateFlags);
}
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 913f08f41d..d798e62d02 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -145,6 +145,9 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener
* @param filter Returns true if GroupTask should be in the list of considerations
*/
public void isTaskRemoved(int taskId, Consumer callback, Predicate filter) {
+ // Invalidate the existing list before checking to ensure this reflects the current state in
+ // the system
+ mTaskList.onRecentTasksChanged();
mTaskList.getTasks(true /* loadKeysOnly */, (taskGroups) -> {
for (GroupTask group : taskGroups) {
if (group.containsTask(taskId)) {
diff --git a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java
index f30d3f14cc..84246e93c0 100644
--- a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java
+++ b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java
@@ -16,8 +16,10 @@
package com.android.quickstep;
+import android.app.WindowConfiguration;
import android.content.Context;
import android.graphics.Rect;
+import android.util.Log;
import android.view.RemoteAnimationTarget;
import androidx.annotation.Nullable;
@@ -29,12 +31,17 @@ import com.android.quickstep.util.TransformParams;
import com.android.quickstep.views.DesktopTaskView;
import java.util.ArrayList;
+import java.util.Arrays;
/**
* Glues together the necessary components to animate a remote target using a
* {@link TaskViewSimulator}
*/
public class RemoteTargetGluer {
+ private static final String TAG = "RemoteTargetGluer";
+
+ private static final int DEFAULT_NUM_HANDLES = 2;
+
private RemoteTargetHandle[] mRemoteTargetHandles;
private SplitBounds mSplitBounds;
@@ -52,17 +59,19 @@ public class RemoteTargetGluer {
*/
public RemoteTargetGluer(Context context, BaseActivityInterface sizingStrategy) {
if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {
- // TODO: binder call, only for prototyping. Creating the gluer should be postponed so
- // we can create it when we have the remote animation targets ready.
- int desktopTasks = SystemUiProxy.INSTANCE.get(context).getVisibleDesktopTaskCount();
+ // TODO(279931899): binder call, only for prototyping. Creating the gluer should be
+ // postponed so we can create it when we have the remote animation targets ready.
+ int desktopTasks = SystemUiProxy.INSTANCE.get(context).getVisibleDesktopTaskCount(
+ context.getDisplayId());
if (desktopTasks > 0) {
init(context, sizingStrategy, desktopTasks, true /* forDesktop */);
return;
}
}
- int[] splitIds = TopTaskTracker.INSTANCE.get(context).getRunningSplitTaskIds();
- init(context, sizingStrategy, splitIds.length == 2 ? 2 : 1, false /* forDesktop */);
+ // Assume 2 handles needed for split, scale down as needed later on when we actually
+ // get remote targets
+ init(context, sizingStrategy, DEFAULT_NUM_HANDLES, false /* forDesktop */);
}
private void init(Context context, BaseActivityInterface sizingStrategy, int numHandles,
@@ -107,7 +116,29 @@ public class RemoteTargetGluer {
* the left/top task, index 1 right/bottom.
*/
public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets targets) {
+ // Resize the mRemoteTargetHandles array since we started assuming split screen, but
+ // targets.apps is the ultimate source of truth here
+ long appCount = Arrays.stream(targets.apps)
+ .filter(app -> app.mode == targets.targetMode)
+ .count();
+ Log.d(TAG, "appCount: " + appCount + " handleLength: " + mRemoteTargetHandles.length);
+ if (appCount < mRemoteTargetHandles.length) {
+ Log.d(TAG, "resizing handles");
+ RemoteTargetHandle[] newHandles = new RemoteTargetHandle[(int) appCount];
+ System.arraycopy(mRemoteTargetHandles, 0/*src*/, newHandles, 0/*dst*/, (int) appCount);
+ mRemoteTargetHandles = newHandles;
+ }
+
+ boolean containsSplitTargets = Arrays.stream(targets.apps)
+ .anyMatch(remoteAnimationTarget ->
+ remoteAnimationTarget.windowConfiguration.getWindowingMode()
+ == WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);
+ Log.d(TAG, "containsSplitTargets? " + containsSplitTargets + " handleLength: " +
+ mRemoteTargetHandles.length + " appsLength: " + targets.apps.length);
+
if (mRemoteTargetHandles.length == 1) {
+ // Single fullscreen app
+
// If we're not in split screen, the splitIds count doesn't really matter since we
// should always hit this case.
mRemoteTargetHandles[0].mTransformParams.setTargetSet(targets);
@@ -115,13 +146,29 @@ public class RemoteTargetGluer {
// Unclear why/when target.apps length == 0, but it sure does happen :(
mRemoteTargetHandles[0].mTaskViewSimulator.setPreview(targets.apps[0], null);
}
+ } else if (!containsSplitTargets) {
+ // Single App + Assistant
+ for (int i = 0; i < mRemoteTargetHandles.length; i++) {
+ mRemoteTargetHandles[i].mTransformParams.setTargetSet(targets);
+ mRemoteTargetHandles[i].mTaskViewSimulator.setPreview(targets.apps[i], null);
+ }
} else {
- RemoteAnimationTarget topLeftTarget = targets.apps[0];
+ // Split apps (+ maybe assistant)
+ RemoteAnimationTarget topLeftTarget = Arrays.stream(targets.apps)
+ .filter(remoteAnimationTarget ->
+ remoteAnimationTarget.windowConfiguration.getWindowingMode()
+ == WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW)
+ .findFirst().get();
// Fetch the adjacent target for split screen.
RemoteAnimationTarget bottomRightTarget = null;
- for (int i = 1; i < targets.apps.length; i++) {
+ for (int i = 0; i < targets.apps.length; i++) {
final RemoteAnimationTarget target = targets.apps[i];
+ if (target.windowConfiguration.getWindowingMode() !=
+ WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW ||
+ target == topLeftTarget) {
+ continue;
+ }
Rect topLeftBounds = getStartBounds(topLeftTarget);
Rect bounds = getStartBounds(target);
if (topLeftBounds.left > bounds.right || topLeftBounds.top > bounds.bottom) {
@@ -232,6 +279,14 @@ public class RemoteTargetGluer {
targets.targetMode);
}
+ /**
+ * The object returned by this is may be modified in
+ * {@link #assignTargetsForSplitScreen(RemoteAnimationTargets)}, specifically the length of the
+ * array may be shortened based on the number of RemoteAnimationTargets present.
+ *
+ * This can be accessed at any time, however the count will be more accurate if accessed after
+ * calling one of the respective assignTargets*() methods
+ */
public RemoteTargetHandle[] getRemoteTargetHandles() {
return mRemoteTargetHandles;
}
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 4c66dbb66d..8626c40ae0 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Surface.ROTATION_0;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;
@@ -231,15 +232,19 @@ public class RotationTouchHelper implements DisplayInfoChangeListener {
/**
* @return whether the coordinates of the {@param event} is in the swipe up gesture region.
*/
- public boolean isInSwipeUpTouchRegion(MotionEvent event) {
- return mOrientationTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY());
+ public boolean isInSwipeUpTouchRegion(MotionEvent event, BaseActivityInterface activity) {
+ return isInSwipeUpTouchRegion(event, 0, activity);
}
/**
* @return whether the coordinates of the {@param event} with the given {@param pointerIndex}
* is in the swipe up gesture region.
*/
- public boolean isInSwipeUpTouchRegion(MotionEvent event, int pointerIndex) {
+ public boolean isInSwipeUpTouchRegion(MotionEvent event, int pointerIndex,
+ BaseActivityInterface activity) {
+ if (isTrackpadMultiFingerSwipe(event)) {
+ return true;
+ }
return mOrientationTouchTransformer.touchInValidSwipeRegions(event.getX(pointerIndex),
event.getY(pointerIndex));
}
@@ -345,7 +350,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener {
enableMultipleRegions(true);
}
activityInterface.onExitOverview(this, mExitOverviewRunnable);
- } else if (endTarget == GestureState.GestureEndTarget.HOME) {
+ } else if (endTarget == GestureState.GestureEndTarget.HOME
+ || endTarget == GestureState.GestureEndTarget.ALL_APPS) {
enableMultipleRegions(false);
} else if (endTarget == GestureState.GestureEndTarget.NEW_TASK) {
if (mOrientationTouchTransformer.getQuickStepStartingRotation() == -1) {
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index f913aff167..25ac47a45f 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -67,7 +67,7 @@ public abstract class SwipeUpAnimationLogic implements
// 0 => preview snapShot is completely visible, and hotseat is completely translated down
// 1 => preview snapShot is completely aligned with the recents view and hotseat is completely
// visible.
- protected final AnimatedFloat mCurrentShift = new AnimatedFloat(this::updateFinalShift);
+ protected final AnimatedFloat mCurrentShift = new AnimatedFloat(this::onCurrentShiftUpdated);
protected float mCurrentDisplacement;
// The distance needed to drag to reach the task size in recents.
@@ -82,7 +82,8 @@ public abstract class SwipeUpAnimationLogic implements
mContext = context;
mDeviceState = deviceState;
mGestureState = gestureState;
- mIsSwipeForSplit = TopTaskTracker.INSTANCE.get(context).getRunningSplitTaskIds().length > 1;
+ updateIsGestureForSplit(TopTaskTracker.INSTANCE.get(context)
+ .getRunningSplitTaskIds().length);
mTargetGluer = new RemoteTargetGluer(mContext, mGestureState.getActivityInterface());
mRemoteTargetHandles = mTargetGluer.getRemoteTargetHandles();
@@ -148,7 +149,7 @@ public abstract class SwipeUpAnimationLogic implements
* Called when the value of {@link #mCurrentShift} changes
*/
@UiThread
- public abstract void updateFinalShift();
+ public abstract void onCurrentShiftUpdated();
protected PagedOrientationHandler getOrientationHandler() {
// OrientationHandler should be independent of remote target, can directly take one
@@ -280,6 +281,10 @@ public abstract class SwipeUpAnimationLogic implements
return out;
}
+ protected void updateIsGestureForSplit(int targetCount) {
+ mIsSwipeForSplit = targetCount > 1;
+ }
+
private RectFSpringAnim getWindowAnimationToHomeInternal(
HomeAnimationFactory homeAnimationFactory, RectF targetRect,
TransformParams transformParams, TaskViewSimulator taskViewSimulator,
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index b3bee6cd16..9350c729ca 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import android.app.ActivityManager;
+import android.app.ActivityOptions;
import android.app.PendingIntent;
import android.app.PictureInPictureParams;
import android.content.ComponentName;
@@ -38,29 +39,42 @@ import android.os.Message;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Log;
+import android.view.IRecentsAnimationController;
+import android.view.IRecentsAnimationRunner;
+import android.view.IRemoteAnimationRunner;
import android.view.MotionEvent;
import android.view.RemoteAnimationAdapter;
import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
import android.window.IOnBackInvokedCallback;
import android.window.RemoteTransition;
+import android.window.TaskSnapshot;
import android.window.TransitionFilter;
+import androidx.annotation.MainThread;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import com.android.internal.logging.InstanceId;
import com.android.internal.util.ScreenshotRequest;
+import com.android.internal.view.AppearanceRegion;
import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.systemui.shared.recents.ISystemUiProxy;
+import com.android.systemui.shared.recents.model.ThumbnailData;
+import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
+import com.android.systemui.shared.system.RecentsAnimationListener;
import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController;
import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController;
import com.android.systemui.shared.system.smartspace.SmartspaceState;
import com.android.systemui.unfold.progress.IUnfoldAnimation;
import com.android.systemui.unfold.progress.IUnfoldTransitionListener;
import com.android.wm.shell.back.IBackAnimation;
+import com.android.wm.shell.bubbles.IBubbles;
+import com.android.wm.shell.bubbles.IBubblesListener;
import com.android.wm.shell.desktopmode.IDesktopMode;
+import com.android.wm.shell.draganddrop.IDragAndDrop;
import com.android.wm.shell.onehanded.IOneHanded;
import com.android.wm.shell.pip.IPip;
import com.android.wm.shell.pip.IPipAnimationListener;
@@ -91,6 +105,7 @@ public class SystemUiProxy implements ISystemUiProxy {
private ISystemUiProxy mSystemUiProxy;
private IPip mPip;
+ private IBubbles mBubbles;
private ISysuiUnlockAnimationController mSysuiUnlockAnimationController;
private ISplitScreen mSplitScreen;
private IOneHanded mOneHanded;
@@ -109,6 +124,7 @@ public class SystemUiProxy implements ISystemUiProxy {
// up to the caller to clear the listeners to prevent leaks as these can be held indefinitely
// in case SysUI needs to rebind.
private IPipAnimationListener mPipAnimationListener;
+ private IBubblesListener mBubblesListener;
private ISplitScreenListener mSplitScreenListener;
private IStartingWindowListener mStartingWindowListener;
private ILauncherUnlockAnimationController mLauncherUnlockAnimationController;
@@ -116,7 +132,10 @@ public class SystemUiProxy implements ISystemUiProxy {
private IUnfoldTransitionListener mUnfoldAnimationListener;
private final LinkedHashMap mRemoteTransitions =
new LinkedHashMap<>();
+ private IBinder mOriginalTransactionToken = null;
private IOnBackInvokedCallback mBackToLauncherCallback;
+ private IRemoteAnimationRunner mBackToLauncherRunner;
+ private IDragAndDrop mDragAndDrop;
// Used to dedupe calls to SystemUI
private int mLastShelfHeight;
@@ -132,9 +151,20 @@ public class SystemUiProxy implements ISystemUiProxy {
// TODO(141886704): Find a way to remove this
private int mLastSystemUiStateFlags;
+ /**
+ * This is a singleton pending intent that is used to start recents via Shell (which is a
+ * different process). It is bare-bones, so it's expected that the component and options will
+ * be provided via fill-in intent.
+ */
+ private final PendingIntent mRecentsPendingIntent;
+
public SystemUiProxy(Context context) {
mContext = context;
mAsyncHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessageAsync);
+ final Intent baseIntent = new Intent().setPackage(mContext.getPackageName());
+ mRecentsPendingIntent = PendingIntent.getActivity(mContext, 0, baseIntent,
+ PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT
+ | Intent.FILL_IN_COMPONENT);
}
@Override
@@ -176,15 +206,21 @@ public class SystemUiProxy implements ISystemUiProxy {
return null;
}
- public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen,
+ /**
+ * Sets proxy state, including death linkage, various listeners, and other configuration objects
+ */
+ @MainThread
+ public void setProxy(ISystemUiProxy proxy, IPip pip, IBubbles bubbles, ISplitScreen splitScreen,
IOneHanded oneHanded, IShellTransitions shellTransitions,
IStartingWindow startingWindow, IRecentTasks recentTasks,
ISysuiUnlockAnimationController sysuiUnlockAnimationController,
IBackAnimation backAnimation, IDesktopMode desktopMode,
- IUnfoldAnimation unfoldAnimation) {
+ IUnfoldAnimation unfoldAnimation, IDragAndDrop dragAndDrop) {
+ Preconditions.assertUIThread();
unlinkToDeath();
mSystemUiProxy = proxy;
mPip = pip;
+ mBubbles = bubbles;
mSplitScreen = splitScreen;
mOneHanded = oneHanded;
mShellTransitions = shellTransitions;
@@ -194,34 +230,27 @@ public class SystemUiProxy implements ISystemUiProxy {
mBackAnimation = backAnimation;
mDesktopMode = desktopMode;
mUnfoldAnimation = unfoldAnimation;
+ mDragAndDrop = dragAndDrop;
linkToDeath();
// re-attach the listeners once missing due to setProxy has not been initialized yet.
- if (mPipAnimationListener != null && mPip != null) {
- setPipAnimationListener(mPipAnimationListener);
- }
- if (mSplitScreenListener != null && mSplitScreen != null) {
- registerSplitScreenListener(mSplitScreenListener);
- }
- if (mStartingWindowListener != null && mStartingWindow != null) {
- setStartingWindowListener(mStartingWindowListener);
- }
- if (mSysuiUnlockAnimationController != null && mLauncherUnlockAnimationController != null) {
- setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
- }
+ setPipAnimationListener(mPipAnimationListener);
+ setBubblesListener(mBubblesListener);
+ registerSplitScreenListener(mSplitScreenListener);
+ setStartingWindowListener(mStartingWindowListener);
+ setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition);
- if (mRecentTasksListener != null && mRecentTasks != null) {
- registerRecentTasksListener(mRecentTasksListener);
- }
- if (mBackAnimation != null && mBackToLauncherCallback != null) {
- setBackToLauncherCallback(mBackToLauncherCallback);
- }
- if (unfoldAnimation != null && mUnfoldAnimationListener != null) {
- setUnfoldAnimationListener(mUnfoldAnimationListener);
- }
+ setupTransactionQueue();
+ registerRecentTasksListener(mRecentTasksListener);
+ setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner);
+ setUnfoldAnimationListener(mUnfoldAnimationListener);
}
+ /**
+ * Clear the proxy to release held resources and turn the majority of its operations into no-ops
+ */
+ @MainThread
public void clearProxy() {
- setProxy(null, null, null, null, null, null, null, null, null, null, null);
+ setProxy(null, null, null, null, null, null, null, null, null, null, null, null, null);
}
// TODO(141886704): Find a way to remove this
@@ -280,8 +309,10 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
+ @MainThread
@Override
public void onStatusBarMotionEvent(MotionEvent event) {
+ Preconditions.assertUIThread();
if (mSystemUiProxy != null) {
try {
mSystemUiProxy.onStatusBarMotionEvent(event);
@@ -518,9 +549,9 @@ public class SystemUiProxy implements ISystemUiProxy {
}
/**
- * Notifies WM Shell that launcher has finished all the animation for swipe to home. WM Shell
- * can choose to fade out the overlay when entering PIP is finished, and WM Shell should be
- * responsible for cleaning up the overlay.
+ * Notifies WM Shell that launcher has finished the preparation of the animation for swipe to
+ * home. WM Shell can choose to fade out the overlay when entering PIP is finished, and WM Shell
+ * should be responsible for cleaning up the overlay.
*/
public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds,
SurfaceControl overlay) {
@@ -533,6 +564,20 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
+ /**
+ * Notifies WM Shell that launcher has aborted all the animation for swipe to home. WM Shell
+ * can use this callback to clean up its internal states.
+ */
+ public void abortSwipePipToHome(int taskId, ComponentName componentName) {
+ if (mPip != null) {
+ try {
+ mPip.abortSwipePipToHome(taskId, componentName);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed call abortSwipePipToHome");
+ }
+ }
+ }
+
/**
* Sets the next pip animation type to be the alpha animation.
*/
@@ -559,6 +604,59 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
+ //
+ // Bubbles
+ //
+
+ /**
+ * Sets the listener to be notified of bubble state changes.
+ */
+ public void setBubblesListener(IBubblesListener listener) {
+ if (mBubbles != null) {
+ try {
+ if (mBubblesListener != null) {
+ // Clear out any previous listener
+ mBubbles.unregisterBubbleListener(mBubblesListener);
+ }
+ if (listener != null) {
+ mBubbles.registerBubbleListener(listener);
+ }
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed call registerBubblesListener");
+ }
+ }
+ mBubblesListener = listener;
+ }
+
+ /**
+ * Tells SysUI to show the bubble with the provided key.
+ * @param key the key of the bubble to show.
+ * @param onLauncherHome whether the bubble is showing on launcher home or not (modifies where
+ * the expanded bubble view is placed).
+ */
+ public void showBubble(String key, boolean onLauncherHome) {
+ if (mBubbles != null) {
+ try {
+ mBubbles.showBubble(key, onLauncherHome);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed call showBubble");
+ }
+ }
+ }
+
+ /**
+ * Tells SysUI to collapse the bubbles.
+ */
+ public void collapseBubbles() {
+ if (mBubbles != null) {
+ try {
+ mBubbles.collapseBubbles();
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed call collapseBubbles");
+ }
+ }
+ }
+
//
// Splitscreen
//
@@ -599,12 +697,12 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
- public void startIntentAndTask(PendingIntent pendingIntent, Bundle options1, int taskId,
- Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition,
+ public void startIntentAndTask(PendingIntent pendingIntent, int userId1, Bundle options1,
+ int taskId, Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition,
float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) {
if (mSystemUiProxy != null) {
try {
- mSplitScreen.startIntentAndTask(pendingIntent, options1, taskId, options2,
+ mSplitScreen.startIntentAndTask(pendingIntent, userId1, options1, taskId, options2,
splitPosition, splitRatio, remoteTransition, instanceId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call startIntentAndTask");
@@ -612,14 +710,16 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
- public void startIntents(PendingIntent pendingIntent1, Bundle options1,
- PendingIntent pendingIntent2, Bundle options2,
- @SplitConfigurationOptions.StagePosition int splitPosition,
- float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) {
+ public void startIntents(PendingIntent pendingIntent1, int userId1,
+ @Nullable ShortcutInfo shortcutInfo1, Bundle options1, PendingIntent pendingIntent2,
+ int userId2, @Nullable ShortcutInfo shortcutInfo2, Bundle options2,
+ @SplitConfigurationOptions.StagePosition int splitPosition, float splitRatio,
+ RemoteTransition remoteTransition, InstanceId instanceId) {
if (mSystemUiProxy != null) {
try {
- mSplitScreen.startIntents(pendingIntent1, options1, pendingIntent2, options2,
- splitPosition, splitRatio, remoteTransition, instanceId);
+ mSplitScreen.startIntents(pendingIntent1, userId1, shortcutInfo1, options1,
+ pendingIntent2, userId2, shortcutInfo2, options2, splitPosition, splitRatio,
+ remoteTransition, instanceId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call startIntents");
}
@@ -655,14 +755,14 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
- public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent,
+ public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, int userId1,
Bundle options1, int taskId, Bundle options2,
@SplitConfigurationOptions.StagePosition int splitPosition, float splitRatio,
RemoteAnimationAdapter adapter, InstanceId instanceId) {
if (mSystemUiProxy != null) {
try {
- mSplitScreen.startIntentAndTaskWithLegacyTransition(pendingIntent, options1, taskId,
- options2, splitPosition, splitRatio, adapter, instanceId);
+ mSplitScreen.startIntentAndTaskWithLegacyTransition(pendingIntent, userId1,
+ options1, taskId, options2, splitPosition, splitRatio, adapter, instanceId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call startIntentAndTaskWithLegacyTransition");
}
@@ -686,16 +786,16 @@ public class SystemUiProxy implements ISystemUiProxy {
* Starts a pair of intents or shortcuts in split-screen using legacy transition. Passing a
* non-null shortcut info means to start the app as a shortcut.
*/
- public void startIntentsWithLegacyTransition(PendingIntent pendingIntent1,
+ public void startIntentsWithLegacyTransition(PendingIntent pendingIntent1, int userId1,
@Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1,
- PendingIntent pendingIntent2, @Nullable ShortcutInfo shortcutInfo2,
+ PendingIntent pendingIntent2, int userId2, @Nullable ShortcutInfo shortcutInfo2,
@Nullable Bundle options2, @SplitConfigurationOptions.StagePosition int sidePosition,
float splitRatio, RemoteAnimationAdapter adapter, InstanceId instanceId) {
if (mSystemUiProxy != null) {
try {
- mSplitScreen.startIntentsWithLegacyTransition(pendingIntent1, shortcutInfo1,
- options1, pendingIntent2, shortcutInfo2, options2, sidePosition, splitRatio,
- adapter, instanceId);
+ mSplitScreen.startIntentsWithLegacyTransition(pendingIntent1, userId1,
+ shortcutInfo1, options1, pendingIntent2, userId2, shortcutInfo2, options2,
+ sidePosition, splitRatio, adapter, instanceId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call startIntentsWithLegacyTransition");
}
@@ -714,11 +814,12 @@ public class SystemUiProxy implements ISystemUiProxy {
}
}
- public void startIntent(PendingIntent intent, Intent fillInIntent, int position,
+ public void startIntent(PendingIntent intent, int userId, Intent fillInIntent, int position,
Bundle options, InstanceId instanceId) {
if (mSplitScreen != null) {
try {
- mSplitScreen.startIntent(intent, fillInIntent, position, options, instanceId);
+ mSplitScreen.startIntent(intent, userId, fillInIntent, position, options,
+ instanceId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call startIntent");
}
@@ -743,7 +844,7 @@ public class SystemUiProxy implements ISystemUiProxy {
*/
@Nullable
public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
- if (mSplitScreen != null) {
+ if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS && mSplitScreen != null) {
try {
return mSplitScreen.onGoingToRecentsLegacy(apps);
} catch (RemoteException e) {
@@ -818,6 +919,50 @@ public class SystemUiProxy implements ISystemUiProxy {
mRemoteTransitions.remove(remoteTransition);
}
+ /**
+ * Use SystemUI's transaction-queue instead of Launcher's independent one. This is necessary
+ * if Launcher and SystemUI need to coordinate transactions (eg. for shell transitions).
+ */
+ public void shareTransactionQueue() {
+ if (mOriginalTransactionToken == null) {
+ mOriginalTransactionToken = SurfaceControl.Transaction.getDefaultApplyToken();
+ }
+ setupTransactionQueue();
+ }
+
+ /**
+ * Switch back to using Launcher's independent transaction queue.
+ */
+ public void unshareTransactionQueue() {
+ if (mOriginalTransactionToken == null) {
+ return;
+ }
+ SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken);
+ mOriginalTransactionToken = null;
+ }
+
+ private void setupTransactionQueue() {
+ if (mOriginalTransactionToken == null) {
+ return;
+ }
+ if (mShellTransitions == null) {
+ SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken);
+ return;
+ }
+ final IBinder shellApplyToken;
+ try {
+ shellApplyToken = mShellTransitions.getShellApplyToken();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting Shell's apply token", e);
+ return;
+ }
+ if (shellApplyToken == null) {
+ Log.e(TAG, "Didn't receive apply token from Shell");
+ return;
+ }
+ SurfaceControl.Transaction.setDefaultApplyToken(shellApplyToken);
+ }
+
//
// Starting window
//
@@ -909,13 +1054,15 @@ public class SystemUiProxy implements ISystemUiProxy {
//
/** Sets the launcher {@link android.window.IOnBackInvokedCallback} to shell */
- public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {
+ public void setBackToLauncherCallback(IOnBackInvokedCallback callback,
+ IRemoteAnimationRunner runner) {
mBackToLauncherCallback = callback;
- if (mBackAnimation == null) {
+ mBackToLauncherRunner = runner;
+ if (mBackAnimation == null || mBackToLauncherCallback == null) {
return;
}
try {
- mBackAnimation.setBackToLauncherCallback(callback);
+ mBackAnimation.setBackToLauncherCallback(callback, runner);
} catch (RemoteException e) {
Log.e(TAG, "Failed call setBackToLauncherCallback", e);
}
@@ -930,6 +1077,7 @@ public class SystemUiProxy implements ISystemUiProxy {
return;
}
mBackToLauncherCallback = null;
+ mBackToLauncherRunner = null;
if (mBackAnimation == null) {
return;
}
@@ -941,16 +1089,16 @@ public class SystemUiProxy implements ISystemUiProxy {
}
/**
- * Notifies shell that all back to launcher animations have finished (including the transition
- * that plays after the gesture is committed and before the app is closed.
+ * Called when the status bar color needs to be customized when back navigation.
*/
- public void onBackToLauncherAnimationFinished() {
- if (mBackAnimation != null) {
- try {
- mBackAnimation.onBackToLauncherAnimationFinished();
- } catch (RemoteException e) {
- Log.w(TAG, "Failed call onBackAnimationFinished", e);
- }
+ public void customizeStatusBarAppearance(AppearanceRegion appearance) {
+ if (mBackAnimation == null) {
+ return;
+ }
+ try {
+ mBackAnimation.customizeStatusBarAppearance(appearance);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed call useLauncherSysBarFlags", e);
}
}
@@ -1003,10 +1151,10 @@ public class SystemUiProxy implements ISystemUiProxy {
//
/** Call shell to show all apps active on the desktop */
- public void showDesktopApps() {
+ public void showDesktopApps(int displayId) {
if (mDesktopMode != null) {
try {
- mDesktopMode.showDesktopApps();
+ mDesktopMode.showDesktopApps(displayId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call showDesktopApps", e);
}
@@ -1014,10 +1162,10 @@ public class SystemUiProxy implements ISystemUiProxy {
}
/** Call shell to get number of visible freeform tasks */
- public int getVisibleDesktopTaskCount() {
+ public int getVisibleDesktopTaskCount(int displayId) {
if (mDesktopMode != null) {
try {
- return mDesktopMode.getVisibleTaskCount();
+ return mDesktopMode.getVisibleTaskCount(displayId);
} catch (RemoteException e) {
Log.w(TAG, "Failed call getVisibleDesktopTaskCount", e);
}
@@ -1042,4 +1190,67 @@ public class SystemUiProxy implements ISystemUiProxy {
Log.e(TAG, "Failed call setUnfoldAnimationListener", e);
}
}
+
+ //
+ // Recents
+ //
+
+ /**
+ * Starts the recents activity. The caller should manage the thread on which this is called.
+ */
+ public boolean startRecentsActivity(Intent intent, ActivityOptions options,
+ RecentsAnimationListener listener) {
+ if (mRecentTasks == null) {
+ return false;
+ }
+ final IRecentsAnimationRunner runner = new IRecentsAnimationRunner.Stub() {
+ @Override
+ public void onAnimationStart(IRecentsAnimationController controller,
+ RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,
+ Rect homeContentInsets, Rect minimizedHomeBounds) {
+ listener.onAnimationStart(new RecentsAnimationControllerCompat(controller), apps,
+ wallpapers, homeContentInsets, minimizedHomeBounds);
+ }
+
+ @Override
+ public void onAnimationCanceled(int[] taskIds, TaskSnapshot[] taskSnapshots) {
+ listener.onAnimationCanceled(
+ ThumbnailData.wrap(taskIds, taskSnapshots));
+ }
+
+ @Override
+ public void onTasksAppeared(RemoteAnimationTarget[] apps) {
+ listener.onTasksAppeared(apps);
+ }
+ };
+ final Bundle optsBundle = options.toBundle();
+ try {
+ mRecentTasks.startRecentsTransition(mRecentsPendingIntent, intent, optsBundle,
+ mContext.getIApplicationThread(), runner);
+ return true;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error starting recents via shell", e);
+ return false;
+ }
+ }
+
+ //
+ // Drag and drop
+ //
+
+ /**
+ * For testing purposes. Returns `true` only if the shell drop target has shown and
+ * drawn and is ready to handle drag events and the subsequent drop.
+ */
+ public boolean isDragAndDropReady() {
+ if (mDragAndDrop == null) {
+ return false;
+ }
+ try {
+ return mDragAndDrop.isReadyToHandleDrag();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error querying drag state", e);
+ return false;
+ }
+ }
}
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index dde5d55de4..eacca0dbab 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -19,10 +19,11 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.launcher3.util.NavigationMode.NO_BUTTON;
+import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;
-import static com.android.systemui.shared.system.RemoteTransitionCompat.newRemoteTransition;
import android.app.ActivityManager;
import android.app.ActivityOptions;
@@ -31,13 +32,13 @@ import android.content.Intent;
import android.os.SystemProperties;
import android.util.Log;
import android.view.RemoteAnimationTarget;
-import android.window.RemoteTransition;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import com.android.launcher3.Utilities;
import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.DisplayController;
import com.android.quickstep.TopTaskTracker.CachedTaskInfo;
import com.android.quickstep.util.ActiveGestureLog;
import com.android.quickstep.views.DesktopTaskView;
@@ -51,7 +52,7 @@ import java.util.HashMap;
public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
public static final boolean ENABLE_SHELL_TRANSITIONS =
- SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
+ SystemProperties.getBoolean("persist.wm.debug.shell_transit", true);
public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS
&& SystemProperties.getBoolean("persist.wm.debug.shell_transit_rotate", false);
@@ -117,7 +118,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
}
}
// But force-finish it anyways
- finishRunningRecentsAnimation(false /* toHome */);
+ finishRunningRecentsAnimation(false /* toHome */, true /* forceFinish */);
if (mCallbacks != null) {
// If mCallbacks still != null, that means we are getting this startRecentsAnimation()
@@ -163,10 +164,16 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
for (RemoteAnimationTarget compat : appearedTaskTargets) {
if (compat.windowConfiguration.getActivityType() == ACTIVITY_TYPE_HOME
- && activityInterface.getCreatedActivity() instanceof RecentsActivity) {
- // When receive opening home activity while recents is running, enter home
- // and dismiss recents.
- ((RecentsActivity) activityInterface.getCreatedActivity()).startHome();
+ && activityInterface.getCreatedActivity() instanceof RecentsActivity
+ && DisplayController.getNavigationMode(mCtx) != NO_BUTTON) {
+ // The only time we get onTasksAppeared() in button navigation with a
+ // 3p launcher is if the user goes to overview first, and in this case we
+ // can immediately finish the transition
+ RecentsView recentsView =
+ activityInterface.getCreatedActivity().getOverviewPanel();
+ if (recentsView != null) {
+ recentsView.finishRecentsAnimation(true, null);
+ }
return;
}
}
@@ -176,16 +183,21 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
if (nonAppTargets == null) {
nonAppTargets = new RemoteAnimationTarget[0];
}
- if (activityInterface.isInLiveTileMode()
+ if ((activityInterface.isInLiveTileMode()
+ || mLastGestureState.getEndTarget() == RECENTS)
&& activityInterface.getCreatedActivity() != null) {
RecentsView recentsView =
activityInterface.getCreatedActivity().getOverviewPanel();
if (recentsView != null) {
+ ActiveGestureLog.INSTANCE.addLog("Launching side task id="
+ + appearedTaskTarget.taskId);
recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId,
appearedTaskTargets,
new RemoteAnimationTarget[0] /* wallpaper */,
nonAppTargets /* nonApps */);
return;
+ } else {
+ ActiveGestureLog.INSTANCE.addLog("Unable to launch side task (no recents)");
}
} else if (nonAppTargets.length > 0) {
TaskViewUtils.createSplitAuxiliarySurfacesAnimator(nonAppTargets /* nonApps */,
@@ -226,10 +238,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
mCallbacks.addListener(listener);
if (ENABLE_SHELL_TRANSITIONS) {
- RemoteTransition transition = newRemoteTransition(mCallbacks,
- mController != null ? mController.getController() : null,
- mCtx.getIApplicationThread());
- final ActivityOptions options = ActivityOptions.makeRemoteTransition(transition);
+ final ActivityOptions options = ActivityOptions.makeBasic();
// Allowing to pause Home if Home is top activity and Recents is not Home. So when user
// start home when recents animation is playing, the home activity can be resumed again
// to let the transition controller collect Home activity.
@@ -241,11 +250,14 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
homeIsOnTop = true;
}
}
+ if (activityInterface.allowAllAppsFromOverview()) {
+ homeIsOnTop = true;
+ }
if (!homeIsOnTop) {
options.setTransientLaunch();
}
options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime);
- UI_HELPER_EXECUTOR.execute(() -> mCtx.startActivity(intent, options.toBundle()));
+ SystemUiProxy.INSTANCE.getNoCreate().startRecentsActivity(intent, options, mCallbacks);
} else {
UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
.startRecentsActivity(intent, eventTime, mCallbacks, null, null));
@@ -296,13 +308,26 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
* Finishes the running recents animation.
*/
public void finishRunningRecentsAnimation(boolean toHome) {
+ finishRunningRecentsAnimation(toHome, false /* forceFinish */);
+ }
+
+ /**
+ * Finishes the running recents animation.
+ * @param forceFinish will synchronously finish the controller
+ */
+ private void finishRunningRecentsAnimation(boolean toHome, boolean forceFinish) {
if (mController != null) {
ActiveGestureLog.INSTANCE.addLog(
/* event= */ "finishRunningRecentsAnimation", toHome);
mCallbacks.notifyAnimationCanceled();
- Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), toHome
- ? mController::finishAnimationToHome
- : mController::finishAnimationToApp);
+ if (forceFinish) {
+ mController.finishController(toHome, null, false /* sendUserLeaveHint */,
+ true /* forceFinish */);
+ } else {
+ Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), toHome
+ ? mController::finishAnimationToHome
+ : mController::finishAnimationToApp);
+ }
cleanUpRecentsAnimation();
}
}
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 6e47ff4716..1744b08cf5 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -28,7 +28,6 @@ import android.graphics.Matrix;
import android.graphics.Rect;
import android.os.Build;
import android.view.View;
-import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -42,6 +41,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.popup.SystemShortcut;
import com.android.launcher3.util.ResourceBasedOverride;
import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.Snackbar;
import com.android.quickstep.util.RecentsOrientedState;
import com.android.quickstep.views.OverviewActionsView;
import com.android.quickstep.views.RecentsView;
@@ -129,7 +129,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
TaskShortcutFactory.PIN,
TaskShortcutFactory.INSTALL,
TaskShortcutFactory.FREE_FORM,
- TaskShortcutFactory.WELLBEING
+ TaskShortcutFactory.WELLBEING,
+ TaskShortcutFactory.SAVE_APP_PAIR
};
/**
@@ -271,10 +272,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
String message = activityContext.getStringCache() != null
? activityContext.getStringCache().disabledByAdminMessage
: mThumbnailView.getContext().getString(R.string.blocked_by_policy);
- Toast.makeText(
- mThumbnailView.getContext(),
- message,
- Toast.LENGTH_LONG).show();
+
+ Snackbar.show(BaseActivity.fromContext(mThumbnailView.getContext()), message, null);
}
/** Called when the snapshot has updated its full screen drawing parameters. */
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 255b9107b9..208f99ab03 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -17,6 +17,7 @@
package com.android.quickstep;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
@@ -40,6 +41,7 @@ import androidx.annotation.Nullable;
import com.android.launcher3.BaseDraggingActivity;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
import com.android.launcher3.model.WellbeingModel;
import com.android.launcher3.popup.SystemShortcut;
@@ -63,7 +65,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
- * Represents a system shortcut that can be shown for a recent task.
+ * Represents a system shortcut that can be shown for a recent task. Appears as a single entry in
+ * the dropdown menu that shows up when you tap an app icon in Overview.
*/
public interface TaskShortcutFactory {
@Nullable
@@ -122,6 +125,26 @@ public interface TaskShortcutFactory {
}
}
+ /**
+ * A menu item, "Save app pair", that allows the user to preserve the current app combination as
+ * a single persistent icon on the Home screen, allowing for quick split screen initialization.
+ */
+ class SaveAppPairSystemShortcut extends SystemShortcut {
+ private final TaskView mTaskView;
+
+ public SaveAppPairSystemShortcut(BaseDraggingActivity activity, TaskView taskView) {
+ super(R.drawable.ic_save_app_pair, R.string.save_app_pair, activity,
+ taskView.getItemInfo(), taskView);
+ mTaskView = taskView;
+ }
+
+ @Override
+ public void onClick(View view) {
+ ((RecentsView) mTarget.getOverviewPanel())
+ .getSplitSelectController().getAppPairsController().saveAppPair(mTaskView);
+ }
+ }
+
class FreeformSystemShortcut extends SystemShortcut {
private static final String TAG = "FreeformSystemShortcut";
@@ -252,26 +275,25 @@ public interface TaskShortcutFactory {
TaskIdAttributeContainer taskContainer) {
DeviceProfile deviceProfile = activity.getDeviceProfile();
final Task task = taskContainer.getTask();
+ final int intentFlags = task.key.baseIntent.getFlags();
final TaskView taskView = taskContainer.getTaskView();
final RecentsView recentsView = taskView.getRecentsView();
final PagedOrientationHandler orientationHandler =
recentsView.getPagedOrientationHandler();
- int[] taskViewTaskIds = taskView.getTaskIds();
- boolean taskViewHasMultipleTasks = taskViewTaskIds[0] != -1 &&
- taskViewTaskIds[1] != -1;
boolean notEnoughTasksToSplit = recentsView.getTaskViewCount() < 2;
boolean isFocusedTask = deviceProfile.isTablet && taskView.isFocusedTask();
boolean isTaskInExpectedScrollPosition =
recentsView.isTaskInExpectedScrollPosition(recentsView.indexOfChild(taskView));
- boolean isTaskSplitNotSupported = !task.isDockable;
+ boolean isTaskSplitNotSupported = !task.isDockable ||
+ (intentFlags & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0;
boolean hideForExistingMultiWindow = activity.getDeviceProfile().isMultiWindowMode;
- if (taskViewHasMultipleTasks ||
- notEnoughTasksToSplit ||
- isTaskSplitNotSupported ||
- hideForExistingMultiWindow ||
- (isFocusedTask && isTaskInExpectedScrollPosition)) {
+ if (taskView.containsMultipleTasks()
+ || notEnoughTasksToSplit
+ || isTaskSplitNotSupported
+ || hideForExistingMultiWindow
+ || (isFocusedTask && isTaskInExpectedScrollPosition)) {
return null;
}
@@ -283,6 +305,26 @@ public interface TaskShortcutFactory {
}
};
+ TaskShortcutFactory SAVE_APP_PAIR = new TaskShortcutFactory() {
+ @Nullable
+ @Override
+ public List getShortcuts(BaseDraggingActivity activity,
+ TaskIdAttributeContainer taskContainer) {
+ final TaskView taskView = taskContainer.getTaskView();
+
+ if (!FeatureFlags.ENABLE_APP_PAIRS.get() || !taskView.containsMultipleTasks()) {
+ return null;
+ }
+
+ return Collections.singletonList(new SaveAppPairSystemShortcut(activity, taskView));
+ }
+
+ @Override
+ public boolean showForSplitscreen() {
+ return true;
+ }
+ };
+
TaskShortcutFactory FREE_FORM = new TaskShortcutFactory() {
@Override
public List getShortcuts(BaseDraggingActivity activity,
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index f0d0bdb0ed..1238819acd 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -243,7 +243,17 @@ public final class TaskViewUtils {
TOUCH_RESPONSE_INTERPOLATOR);
out.setFloat(tvsLocal.recentsViewScroll, AnimatedFloat.VALUE, 0,
TOUCH_RESPONSE_INTERPOLATOR);
-
+ out.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ super.onAnimationStart(animation);
+ final SurfaceTransaction showTransaction = new SurfaceTransaction();
+ for (int i = targets.apps.length - 1; i >= 0; --i) {
+ showTransaction.getTransaction().show(targets.apps[i].leash);
+ }
+ applier.scheduleApply(showTransaction);
+ }
+ });
out.addOnFrameCallback(() -> {
for (RemoteTargetHandle handle : remoteTargetHandles) {
handle.getTaskViewSimulator().apply(handle.getTransformParams());
@@ -463,16 +473,14 @@ public final class TaskViewUtils {
throw new IllegalStateException(
"Expected task to be showing, but it is " + mode);
}
- if (change.getParent() == null) {
- throw new IllegalStateException("Initiating multi-split launch but the split"
- + "root of " + taskId + " is already visible or has broken hierarchy.");
- }
}
if (taskId == initialTaskId) {
- splitRoot1 = transitionInfo.getChange(change.getParent());
+ splitRoot1 = change.getParent() == null ? change :
+ transitionInfo.getChange(change.getParent());
}
if (taskId == secondTaskId) {
- splitRoot2 = transitionInfo.getChange(change.getParent());
+ splitRoot2 = change.getParent() == null ? change :
+ transitionInfo.getChange(change.getParent());
}
}
diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java
index 6f502d0ece..d34cddf584 100644
--- a/quickstep/src/com/android/quickstep/TopTaskTracker.java
+++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
import static android.app.ActivityTaskManager.INVALID_TASK_ID;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.content.Intent.ACTION_CHOOSER;
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
@@ -127,23 +128,16 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
@Override
public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible) {
- // If task is not visible but we are tracking it, stop tracking it
- if (!visible) {
+ // If a task is not visible anymore or has been moved to undefined, stop tracking it.
+ if (!visible || stage == SplitConfigurationOptions.STAGE_TYPE_UNDEFINED) {
if (mMainStagePosition.taskId == taskId) {
- resetTaskId(mMainStagePosition);
+ mMainStagePosition.taskId = INVALID_TASK_ID;
} else if (mSideStagePosition.taskId == taskId) {
- resetTaskId(mSideStagePosition);
+ mSideStagePosition.taskId = INVALID_TASK_ID;
} // else it's an un-tracked child
return;
}
- // If stage has moved to undefined, stop tracking the task
- if (stage == SplitConfigurationOptions.STAGE_TYPE_UNDEFINED) {
- resetTaskId(taskId == mMainStagePosition.taskId
- ? mMainStagePosition : mSideStagePosition);
- return;
- }
-
if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN) {
mMainStagePosition.taskId = taskId;
} else {
@@ -161,10 +155,6 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
mPinnedTaskId = INVALID_TASK_ID;
}
- private void resetTaskId(SplitStageInfo taskPosition) {
- taskPosition.taskId = -1;
- }
-
/**
* @return index 0 will be task in left/top position, index 1 in right/bottom position.
* Will return empty array if device is not in staged split
@@ -255,6 +245,11 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta
.getActivityType() == ACTIVITY_TYPE_HOME;
}
+ public boolean isRecentsTask() {
+ return mTopTask != null && mTopTask.configuration.windowConfiguration
+ .getActivityType() == ACTIVITY_TYPE_RECENTS;
+ }
+
/**
* Returns {@code true} if this task windowing mode is set to {@link
* android.app.WindowConfiguration#WINDOWING_MODE_FREEFORM}
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index a0255ac1b6..d6a468d39c 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -18,13 +18,20 @@ package com.android.quickstep;
import static android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS;
import static android.view.MotionEvent.ACTION_CANCEL;
import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_POINTER_DOWN;
+import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;
-import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
+import static com.android.launcher3.Launcher.INTENT_ACTION_ALL_APPS_TOGGLE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_TRACKPAD_GESTURE;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.quickstep.GestureState.DEFAULT_STATE;
+import static com.android.quickstep.GestureState.TrackpadGestureType.getTrackpadGestureType;
+import static com.android.quickstep.InputConsumer.TYPE_CURSOR_HOVER;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN;
+import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_MOVE;
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP;
import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
@@ -35,7 +42,9 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION;
+import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BUBBLES;
import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE;
+import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DRAG_AND_DROP;
import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_ONE_HANDED;
import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_PIP;
import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS;
@@ -69,8 +78,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
-import com.android.app.viewcapture.SettingsAwareViewCapture;
import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.DeviceProfile;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
@@ -101,8 +110,9 @@ import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer;
import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer;
import com.android.quickstep.inputconsumers.ResetGestureInputConsumer;
import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer;
+import com.android.quickstep.inputconsumers.StatusBarInputConsumer;
import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer;
-import com.android.quickstep.inputconsumers.TaskbarStashInputConsumer;
+import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer;
import com.android.quickstep.util.ActiveGestureLog;
import com.android.quickstep.util.ActiveGestureLog.CompoundString;
import com.android.quickstep.util.ProtoTracer;
@@ -117,7 +127,9 @@ import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationContro
import com.android.systemui.shared.tracing.ProtoTraceable;
import com.android.systemui.unfold.progress.IUnfoldAnimation;
import com.android.wm.shell.back.IBackAnimation;
+import com.android.wm.shell.bubbles.IBubbles;
import com.android.wm.shell.desktopmode.IDesktopMode;
+import com.android.wm.shell.draganddrop.IDragAndDrop;
import com.android.wm.shell.onehanded.IOneHanded;
import com.android.wm.shell.pip.IPip;
import com.android.wm.shell.recents.IRecentTasks;
@@ -127,8 +139,10 @@ import com.android.wm.shell.transition.IShellTransitions;
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.LinkedList;
+import java.util.function.Consumer;
import java.util.function.Function;
/**
@@ -145,20 +159,27 @@ public class TouchInteractionService extends Service
private static final String HAS_ENABLED_QUICKSTEP_ONCE = "launcher.has_enabled_quickstep_once";
- private final TISBinder mTISBinder = new TISBinder();
+ private final TISBinder mTISBinder = new TISBinder(this);
/**
* Local IOverviewProxy implementation with some methods for local components
*/
- public class TISBinder extends IOverviewProxy.Stub {
+ public static class TISBinder extends IOverviewProxy.Stub {
+
+ private final WeakReference mTis;
@Nullable private Runnable mOnOverviewTargetChangeListener = null;
+ private TISBinder(TouchInteractionService tis) {
+ mTis = new WeakReference<>(tis);
+ }
+
@BinderThread
public void onInitialize(Bundle bundle) {
ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
+ IBubbles bubbles = IBubbles.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_BUBBLES));
ISplitScreen splitscreen = ISplitScreen.Stub.asInterface(bundle.getBinder(
KEY_EXTRA_SHELL_SPLIT_SCREEN));
IOneHanded onehanded = IOneHanded.Stub.asInterface(
@@ -178,66 +199,89 @@ public class TouchInteractionService extends Service
bundle.getBinder(KEY_EXTRA_SHELL_DESKTOP_MODE));
IUnfoldAnimation unfoldTransition = IUnfoldAnimation.Stub.asInterface(
bundle.getBinder(KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER));
- MAIN_EXECUTOR.execute(() -> {
- SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip,
- splitscreen, onehanded, shellTransitions, startingWindow,
+ IDragAndDrop dragAndDrop = IDragAndDrop.Stub.asInterface(
+ bundle.getBinder(KEY_EXTRA_SHELL_DRAG_AND_DROP));
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ SystemUiProxy.INSTANCE.get(tis).setProxy(proxy, pip,
+ bubbles, splitscreen, onehanded, shellTransitions, startingWindow,
recentTasks, launcherUnlockAnimationController, backAnimation, desktopMode,
- unfoldTransition);
- TouchInteractionService.this.initInputMonitor("TISBinder#onInitialize()");
- preloadOverview(true /* fromInit */);
- });
+ unfoldTransition, dragAndDrop);
+ tis.initInputMonitor("TISBinder#onInitialize()");
+ tis.preloadOverview(true /* fromInit */);
+ }));
sIsInitialized = true;
}
+ @BinderThread
+ @Override
+ public void onTaskbarToggled() {
+ if (!FeatureFlags.ENABLE_KEYBOARD_TASKBAR_TOGGLE.get()) return;
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ TaskbarActivityContext activityContext =
+ tis.mTaskbarManager.getCurrentActivityContext();
+
+ if (activityContext != null) {
+ activityContext.toggleTaskbarStash();
+ }
+ }));
+ }
+
@BinderThread
public void onOverviewToggle() {
TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onOverviewToggle");
- // If currently screen pinning, do not enter overview
- if (mDeviceState.isScreenPinningActive()) {
- return;
- }
- TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
- mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_TOGGLE);
+ executeForTouchInteractionService(tis -> {
+ // If currently screen pinning, do not enter overview
+ if (tis.mDeviceState.isScreenPinningActive()) {
+ return;
+ }
+ TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+ tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_TOGGLE);
+ });
}
@BinderThread
@Override
public void onOverviewShown(boolean triggeredFromAltTab) {
- if (triggeredFromAltTab) {
- TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
- mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_KEYBOARD_INPUT);
- } else {
- mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_SHOW);
- }
+ executeForTouchInteractionService(tis -> {
+ if (triggeredFromAltTab) {
+ TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+ tis.mOverviewCommandHelper.addCommand(
+ OverviewCommandHelper.TYPE_KEYBOARD_INPUT);
+ } else {
+ tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_SHOW);
+ }
+ });
}
@BinderThread
@Override
public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
- if (triggeredFromAltTab && !triggeredFromHomeKey) {
- // onOverviewShownFromAltTab hides the overview and ends at the target app
- mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HIDE);
- }
+ executeForTouchInteractionService(tis -> {
+ if (triggeredFromAltTab && !triggeredFromHomeKey) {
+ // onOverviewShownFromAltTab hides the overview and ends at the target app
+ tis.mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HIDE);
+ }
+ });
}
@BinderThread
@Override
public void onAssistantAvailable(boolean available, boolean longPressHomeEnabled) {
- MAIN_EXECUTOR.execute(() -> {
- mDeviceState.setAssistantAvailable(available);
- TouchInteractionService.this.onAssistantVisibilityChanged();
- executeForTaskbarManager(() -> mTaskbarManager
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ tis.mDeviceState.setAssistantAvailable(available);
+ tis.onAssistantVisibilityChanged();
+ executeForTaskbarManager(taskbarManager -> taskbarManager
.onLongPressHomeEnabled(longPressHomeEnabled));
- });
+ }));
}
@BinderThread
@Override
public void onAssistantVisibilityChanged(float visibility) {
- MAIN_EXECUTOR.execute(() -> {
- mDeviceState.setAssistantVisibility(visibility);
- TouchInteractionService.this.onAssistantVisibilityChanged();
- });
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ tis.mDeviceState.setAssistantVisibility(visibility);
+ tis.onAssistantVisibilityChanged();
+ }));
}
@Override
@@ -247,16 +291,17 @@ public class TouchInteractionService extends Service
@BinderThread
public void onSystemUiStateChanged(int stateFlags) {
- MAIN_EXECUTOR.execute(() -> {
- int lastFlags = mDeviceState.getSystemUiStateFlags();
- mDeviceState.setSystemUiFlags(stateFlags);
- TouchInteractionService.this.onSystemUiFlagsChanged(lastFlags);
- });
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ int lastFlags = tis.mDeviceState.getSystemUiStateFlags();
+ tis.mDeviceState.setSystemUiFlags(stateFlags);
+ tis.onSystemUiFlagsChanged(lastFlags);
+ }));
}
@BinderThread
public void onActiveNavBarRegionChanges(Region region) {
- MAIN_EXECUTOR.execute(() -> mDeviceState.setDeferredGestureRegion(region));
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(
+ tis -> tis.mDeviceState.setDeferredGestureRegion(region)));
}
@BinderThread
@@ -280,75 +325,105 @@ public class TouchInteractionService extends Service
@BinderThread
@Override
public void enterStageSplitFromRunningApp(boolean leftOrTop) {
- StatefulActivity activity =
- mOverviewComponentObserver.getActivityInterface().getCreatedActivity();
- if (activity != null) {
- activity.enterStageSplitFromRunningApp(leftOrTop);
- }
+ executeForTouchInteractionService(tis -> {
+ StatefulActivity activity =
+ tis.mOverviewComponentObserver.getActivityInterface().getCreatedActivity();
+ if (activity != null) {
+ activity.enterStageSplitFromRunningApp(leftOrTop);
+ }
+ });
}
/**
* Preloads the Overview activity.
- *
+ *
* This method should only be used when the All Set page of the SUW is reached to safely
* preload the Launcher for the SUW first reveal.
*/
public void preloadOverviewForSUWAllSet() {
- preloadOverview(false, true);
+ executeForTouchInteractionService(tis -> tis.preloadOverview(false, true));
}
@Override
public void onRotationProposal(int rotation, boolean isValid) {
- executeForTaskbarManager(() -> mTaskbarManager.onRotationProposal(rotation, isValid));
+ executeForTaskbarManager(taskbarManager ->
+ taskbarManager.onRotationProposal(rotation, isValid));
}
@Override
public void disable(int displayId, int state1, int state2, boolean animate) {
- executeForTaskbarManager(() -> mTaskbarManager
- .disableNavBarElements(displayId, state1, state2, animate));
+ executeForTaskbarManager(taskbarManager ->
+ taskbarManager.disableNavBarElements(displayId, state1, state2, animate));
}
@Override
public void onSystemBarAttributesChanged(int displayId, int behavior) {
- executeForTaskbarManager(() -> mTaskbarManager
- .onSystemBarAttributesChanged(displayId, behavior));
+ executeForTaskbarManager(taskbarManager ->
+ taskbarManager.onSystemBarAttributesChanged(displayId, behavior));
}
@Override
public void onNavButtonsDarkIntensityChanged(float darkIntensity) {
- executeForTaskbarManager(() -> mTaskbarManager
- .onNavButtonsDarkIntensityChanged(darkIntensity));
+ executeForTaskbarManager(taskbarManager ->
+ taskbarManager.onNavButtonsDarkIntensityChanged(darkIntensity));
}
- private void executeForTaskbarManager(final Runnable r) {
- MAIN_EXECUTOR.execute(() -> {
- if (mTaskbarManager == null) {
- return;
- }
- r.run();
- });
+ private void executeForTouchInteractionService(
+ @NonNull Consumer tisConsumer) {
+ TouchInteractionService tis = mTis.get();
+ if (tis == null) return;
+ tisConsumer.accept(tis);
}
+ private void executeForTaskbarManager(
+ @NonNull Consumer taskbarManagerConsumer) {
+ MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> {
+ TaskbarManager taskbarManager = tis.mTaskbarManager;
+ if (taskbarManager == null) return;
+ taskbarManagerConsumer.accept(taskbarManager);
+ }));
+ }
+
+ /**
+ * Returns the {@link TaskbarManager}.
+ *
+ * Returns {@code null} if TouchInteractionService is not connected
+ */
+ @Nullable
public TaskbarManager getTaskbarManager() {
- return mTaskbarManager;
+ TouchInteractionService tis = mTis.get();
+ if (tis == null) return null;
+ return tis.mTaskbarManager;
}
+ /**
+ * Returns the {@link OverviewCommandHelper}.
+ *
+ * Returns {@code null} if TouchInteractionService is not connected
+ */
+ @Nullable
public OverviewCommandHelper getOverviewCommandHelper() {
- return mOverviewCommandHelper;
+ TouchInteractionService tis = mTis.get();
+ if (tis == null) return null;
+ return tis.mOverviewCommandHelper;
}
/**
* Sets a proxy to bypass swipe up behavior
*/
public void setSwipeUpProxy(Function proxy) {
- mSwipeUpProxyProvider = proxy != null ? proxy : (i -> null);
+ TouchInteractionService tis = mTis.get();
+ if (tis == null) return;
+ tis.mSwipeUpProxyProvider = proxy != null ? proxy : (i -> null);
}
/**
* Sets the task id where gestures should be blocked
*/
public void setGestureBlockedTaskId(int taskId) {
- mDeviceState.setGestureBlockingTaskId(taskId);
+ TouchInteractionService tis = mTis.get();
+ if (tis == null) return;
+ tis.mDeviceState.setGestureBlockingTaskId(taskId);
}
/** Sets a listener to be run on Overview Target updates. */
@@ -505,7 +580,7 @@ public class TouchInteractionService extends Service
if (isHomeAndOverviewSame) {
Intent intent = new Intent(mOverviewComponentObserver.getHomeIntent())
- .setAction(Intent.ACTION_ALL_APPS);
+ .setAction(INTENT_ACTION_ALL_APPS_TOGGLE);
RemoteAction allAppsAction = new RemoteAction(
Icon.createWithResource(this, R.drawable.ic_apps),
getString(R.string.all_apps_label),
@@ -623,16 +698,23 @@ public class TouchInteractionService extends Service
Object traceToken = TraceHelper.INSTANCE.beginFlagsOverride(
TraceHelper.FLAG_ALLOW_BINDER_TRACKING);
- final int action = event.getAction();
- if (action == ACTION_DOWN) {
+ final int action = event.getActionMasked();
+ // Note this will create a new consumer every mouse click, as after ACTION_UP from the click
+ // an ACTION_HOVER_ENTER will fire as well.
+ boolean isHoverActionWithoutConsumer =
+ event.isHoverEvent() && (mUncheckedConsumer.getType() & TYPE_CURSOR_HOVER) == 0;
+ if (action == ACTION_DOWN || isHoverActionWithoutConsumer) {
mRotationTouchHelper.setOrientationTransformIfNeeded(event);
- if (!mDeviceState.isOneHandedModeActive()
- && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+ if ((!mDeviceState.isOneHandedModeActive()
+ && mRotationTouchHelper.isInSwipeUpTouchRegion(event,
+ mOverviewComponentObserver.getActivityInterface()))
+ || isHoverActionWithoutConsumer) {
// Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger
// onConsumerInactive and wipe the previous gesture state
GestureState prevGestureState = new GestureState(mGestureState);
- GestureState newGestureState = createGestureState(mGestureState);
+ GestureState newGestureState = createGestureState(mGestureState,
+ getTrackpadGestureType(event));
newGestureState.setSwipeUpStartTimeMs(SystemClock.uptimeMillis());
mConsumer.onConsumerAboutToBeSwitched();
mGestureState = newGestureState;
@@ -640,7 +722,8 @@ public class TouchInteractionService extends Service
mUncheckedConsumer = mConsumer;
} else if (mDeviceState.isUserUnlocked() && mDeviceState.isFullyGesturalNavMode()
&& mDeviceState.canTriggerAssistantAction(event)) {
- mGestureState = createGestureState(mGestureState);
+ mGestureState = createGestureState(mGestureState,
+ getTrackpadGestureType(event));
// Do not change mConsumer as if there is an ongoing QuickSwitch gesture, we
// should not interrupt it. QuickSwitch assumes that interruption can only
// happen if the next gesture is also quick switch.
@@ -663,19 +746,28 @@ public class TouchInteractionService extends Service
if (mUncheckedConsumer != InputConsumer.NO_OP) {
switch (event.getActionMasked()) {
case ACTION_DOWN:
+ // fall through
case ACTION_UP:
ActiveGestureLog.INSTANCE.addLog(
/* event= */ "onMotionEvent(" + (int) event.getRawX() + ", "
+ (int) event.getRawY() + "): "
- + MotionEvent.actionToString(event.getActionMasked()),
+ + MotionEvent.actionToString(event.getActionMasked()) + ", "
+ + MotionEvent.classificationToString(event.getClassification()),
/* gestureEvent= */ event.getActionMasked() == ACTION_DOWN
? MOTION_DOWN
: MOTION_UP);
break;
- default:
+ case ACTION_MOVE:
ActiveGestureLog.INSTANCE.addLog("onMotionEvent: "
- + MotionEvent.actionToString(event.getActionMasked()));
+ + MotionEvent.actionToString(event.getActionMasked()) + ","
+ + MotionEvent.classificationToString(event.getClassification())
+ + ", pointerCount: " + event.getPointerCount(), MOTION_MOVE);
break;
+ default: {
+ ActiveGestureLog.INSTANCE.addLog("onMotionEvent: "
+ + MotionEvent.actionToString(event.getActionMasked()) + ","
+ + MotionEvent.classificationToString(event.getClassification()));
+ }
}
}
@@ -687,7 +779,18 @@ public class TouchInteractionService extends Service
if (cancelGesture) {
event.setAction(ACTION_CANCEL);
}
- mUncheckedConsumer.onMotionEvent(event);
+
+ if (mGestureState.isTrackpadGesture() && (action == ACTION_POINTER_DOWN
+ || action == ACTION_POINTER_UP)) {
+ // Skip ACTION_POINTER_DOWN and ACTION_POINTER_UP events from trackpad.
+ if (action == ACTION_POINTER_DOWN) {
+ mGestureState.setTrackpadGestureType(getTrackpadGestureType(event));
+ }
+ } else if (event.isHoverEvent()) {
+ mUncheckedConsumer.onHoverEvent(event);
+ } else {
+ mUncheckedConsumer.onMotionEvent(event);
+ }
if (cleanUpConsumer) {
reset();
@@ -718,7 +821,8 @@ public class TouchInteractionService extends Service
}
}
- public GestureState createGestureState(GestureState previousGestureState) {
+ public GestureState createGestureState(GestureState previousGestureState,
+ GestureState.TrackpadGestureType trackpadGestureType) {
final GestureState gestureState;
TopTaskTracker.CachedTaskInfo taskInfo;
if (mTaskAnimationManager.isRecentsAnimationRunning()) {
@@ -735,6 +839,8 @@ public class TouchInteractionService extends Service
taskInfo = TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false);
gestureState.updateRunningTask(taskInfo);
}
+ gestureState.setTrackpadGestureType(trackpadGestureType);
+
// Log initial state for the gesture.
ActiveGestureLog.INSTANCE.addLog(new CompoundString("Current running task package name=")
.append(taskInfo == null ? "no running task" : taskInfo.getPackageName()));
@@ -805,14 +911,21 @@ public class TouchInteractionService extends Service
base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString);
}
- // If Taskbar is present, we listen for long press to unstash it.
+ // If Taskbar is present, we listen for swipe or cursor hover events to unstash it.
TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext();
- if (tac != null && canStartSystemGesture) {
- reasonString.append(NEWLINE_PREFIX)
- .append(reasonPrefix)
- .append(SUBSTRING_PREFIX)
- .append("TaskbarActivityContext != null, using TaskbarStashInputConsumer");
- base = new TaskbarStashInputConsumer(this, base, mInputMonitorCompat, tac);
+ if (tac != null && !(base instanceof AssistantInputConsumer)) {
+ // Present always on large screen or on small screen w/ flag
+ DeviceProfile dp = tac.getDeviceProfile();
+ boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)
+ && !tac.isInStashedLauncherState();
+ if (canStartSystemGesture && useTaskbarConsumer) {
+ reasonString.append(NEWLINE_PREFIX)
+ .append(reasonPrefix)
+ .append(SUBSTRING_PREFIX)
+ .append("TaskbarActivityContext != null, "
+ + "using TaskbarUnstashInputConsumer");
+ base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac);
+ }
}
if (mDeviceState.isBubblesExpanded()) {
@@ -831,7 +944,13 @@ public class TouchInteractionService extends Service
getBaseContext(), mDeviceState, mInputMonitorCompat);
}
-
+ if (ENABLE_TRACKPAD_GESTURE.get() && mGestureState.isTrackpadGesture()
+ && !previousGestureState.isRecentsAnimationRunning()) {
+ reasonString = newCompoundString(reasonPrefix)
+ .append(SUBSTRING_PREFIX)
+ .append("Trackpad 3-finger gesture, using StatusBarInputConsumer");
+ base = new StatusBarInputConsumer(getBaseContext(), base, mInputMonitorCompat);
+ }
if (mDeviceState.isScreenPinningActive()) {
reasonString = newCompoundString(reasonPrefix)
@@ -859,7 +978,7 @@ public class TouchInteractionService extends Service
.append("accessibility menu is available")
.append(", using AccessibilityInputConsumer");
base = new AccessibilityInputConsumer(
- this, mDeviceState, base, mInputMonitorCompat);
+ this, mDeviceState, mGestureState, base, mInputMonitorCompat);
}
} else {
String reasonPrefix = "device is not in gesture navigation mode";
@@ -890,10 +1009,6 @@ public class TouchInteractionService extends Service
private void logInputConsumerSelectionReason(
InputConsumer consumer, CompoundString reasonString) {
- if (!FeatureFlags.ENABLE_INPUT_CONSUMER_REASON_LOGGING.get()) {
- ActiveGestureLog.INSTANCE.addLog("setInputConsumer: " + consumer.getName());
- return;
- }
ActiveGestureLog.INSTANCE.addLog(new CompoundString("setInputConsumer: ")
.append(consumer.getName())
.append(". reason(s):")
@@ -1028,22 +1143,17 @@ public class TouchInteractionService extends Service
boolean hasWindowFocus = activity.getRootView().hasWindowFocus();
boolean isPreviousGestureAnimatingToLauncher =
previousGestureState.isRunningAnimationToLauncher();
- boolean forcingOverviewInputConsumer =
- ASSISTANT_GIVES_LAUNCHER_FOCUS.get() && forceOverviewInputConsumer;
boolean isInLiveTileMode = gestureState.getActivityInterface().isInLiveTileMode();
reasonString.append(SUBSTRING_PREFIX)
.append(hasWindowFocus
? "activity has window focus"
: (isPreviousGestureAnimatingToLauncher
? "previous gesture is still animating to launcher"
- : (forcingOverviewInputConsumer
- ? "assistant gives launcher focus and forcing focus"
- : (isInLiveTileMode
- ? "device is in live mode"
- : "all overview focus conditions failed"))));
+ : isInLiveTileMode
+ ? "device is in live mode"
+ : "all overview focus conditions failed"));
if (hasWindowFocus
|| isPreviousGestureAnimatingToLauncher
- || forcingOverviewInputConsumer
|| isInLiveTileMode) {
reasonString.append(SUBSTRING_PREFIX)
.append("overview should have focus, using OverviewInputConsumer");
@@ -1215,10 +1325,6 @@ public class TouchInteractionService extends Service
createdOverviewActivity.getDeviceProfile().dump(this, "", pw);
}
mTaskbarManager.dumpLogs("", pw);
-
- if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
- SettingsAwareViewCapture.getInstance(this).dump(pw, fd, this);
- }
}
}
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 4b1dd439f3..074aedd3c7 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -79,7 +79,7 @@ public class FallbackRecentsView extends RecentsView {
+ if (mGestureState.isFourFingerTrackpadGesture()) {
+ mRecentsViewDispatcher.dispatchEvent(ev);
+ }
+ }
+ default -> mRecentsViewDispatcher.dispatchEvent(ev);
+ }
+ } else {
+ mRecentsViewDispatcher.dispatchEvent(ev);
+ }
ev.setEdgeFlags(edgeFlags);
mVelocityTracker.addMovement(ev);
@@ -236,7 +248,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
if (!mPassedPilferInputSlop) {
// Cancel interaction in case of multi-touch interaction
int ptrIdx = ev.getActionIndex();
- if (!mRotationTouchHelper.isInSwipeUpTouchRegion(ev, ptrIdx)) {
+ if (!mRotationTouchHelper.isInSwipeUpTouchRegion(ev, ptrIdx,
+ mActivityInterface)) {
forceCancelGesture(ev);
}
}
@@ -290,14 +303,30 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
boolean haveNotPassedSlopOnContinuedGesture =
!mPassedSlopOnThisGesture && mPassedPilferInputSlop;
double degrees = Math.toDegrees(Math.atan(upDist / horizontalDist));
- boolean isLikelyToStartNewTask = haveNotPassedSlopOnContinuedGesture
- || degrees <= OVERVIEW_MIN_DEGREES;
+
+ // Regarding degrees >= -OVERVIEW_MIN_DEGREES - Trackpad gestures can start anywhere
+ // on the screen, allowing downward swipes. We want to impose the same angle in that
+ // scenario.
+ boolean swipeWithinQuickSwitchRange = degrees <= OVERVIEW_MIN_DEGREES
+ && (!mGestureState.isTrackpadGesture() || degrees >= -OVERVIEW_MIN_DEGREES);
+ boolean isLikelyToStartNewTask =
+ haveNotPassedSlopOnContinuedGesture || swipeWithinQuickSwitchRange;
if (!mPassedPilferInputSlop) {
if (passedSlop) {
- if (mDisableHorizontalSwipe
- && Math.abs(displacementX) > Math.abs(displacementY)) {
- // Horizontal gesture is not allowed in this region
+ // Horizontal gesture is not allowed in this region
+ boolean isHorizontalSwipeWhenDisabled =
+ (mDisableHorizontalSwipe && Math.abs(displacementX) > Math.abs(
+ displacementY));
+ // Do not allow quick switch for trackpad 3-finger gestures
+ // TODO(b/261815244): might need to impose stronger conditions for the swipe
+ // angle
+ boolean noQuickSwitchForThreeFingerGesture = isLikelyToStartNewTask
+ && mGestureState.isThreeFingerTrackpadGesture();
+ boolean noQuickstepForFourFingerGesture = !isLikelyToStartNewTask
+ && mGestureState.isFourFingerTrackpadGesture();
+ if (isHorizontalSwipeWhenDisabled || noQuickSwitchForThreeFingerGesture
+ || noQuickstepForFourFingerGesture) {
forceCancelGesture(ev);
break;
}
@@ -312,7 +341,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
if (!mPassedWindowMoveSlop) {
mPassedWindowMoveSlop = true;
mStartDisplacement = Math.min(displacement, -mTouchSlop);
-
}
notifyGestureStarted(isLikelyToStartNewTask);
}
@@ -405,8 +433,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
? -velocityXPxPerMs
: velocityYPxPerMs;
mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement);
- mInteractionHandler.onGestureEnded(
- velocityPxPerMs, new PointF(velocityXPxPerMs, velocityYPxPerMs), mDownPos);
+ mInteractionHandler.onGestureEnded(velocityPxPerMs,
+ new PointF(velocityXPxPerMs, velocityYPxPerMs));
}
} else {
// Since we start touch tracking on DOWN, we may reach this state without actually
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 64165b66e4..338864264a 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -51,6 +51,7 @@ public class OverviewInputConsumer, T extends StatefulAct
private final boolean mStartingInActivityBounds;
private boolean mTargetHandledTouch;
+ private boolean mHasSetTouchModeForFirstDPadEvent;
public OverviewInputConsumer(GestureState gestureState, T activity,
@Nullable InputMonitorCompat inputMonitor, boolean startingInActivityBounds) {
@@ -95,6 +96,9 @@ public class OverviewInputConsumer, T extends StatefulAct
mInputMonitor.pilferPointers();
}
}
+ if (mHasSetTouchModeForFirstDPadEvent) {
+ mActivity.getRootView().clearFocus();
+ }
}
@Override
@@ -112,6 +116,19 @@ public class OverviewInputConsumer, T extends StatefulAct
mgr.dispatchVolumeKeyEventAsSystemService(ev,
AudioManager.USE_DEFAULT_STREAM_TYPE);
break;
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ if (!mHasSetTouchModeForFirstDPadEvent) {
+ // When Overview is launched via meta+tab or swipe up from an app, the touch
+ // mode somehow is not changed to false by the Android framework. The subsequent
+ // key events (e.g. DPAD_LEFT, DPAD_RIGHT) can only be dispatched to focused
+ // views, while focus can only be requested in
+ // {@link View#requestFocusNoSearch(int, Rect)} when touch mode is false. To
+ // note, here we launch overview with live tile.
+ mHasSetTouchModeForFirstDPadEvent = true;
+ mActivity.getRootView().getViewRootImpl().touchModeChanged(false);
+ }
+ break;
default:
break;
}
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
index ab70272852..eac09ad7dc 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
@@ -103,7 +103,8 @@ public class ProgressDelegateInputConsumer implements InputConsumer,
mStateCallback = new MultiStateCallback(STATE_NAMES);
mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_HANDLER_INVALIDATED,
this::endRemoteAnimation);
- mStateCallback.runOnceAtState(STATE_FLING_FINISHED, this::onFlingFinished);
+ mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_FLING_FINISHED,
+ this::onFlingFinished);
mSwipeDetector = new SingleAxisSwipeDetector(mContext, this, VERTICAL);
mSwipeDetector.setDetectableScrollConditions(DIRECTION_POSITIVE, false);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java
new file mode 100644
index 0000000000..898aa8640d
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java
@@ -0,0 +1,85 @@
+/*
+ * 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.quickstep.inputconsumers;
+
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+
+import com.android.quickstep.InputConsumer;
+import com.android.quickstep.SystemUiProxy;
+import com.android.systemui.shared.system.InputMonitorCompat;
+
+/** Allows the status bar to be pull down for notification shade */
+public class StatusBarInputConsumer extends DelegateInputConsumer {
+
+ private final SystemUiProxy mSystemUiProxy;
+ private final float mTouchSlop;
+ private final PointF mDown = new PointF();
+ private boolean mHasPassedTouchSlop;
+
+ public StatusBarInputConsumer(Context context, InputConsumer delegate,
+ InputMonitorCompat inputMonitor) {
+ super(delegate, inputMonitor);
+
+ mSystemUiProxy = SystemUiProxy.INSTANCE.get(context);
+ mTouchSlop = 2 * ViewConfiguration.get(context).getScaledTouchSlop();
+ }
+
+ @Override
+ public int getType() {
+ return TYPE_STATUS_BAR | mDelegate.getType();
+ }
+
+ @Override
+ public void onMotionEvent(MotionEvent ev) {
+ if (mState != STATE_ACTIVE) {
+ mDelegate.onMotionEvent(ev);
+
+ switch (ev.getActionMasked()) {
+ case ACTION_DOWN -> {
+ mDown.set(ev.getX(), ev.getY());
+ mHasPassedTouchSlop = false;
+ }
+ case ACTION_MOVE -> {
+ if (!mHasPassedTouchSlop) {
+ float displacementY = ev.getY() - mDown.y;
+ if (Math.abs(displacementY) > mTouchSlop) {
+ mHasPassedTouchSlop = true;
+ if (displacementY > 0) {
+ setActive(ev);
+ ev.setAction(ACTION_DOWN);
+ dispatchTouchEvent(ev);
+ }
+ }
+ }
+ }
+ }
+ } else {
+ dispatchTouchEvent(ev);
+ }
+ }
+
+ private void dispatchTouchEvent(MotionEvent ev) {
+ if (mSystemUiProxy.isActive()) {
+ mSystemUiProxy.onStatusBarMotionEvent(ev);
+ }
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java
similarity index 67%
rename from quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java
index bbd8ae5d30..fbe7fde236 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java
@@ -17,18 +17,22 @@ package com.android.quickstep.inputconsumers;
import static android.view.MotionEvent.INVALID_POINTER_ID;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;
import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_CURSOR_HOVER_STATES;
import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.PointF;
+import android.graphics.Rect;
import android.view.GestureDetector;
import android.view.GestureDetector.SimpleOnGestureListener;
import android.view.MotionEvent;
import androidx.annotation.Nullable;
+import com.android.launcher3.DeviceProfile;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.taskbar.TaskbarActivityContext;
@@ -39,9 +43,11 @@ import com.android.quickstep.InputConsumer;
import com.android.systemui.shared.system.InputMonitorCompat;
/**
- * Listens for a long press, and cancels the current gesture if that causes Taskbar to be unstashed.
+ * Listens for touch and hover events to unstash the Taskbar.
+ *
+ * Cancels the current gesture if the long press causes the Taskbar to be unstashed.
*/
-public class TaskbarStashInputConsumer extends DelegateInputConsumer {
+public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
private final TaskbarActivityContext mTaskbarActivityContext;
private final GestureDetector mLongPressDetector;
@@ -63,12 +69,19 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
private final boolean mIsTransientTaskbar;
+ private boolean mIsStashedTaskbarHovered = false;
+ private final Rect mStashedTaskbarHandleBounds = new Rect();
+ private final Rect mBottomEdgeBounds = new Rect();
+ private final int mBottomScreenEdge;
+ private final int mStashedTaskbarBottomEdge;
+
private final @Nullable TransitionCallback mTransitionCallback;
- public TaskbarStashInputConsumer(Context context, InputConsumer delegate,
+ public TaskbarUnstashInputConsumer(Context context, InputConsumer delegate,
InputMonitorCompat inputMonitor, TaskbarActivityContext taskbarActivityContext) {
super(delegate, inputMonitor);
mTaskbarActivityContext = taskbarActivityContext;
+ // TODO(b/270395798): remove this when cleaning up old Persistent Taskbar code.
mSquaredTouchSlop = Utilities.squaredTouchSlop(context);
mScreenWidth = taskbarActivityContext.getDeviceProfile().widthPx;
@@ -89,6 +102,11 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
}
});
+ mBottomScreenEdge = res.getDimensionPixelSize(
+ R.dimen.taskbar_stashed_screen_edge_hover_deadzone_height);
+ mStashedTaskbarBottomEdge =
+ res.getDimensionPixelSize(R.dimen.taskbar_stashed_below_hover_deadzone_height);
+
mTransitionCallback = mIsTransientTaskbar
? taskbarActivityContext.getTranslationCallbacks()
: null;
@@ -96,7 +114,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
@Override
public int getType() {
- return TYPE_TASKBAR_STASH | mDelegate.getType();
+ return TYPE_TASKBAR_STASH | TYPE_CURSOR_HOVER | mDelegate.getType();
}
@Override
@@ -105,7 +123,8 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
if (mState != STATE_ACTIVE) {
mDelegate.onMotionEvent(ev);
- if (mTaskbarActivityContext != null) {
+ // Only show the transient task bar if the touch events are on the screen.
+ if (mTaskbarActivityContext != null && !isTrackpadMotionEvent(ev)) {
final float x = ev.getRawX();
final float y = ev.getRawY();
switch (ev.getAction()) {
@@ -211,4 +230,73 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
}
}
}
+
+ /**
+ * Listen for hover events for the stashed taskbar.
+ *
+ *
When hovered over the stashed taskbar handle, show the unstash hint.
+ *
When the cursor is touching the bottom edge below the stashed taskbar, unstash it.
+ *
When the cursor is within a defined threshold of the screen's bottom edge outside of
+ * the stashed taskbar, unstash it.
+ */
+ @Override
+ public void onHoverEvent(MotionEvent ev) {
+ if (!ENABLE_CURSOR_HOVER_STATES.get() || mTaskbarActivityContext == null
+ || !mTaskbarActivityContext.isTaskbarStashed()) {
+ return;
+ }
+
+ if (mIsStashedTaskbarHovered) {
+ updateHoveredTaskbarState((int) ev.getX(), (int) ev.getY());
+ } else {
+ updateUnhoveredTaskbarState((int) ev.getX(), (int) ev.getY());
+ }
+ }
+
+ private void updateHoveredTaskbarState(int x, int y) {
+ DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile();
+ mStashedTaskbarHandleBounds.set(
+ (dp.widthPx - (int) mUnstashArea) / 2,
+ dp.heightPx - dp.stashedTaskbarHeight,
+ (int) (((dp.widthPx - mUnstashArea) / 2) + mUnstashArea),
+ dp.heightPx);
+ mBottomEdgeBounds.set(mStashedTaskbarHandleBounds);
+ mBottomEdgeBounds.top = dp.heightPx - mStashedTaskbarBottomEdge;
+
+ if (mBottomEdgeBounds.contains(x, y)) {
+ // If hovering stashed taskbar and then hover screen bottom edge, unstash it.
+ mTaskbarActivityContext.onSwipeToUnstashTaskbar();
+ mIsStashedTaskbarHovered = false;
+ } else if (!mStashedTaskbarHandleBounds.contains(x, y)) {
+ // If exit hovering stashed taskbar, remove hint.
+ startStashedTaskbarHover(/* isHovered = */ false);
+ }
+ }
+
+ private void updateUnhoveredTaskbarState(int x, int y) {
+ DeviceProfile dp = mTaskbarActivityContext.getDeviceProfile();
+ mStashedTaskbarHandleBounds.set(
+ (dp.widthPx - (int) mUnstashArea) / 2,
+ dp.heightPx - dp.stashedTaskbarHeight,
+ (int) (((dp.widthPx - mUnstashArea) / 2) + mUnstashArea),
+ dp.heightPx);
+ mBottomEdgeBounds.set(
+ 0,
+ dp.heightPx - mBottomScreenEdge,
+ dp.widthPx,
+ dp.heightPx);
+
+ if (mStashedTaskbarHandleBounds.contains(x, y)) {
+ // If enter hovering stashed taskbar, start hint.
+ startStashedTaskbarHover(/* isHovered = */ true);
+ } else if (mBottomEdgeBounds.contains(x, y)) {
+ // If hover screen's bottom edge not below the stashed taskbar, unstash it.
+ mTaskbarActivityContext.onSwipeToUnstashTaskbar();
+ }
+ }
+
+ private void startStashedTaskbarHover(boolean isHovered) {
+ mTaskbarActivityContext.startTaskbarUnstashHint(isHovered, /* forceUnstash = */ true);
+ mIsStashedTaskbarHovered = isHovered;
+ }
}
diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index 79971de0e8..6619dd86f6 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -26,6 +26,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
@@ -60,14 +61,17 @@ import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatedFloat;
import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.taskbar.TaskbarManager;
import com.android.launcher3.util.Executors;
import com.android.quickstep.GestureState;
import com.android.quickstep.TouchInteractionService.TISBinder;
+import com.android.quickstep.util.LottieAnimationColorUtils;
import com.android.quickstep.util.TISBindHelper;
import com.airbnb.lottie.LottieAnimationView;
import java.net.URISyntaxException;
+import java.util.Map;
/**
* A page shows after SUW flow to hint users to swipe up from the bottom of the screen to go home
@@ -82,22 +86,22 @@ public class AllSetActivity extends Activity {
private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "suwColorAccentLight";
private static final String EXTRA_DEVICE_NAME = "suwDeviceName";
+ private static final String LOTTIE_PRIMARY_COLOR_TOKEN = ".primary";
+ private static final String LOTTIE_TERTIARY_COLOR_TOKEN = ".tertiary";
+
private static final float HINT_BOTTOM_FACTOR = 1 - .94f;
private static final int MAX_SWIPE_DURATION = 350;
private static final float ANIMATION_PAUSE_ALPHA_THRESHOLD = 0.1f;
- private final Rect mTempSettingsBounds = new Rect();
- private final Rect mTempInclusionBounds = new Rect();
- private final Rect mTempExclusionBounds = new Rect();
-
private TISBindHelper mTISBindHelper;
private TISBinder mBinder;
+ @Nullable private TaskbarManager mTaskbarManager = null;
private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate);
private BgDrawable mBackground;
- private View mContentView;
+ private View mRootView;
private float mSwipeUpShift;
@Nullable private Vibrator mVibrator;
@@ -110,11 +114,13 @@ public class AllSetActivity extends Activity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_allset);
- findViewById(R.id.root_view).setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ mRootView = findViewById(R.id.root_view);
+ mRootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
- int mode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+ Resources resources = getResources();
+ int mode = resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
boolean isDarkTheme = mode == Configuration.UI_MODE_NIGHT_YES;
Intent intent = getIntent();
int accentColor = intent.getIntExtra(
@@ -124,9 +130,8 @@ public class AllSetActivity extends Activity {
((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(accentColor);
mBackground = new BgDrawable(this);
- findViewById(R.id.root_view).setBackground(mBackground);
- mContentView = findViewById(R.id.content_view);
- mSwipeUpShift = getResources().getDimension(R.dimen.allset_swipe_up_shift);
+ mRootView.setBackground(mBackground);
+ mSwipeUpShift = resources.getDimension(R.dimen.allset_swipe_up_shift);
TextView subtitle = findViewById(R.id.subtitle);
String suwDeviceName = intent.getStringExtra(EXTRA_DEVICE_NAME);
@@ -153,34 +158,6 @@ public class AllSetActivity extends Activity {
}
hint.setAccessibilityDelegate(new SkipButtonAccessibilityDelegate());
- View textContent = findViewById(R.id.text_content_view);
- textContent.addOnLayoutChangeListener(
- (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
- mTempSettingsBounds.set(
- settings.getLeft(),
- settings.getTop(),
- settings.getRight(),
- settings.getBottom());
- mTempInclusionBounds.set(
- 0,
- // Do not allow overlapping with the subtitle text
- subtitle.getBottom(),
- textContent.getWidth(),
- textContent.getHeight());
- mTempExclusionBounds.set(
- hint.getLeft(),
- hint.getTop(),
- hint.getRight(),
- hint.getBottom());
-
- Utilities.translateOverlappingView(
- settings,
- mTempSettingsBounds,
- mTempInclusionBounds,
- mTempExclusionBounds,
- Utilities.TRANSLATE_UP);
- });
-
mTISBindHelper = new TISBindHelper(this, this::onTISConnected);
mVibrator = getSystemService(Vibrator.class);
@@ -188,8 +165,15 @@ public class AllSetActivity extends Activity {
// There's a bug in the currently used external Lottie library (v5.2.0), and it doesn't load
// the correct animation from the raw resources when configuration changes, so we need to
// manually load the resource and pass it to Lottie.
- mAnimatedBackground.setAnimation(getResources().openRawResource(R.raw.all_set_page_bg),
+ mAnimatedBackground.setAnimation(resources.openRawResource(R.raw.all_set_page_bg),
null);
+
+ LottieAnimationColorUtils.updateColors(
+ mAnimatedBackground,
+ Map.of(LOTTIE_PRIMARY_COLOR_TOKEN, R.color.all_set_bg_primary,
+ LOTTIE_TERTIARY_COLOR_TOKEN, R.color.all_set_bg_tertiary),
+ getTheme());
+
startBackgroundAnimation();
}
@@ -248,22 +232,31 @@ public class AllSetActivity extends Activity {
mAnimatedBackground.playAnimation();
}
+ private void setSetupUIVisible(boolean visible) {
+ if (mBinder == null || mTaskbarManager == null) return;
+ mTaskbarManager.setSetupUIVisible(visible);
+ }
+
@Override
protected void onResume() {
super.onResume();
maybeResumeOrPauseBackgroundAnimation();
if (mBinder != null) {
- mBinder.getTaskbarManager().setSetupUIVisible(true);
+ setSetupUIVisible(true);
mBinder.setSwipeUpProxy(this::createSwipeUpProxy);
}
}
private void onTISConnected(TISBinder binder) {
mBinder = binder;
- mBinder.getTaskbarManager().setSetupUIVisible(isResumed());
+ mTaskbarManager = mBinder.getTaskbarManager();
+ setSetupUIVisible(isResumed());
mBinder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null);
mBinder.setOverviewTargetChangeListener(mBinder::preloadOverviewForSUWAllSet);
mBinder.preloadOverviewForSUWAllSet();
+ if (mTaskbarManager != null) {
+ mLauncherStartAnim = mTaskbarManager.createLauncherStartFromSuwAnim(MAX_SWIPE_DURATION);
+ }
}
@Override
@@ -279,7 +272,7 @@ public class AllSetActivity extends Activity {
private void clearBinderOverride() {
if (mBinder != null) {
- mBinder.getTaskbarManager().setSetupUIVisible(false);
+ setSetupUIVisible(false);
mBinder.setSwipeUpProxy(null);
mBinder.setOverviewTargetChangeListener(null);
}
@@ -335,16 +328,12 @@ public class AllSetActivity extends Activity {
private void onSwipeProgressUpdate() {
mBackground.setProgress(mSwipeProgress.value);
float alpha = getContentViewAlphaForSwipeProgress();
- mContentView.setAlpha(alpha);
- mContentView.setTranslationY((alpha - 1) * mSwipeUpShift);
+ mRootView.setAlpha(alpha);
+ mRootView.setTranslationY((alpha - 1) * mSwipeUpShift);
- if (mLauncherStartAnim == null) {
- mLauncherStartAnim = mBinder.getTaskbarManager().createLauncherStartFromSuwAnim(
- MAX_SWIPE_DURATION);
- }
if (mLauncherStartAnim != null) {
- mLauncherStartAnim.setPlayFraction(Utilities.mapBoundToRange(
- mSwipeProgress.value, 0, 1, 0, 1, FAST_OUT_SLOW_IN));
+ mLauncherStartAnim.setPlayFraction(
+ FAST_OUT_SLOW_IN.getInterpolation(mSwipeProgress.value));
}
maybeResumeOrPauseBackgroundAnimation();
}
diff --git a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java
index 73937f5914..742b0fc7e8 100644
--- a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java
+++ b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java
@@ -24,16 +24,11 @@ import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.annotation.ColorInt;
import android.content.Context;
-import android.graphics.Matrix;
import android.graphics.Outline;
import android.graphics.Rect;
import android.util.AttributeSet;
-import android.util.Log;
import android.view.View;
import android.view.ViewOutlineProvider;
-import android.view.animation.ScaleAnimation;
-import android.view.animation.TranslateAnimation;
-import android.widget.ViewAnimator;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -60,17 +55,16 @@ public class AnimatedTaskView extends ConstraintLayout {
private float mTaskViewAnimatedRadius;
public AnimatedTaskView(@NonNull Context context) {
- super(context);
+ this(context, null);
}
- public AnimatedTaskView(@NonNull Context context,
- @Nullable AttributeSet attrs) {
- super(context, attrs);
+ public AnimatedTaskView(@NonNull Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
}
public AnimatedTaskView(
@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
+ this(context, attrs, defStyleAttr, 0);
}
public AnimatedTaskView(
@@ -92,45 +86,6 @@ public class AnimatedTaskView extends ConstraintLayout {
setToSingleRowLayout(false);
}
- void animateToFillScreen(@Nullable Runnable onAnimationEndCallback) {
-
- AnimatorSet set = new AnimatorSet();
- ArrayList animations = new ArrayList<>();
-
- // center view
- animations.add(ObjectAnimator.ofFloat(this, TRANSLATION_X, 0));
-
- // calculate full screen scaling, scale should be 1:1 for x and y
- Matrix matrix = getAnimationMatrix();
- float[] matrixValues = new float[9];
- matrix.getValues(matrixValues);
- float scaleX = matrixValues[Matrix.MSCALE_X];
- float scaleToFullScreen = 1 / scaleX;
-
- // scale view to full screen
- ValueAnimator scale = ValueAnimator.ofFloat(1f, scaleToFullScreen);
- scale.addUpdateListener(animation -> {
- float value = (float) animation.getAnimatedValue();
- mFullTaskView.setScaleX(value);
- mFullTaskView.setScaleY(value);
- });
-
- animations.add(scale);
- set.playSequentially(animations);
-
- set.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- super.onAnimationEnd(animation);
- if (onAnimationEndCallback != null) {
- onAnimationEndCallback.run();
- }
- }
- });
-
- set.start();
- }
-
AnimatorSet createAnimationToMultiRowLayout() {
if (mTaskViewOutlineProvider == null) {
// This is an illegal state.
@@ -158,17 +113,7 @@ public class AnimatedTaskView extends ConstraintLayout {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
-
- mTaskViewAnimatedRect.set(outlineStartRect);
- mTaskViewAnimatedRadius = outlineStartRadius;
-
- mFullTaskView.setClipToOutline(true);
- mFullTaskView.setOutlineProvider(new ViewOutlineProvider() {
- @Override
- public void getOutline(View view, Outline outline) {
- outline.setRoundRect(mTaskViewAnimatedRect, mTaskViewAnimatedRadius);
- }
- });
+ addAnimatedOutlineProvider(mFullTaskView, outlineStartRect, outlineStartRadius);
}
@Override
@@ -247,4 +192,17 @@ public class AnimatedTaskView extends ConstraintLayout {
mTaskViewOutlineProvider = provider;
mFullTaskView.setOutlineProvider(mTaskViewOutlineProvider);
}
+
+ private void addAnimatedOutlineProvider(View view,
+ Rect outlineStartRect, float outlineStartRadius){
+ mTaskViewAnimatedRect.set(outlineStartRect);
+ mTaskViewAnimatedRadius = outlineStartRadius;
+ view.setClipToOutline(true);
+ view.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRoundRect(mTaskViewAnimatedRect, mTaskViewAnimatedRadius);
+ }
+ });
+ }
}
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
deleted file mode 100644
index 40c600f512..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.quickstep.interaction;
-
-import android.graphics.PointF;
-
-import com.android.launcher3.R;
-import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
-import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
-
-/** A {@link TutorialController} for the Assistant tutorial. */
-final class AssistantGestureTutorialController extends TutorialController {
-
- AssistantGestureTutorialController(AssistantGestureTutorialFragment fragment,
- TutorialType tutorialType) {
- super(fragment, tutorialType);
- }
-
- @Override
- public void onBackGestureAttempted(BackGestureResult result) {
- switch (mTutorialType) {
- case ASSISTANT:
- switch (result) {
- case BACK_COMPLETED_FROM_LEFT:
- case BACK_COMPLETED_FROM_RIGHT:
- case BACK_CANCELLED_FROM_LEFT:
- case BACK_CANCELLED_FROM_RIGHT:
- showFeedback(R.string.assistant_gesture_feedback_swipe_too_far_from_corner);
- break;
- }
- break;
- case ASSISTANT_COMPLETE:
- if (result == BackGestureResult.BACK_COMPLETED_FROM_LEFT
- || result == BackGestureResult.BACK_COMPLETED_FROM_RIGHT) {
- mTutorialFragment.close();
- }
- break;
- }
- }
-
-
- @Override
- public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
- switch (mTutorialType) {
- case ASSISTANT:
- switch (result) {
- case HOME_GESTURE_COMPLETED:
- case OVERVIEW_GESTURE_COMPLETED:
- case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
- case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
- case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
- case HOME_OR_OVERVIEW_CANCELLED:
- showFeedback(R.string.assistant_gesture_feedback_swipe_too_far_from_corner);
- break;
- case ASSISTANT_COMPLETED:
- showRippleEffect(null);
- showFeedback(R.string.assistant_gesture_tutorial_playground_subtitle);
- break;
- case ASSISTANT_NOT_STARTED_BAD_ANGLE:
- showFeedback(R.string.assistant_gesture_feedback_swipe_not_diagonal);
- break;
- case ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT:
- showFeedback(R.string.assistant_gesture_feedback_swipe_not_long_enough);
- break;
- }
- break;
- case ASSISTANT_COMPLETE:
- if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
- mTutorialFragment.close();
- }
- break;
- }
- }
-
- @Override
- public void setAssistantProgress(float progress) {
- // TODO: Create an animation.
- }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
deleted file mode 100644
index 90a1c36dc4..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.quickstep.interaction;
-
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.logging.StatsLogManager;
-import com.android.quickstep.interaction.TutorialController.TutorialType;
-
-/** Shows the Home gesture interactive tutorial. */
-public class AssistantGestureTutorialFragment extends TutorialFragment {
-
- public AssistantGestureTutorialFragment(boolean fromTutorialMenu) {
- super(fromTutorialMenu);
- }
-
- @Override
- TutorialController createController(TutorialType type) {
- return new AssistantGestureTutorialController(this, type);
- }
-
- @Override
- Class getControllerClass() {
- return AssistantGestureTutorialController.class;
- }
-
- @Override
- public boolean onTouch(View view, MotionEvent motionEvent) {
- if (motionEvent.getAction() == MotionEvent.ACTION_DOWN && mTutorialController != null) {
- mTutorialController.setRippleHotspot(motionEvent.getX(), motionEvent.getY());
- }
- return super.onTouch(view, motionEvent);
- }
-
- @Override
- void logTutorialStepShown(@NonNull StatsLogManager statsLogManager) {
- // No-Op: tutorial step not currently shown to users
- }
-
- @Override
- void logTutorialStepCompleted(@NonNull StatsLogManager statsLogManager) {
- // No-Op: tutorial step not currently shown to users
- }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 920b32d4c1..5d2527973e 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -28,6 +28,9 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.anim.Interpolators;
import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+import com.android.quickstep.util.LottieAnimationColorUtils;
+
+import java.util.Map;
/** A {@link TutorialController} for the Back tutorial. */
final class BackGestureTutorialController extends TutorialController {
@@ -36,6 +39,22 @@ final class BackGestureTutorialController extends TutorialController {
BackGestureTutorialController(BackGestureTutorialFragment fragment, TutorialType tutorialType) {
super(fragment, tutorialType);
+ // Set the Lottie animation colors specifically for the Back gesture
+ if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ LottieAnimationColorUtils.updateColors(
+ mAnimatedGestureDemonstration,
+ Map.of(".onSurfaceBack", fragment.mRootView.mColorOnSurfaceBack,
+ ".surfaceBack", fragment.mRootView.mColorSurfaceBack,
+ ".secondaryBack", fragment.mRootView.mColorSecondaryBack));
+
+ LottieAnimationColorUtils.updateColors(
+ mCheckmarkAnimation,
+ Map.of(".checkmark",
+ Utilities.isDarkTheme(mContext)
+ ? fragment.mRootView.mColorOnSurfaceBack
+ : fragment.mRootView.mColorSecondaryBack,
+ ".checkmarkBackground", fragment.mRootView.mColorSurfaceBack));
+ }
}
@Override
@@ -47,7 +66,9 @@ final class BackGestureTutorialController extends TutorialController {
@Override
public int getIntroductionSubtitle() {
- return R.string.back_gesture_intro_subtitle;
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.back_gesture_tutorial_subtitle
+ : R.string.back_gesture_intro_subtitle;
}
@Override
@@ -55,6 +76,11 @@ final class BackGestureTutorialController extends TutorialController {
return R.string.back_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
@@ -62,6 +88,28 @@ final class BackGestureTutorialController extends TutorialController {
: R.string.back_gesture_feedback_complete_with_overview_follow_up;
}
+ @Override
+ public int getTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Back;
+ }
+
+ @Override
+ public int getSuccessTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Back;
+ }
+
+ @Override
+ public int getDoneButtonTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_ButtonLabel_Back;
+ }
+
+ @Override
+ public int getDoneButtonColor() {
+ return Utilities.isDarkTheme(mContext)
+ ? mTutorialFragment.mRootView.mColorOnSurfaceBack
+ : mTutorialFragment.mRootView.mColorSecondaryBack;
+ }
+
@Override
protected int getMockAppTaskLayoutResId() {
return getMockAppTaskCurrentPageLayoutResId();
@@ -70,7 +118,9 @@ final class BackGestureTutorialController extends TutorialController {
@Override
protected int getGestureLottieAnimationId() {
return mTutorialFragment.isLargeScreen()
- ? R.raw.back_gesture_tutorial_tablet_animation
+ ? mTutorialFragment.isFoldable()
+ ? R.raw.back_gesture_tutorial_open_foldable_animation
+ : R.raw.back_gesture_tutorial_tablet_animation
: R.raw.back_gesture_tutorial_animation;
}
@@ -93,13 +143,18 @@ final class BackGestureTutorialController extends TutorialController {
}
@Override
- protected int getSwipeActionColorResId() {
- return R.color.gesture_back_tutorial_background;
+ protected int getFakeLauncherColor() {
+ return mTutorialFragment.mRootView.mColorSurfaceContainer;
+ }
+
+ @Override
+ protected int getExitingAppColor() {
+ return mTutorialFragment.mRootView.mColorSurfaceBack;
}
@Override
public void onBackGestureAttempted(BackGestureResult result) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
switch (mTutorialType) {
@@ -117,7 +172,7 @@ final class BackGestureTutorialController extends TutorialController {
@Override
public void onBackGestureProgress(float diffx, float diffy, boolean isLeftGesture) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
@@ -186,7 +241,7 @@ final class BackGestureTutorialController extends TutorialController {
@Override
public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
if (mTutorialType == BACK_NAVIGATION_COMPLETE) {
@@ -203,9 +258,6 @@ final class BackGestureTutorialController extends TutorialController {
case HOME_GESTURE_COMPLETED:
case OVERVIEW_GESTURE_COMPLETED:
case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
- case ASSISTANT_COMPLETED:
- case ASSISTANT_NOT_STARTED_BAD_ANGLE:
- case ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT:
default:
showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index 1ac07425bd..62726a01d2 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -16,6 +16,8 @@
package com.android.quickstep.interaction;
import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
import android.graphics.Color;
import android.graphics.Rect;
import android.os.Bundle;
@@ -29,6 +31,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.R;
import com.android.launcher3.config.FeatureFlags;
@@ -53,10 +57,12 @@ public class GestureSandboxActivity extends FragmentActivity {
private int mCurrentStep;
private int mNumSteps;
+ private boolean mShowRotationPrompt;
private SharedPreferences mSharedPrefs;
private StatsLogManager mStatsLogManager;
+ private View mRotationPrompt;
private TISBindHelper mTISBindHelper;
private TISBinder mBinder;
@@ -94,9 +100,49 @@ public class GestureSandboxActivity extends FragmentActivity {
.add(R.id.gesture_tutorial_fragment_container, mFragment)
.commit();
+ mRotationPrompt = findViewById(R.id.rotation_prompt);
+ if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ correctUserOrientation();
+ }
mTISBindHelper = new TISBindHelper(this, this::onTISConnected);
}
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+
+ // Ensure the prompt to rotate the screen is updated
+ if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ correctUserOrientation();
+ }
+ }
+
+ /**
+ * Gesture animations are only in landscape for large screens and portrait for mobile. This
+ * method enforces the following flows:
+ * 1) phone / two-panel closed -> lock to portrait
+ * 2) two-panel open / tablet + portrait -> prompt the user to rotate the screen
+ * 3) two-panel open / tablet + landscape -> hide potential rotating prompt
+ */
+ private void correctUserOrientation() {
+ DeviceProfile deviceProfile = InvariantDeviceProfile.INSTANCE.get(
+ getApplicationContext()).getDeviceProfile(this);
+ if (deviceProfile.isTablet) {
+ mShowRotationPrompt = getResources().getConfiguration().orientation
+ == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+ updateVisibility(mRotationPrompt, mShowRotationPrompt ? View.VISIBLE : View.GONE);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ }
+ }
+
+ void updateVisibility(View view, int visibility) {
+ if (view == null || view.getVisibility() == visibility) {
+ return;
+ }
+ view.setVisibility(visibility);
+ }
+
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
@@ -128,6 +174,10 @@ public class GestureSandboxActivity extends FragmentActivity {
super.onSaveInstanceState(savedInstanceState);
}
+ protected boolean isRotationPromptShowing() {
+ return mShowRotationPrompt;
+ }
+
protected SharedPreferences getSharedPrefs() {
return mSharedPrefs;
}
@@ -186,7 +236,8 @@ public class GestureSandboxActivity extends FragmentActivity {
public void launchTutorialMenu() {
mFragment = new MenuFragment();
getSupportFragmentManager().beginTransaction()
- .add(R.id.gesture_tutorial_fragment_container, mFragment)
+ .replace(R.id.gesture_tutorial_fragment_container, mFragment)
+ .runOnCommit(() -> mFragment.onAttachedToWindow())
.commit();
}
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 91d337fa53..0aa80d3e79 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -22,8 +22,12 @@ import android.graphics.PointF;
import android.os.Build;
import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+import com.android.quickstep.util.LottieAnimationColorUtils;
+
+import java.util.Map;
/** A {@link TutorialController} for the Home tutorial. */
@TargetApi(Build.VERSION_CODES.R)
@@ -31,6 +35,23 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
HomeGestureTutorialController(HomeGestureTutorialFragment fragment, TutorialType tutorialType) {
super(fragment, tutorialType);
+
+ // Set the Lottie animation colors specifically for the Home gesture
+ if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ LottieAnimationColorUtils.updateColors(
+ mAnimatedGestureDemonstration,
+ Map.of(".onSurfaceHome", fragment.mRootView.mColorOnSurfaceHome,
+ ".surfaceHome", fragment.mRootView.mColorSurfaceHome,
+ ".secondaryHome", fragment.mRootView.mColorSecondaryHome));
+
+ LottieAnimationColorUtils.updateColors(
+ mCheckmarkAnimation,
+ Map.of(".checkmark",
+ Utilities.isDarkTheme(mContext)
+ ? fragment.mRootView.mColorOnSurfaceHome
+ : fragment.mRootView.mColorSecondaryHome,
+ ".checkmarkBackground", fragment.mRootView.mColorSurfaceHome));
+ }
}
@Override
@@ -52,6 +73,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
return R.string.home_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.home_gesture_tutorial_success
+ : R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
@@ -59,30 +87,67 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
: R.string.home_gesture_feedback_complete_with_follow_up;
}
+ @Override
+ public int getTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Home;
+ }
+
+ @Override
+ public int getSuccessTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Home;
+ }
+
+ @Override
+ public int getDoneButtonTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_ButtonLabel_Home;
+ }
+
+ @Override
+ public int getDoneButtonColor() {
+ return Utilities.isDarkTheme(mContext)
+ ? mTutorialFragment.mRootView.mColorOnSurfaceHome
+ : mTutorialFragment.mRootView.mColorSecondaryHome;
+ }
+
@Override
protected int getMockAppTaskLayoutResId() {
- return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
- ? R.layout.swipe_up_gesture_tutorial_shape
- : mTutorialFragment.isLargeScreen()
- ? R.layout.gesture_tutorial_tablet_mock_webpage
- : R.layout.gesture_tutorial_mock_webpage;
+ return mTutorialFragment.isLargeScreen()
+ ? R.layout.gesture_tutorial_tablet_mock_webpage
+ : R.layout.gesture_tutorial_mock_webpage;
}
@Override
protected int getGestureLottieAnimationId() {
return mTutorialFragment.isLargeScreen()
- ? R.raw.home_gesture_tutorial_tablet_animation
+ ? mTutorialFragment.isFoldable()
+ ? R.raw.home_gesture_tutorial_open_foldable_animation
+ : R.raw.home_gesture_tutorial_tablet_animation
: R.raw.home_gesture_tutorial_animation;
}
@Override
- protected int getSwipeActionColorResId() {
- return R.color.gesture_home_tutorial_swipe_up_rect;
+ protected int getFakeTaskViewColor() {
+ return isGestureCompleted() ? getFakeLauncherColor() : getExitingAppColor();
+ }
+
+ @Override
+ protected int getFakeLauncherColor() {
+ return mTutorialFragment.mRootView.mColorSurfaceContainer;
+ }
+
+ @Override
+ protected int getExitingAppColor() {
+ return mTutorialFragment.mRootView.mColorSurfaceHome;
+ }
+
+ @Override
+ protected int getHotseatIconColor() {
+ return getExitingAppColor();
}
@Override
public void onBackGestureAttempted(BackGestureResult result) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
switch (mTutorialType) {
@@ -93,6 +158,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
case BACK_CANCELLED_FROM_LEFT:
case BACK_CANCELLED_FROM_RIGHT:
case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
+ resetTaskViews();
showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
break;
}
@@ -108,7 +174,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
@Override
public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
switch (mTutorialType) {
@@ -122,17 +188,18 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
}
case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
+ resetTaskViews();
showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
break;
case OVERVIEW_GESTURE_COMPLETED:
- fadeOutFakeTaskView(true, true, () -> {
+ fadeOutFakeTaskView(false, () -> {
showFeedback(R.string.home_gesture_feedback_overview_detected);
showFakeTaskbar(/* animateFromHotseat= */ false);
});
break;
case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
case HOME_OR_OVERVIEW_CANCELLED:
- fadeOutFakeTaskView(false, true, null);
+ fadeOutFakeTaskView(false, null);
showFeedback(R.string.home_gesture_feedback_wrong_swipe_direction);
break;
}
diff --git a/quickstep/src/com/android/quickstep/interaction/MenuFragment.java b/quickstep/src/com/android/quickstep/interaction/MenuFragment.java
index ccff30d319..46f79b1ce8 100644
--- a/quickstep/src/com/android/quickstep/interaction/MenuFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/MenuFragment.java
@@ -19,6 +19,7 @@ import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_GESTU
import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_TUTORIAL_TYPE;
import static com.android.quickstep.interaction.GestureSandboxActivity.KEY_USE_TUTORIAL_MENU;
+import android.graphics.Rect;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -27,17 +28,33 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.R;
/** Displays the gesture nav tutorial menu. */
public final class MenuFragment extends GestureSandboxFragment {
+ @NonNull private Rect mInsets = new Rect();
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mInsets = InvariantDeviceProfile.INSTANCE.get(getContext())
+ .getDeviceProfile(getContext()).getInsets();
+ }
+
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View root = inflater.inflate(
R.layout.gesture_tutorial_step_menu, container, false);
+ root.setPadding(
+ root.getPaddingLeft() + mInsets.left,
+ root.getPaddingTop() + mInsets.top,
+ root.getPaddingRight() + mInsets.right,
+ root.getPaddingBottom() + mInsets.bottom);
+
root.findViewById(R.id.gesture_tutorial_menu_home_button).setOnClickListener(
v -> launchTutorialStep(TutorialController.TutorialType.HOME_NAVIGATION));
root.findViewById(R.id.gesture_tutorial_menu_back_button).setOnClickListener(
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index 57874d9deb..6cee6906d4 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -15,11 +15,7 @@
*/
package com.android.quickstep.interaction;
-import static com.android.launcher3.Utilities.squaredHypot;
import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.ASSISTANT_COMPLETED;
-import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.ASSISTANT_NOT_STARTED_BAD_ANGLE;
-import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT;
import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_GESTURE_COMPLETED;
import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_NOT_STARTED_TOO_FAR_FROM_EDGE;
import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_OR_OVERVIEW_CANCELLED;
@@ -27,24 +23,16 @@ import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestu
import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.OVERVIEW_GESTURE_COMPLETED;
import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE;
-import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.PointF;
-import android.graphics.RectF;
-import android.os.SystemClock;
-import android.view.Display;
-import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnTouchListener;
-import android.view.ViewConfiguration;
import androidx.annotation.Nullable;
-import com.android.launcher3.R;
-import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.testing.shared.ResourceUtils;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.NavigationMode;
@@ -52,46 +40,25 @@ import com.android.launcher3.util.VibratorWrapper;
import com.android.quickstep.util.MotionPauseDetector;
import com.android.quickstep.util.NavBarPosition;
import com.android.quickstep.util.TriggerSwipeUpTouchTracker;
-import com.android.systemui.shared.system.QuickStepContract;
-/** Utility class to handle Home and Assistant gestures. */
+/** Utility class to handle Home gesture. */
public class NavBarGestureHandler implements OnTouchListener,
TriggerSwipeUpTouchTracker.OnSwipeUpListener, MotionPauseDetector.OnMotionPauseListener {
private static final String LOG_TAG = "NavBarGestureHandler";
- private static final long RETRACT_GESTURE_ANIMATION_DURATION_MS = 300;
-
private final Context mContext;
private final Point mDisplaySize = new Point();
private final TriggerSwipeUpTouchTracker mSwipeUpTouchTracker;
private final int mBottomGestureHeight;
- private final GestureDetector mAssistantGestureDetector;
- private final int mAssistantAngleThreshold;
- private final RectF mAssistantLeftRegion = new RectF();
- private final RectF mAssistantRightRegion = new RectF();
- private final float mAssistantDragDistThreshold;
- private final float mAssistantFlingDistThreshold;
- private final long mAssistantTimeThreshold;
- private final float mAssistantSquaredSlop;
- private final PointF mAssistantStartDragPos = new PointF();
private final PointF mDownPos = new PointF();
private final PointF mLastPos = new PointF();
private final MotionPauseDetector mMotionPauseDetector;
- private boolean mTouchCameFromAssistantCorner;
private boolean mTouchCameFromNavBar;
- private boolean mPassedAssistantSlop;
- private boolean mAssistantGestureActive;
- private boolean mLaunchedAssistant;
- private long mAssistantDragStartTime;
- private float mAssistantDistance;
- private float mAssistantTimeFraction;
- private float mAssistantLastProgress;
@Nullable
private NavBarGestureAttemptCallback mGestureCallback;
NavBarGestureHandler(Context context) {
mContext = context;
- final Display display = mContext.getDisplay();
DisplayController.Info displayInfo = DisplayController.INSTANCE.get(mContext).getInfo();
final int displayRotation = displayInfo.rotation;
Point currentSize = displayInfo.currentSize;
@@ -105,27 +72,6 @@ public class NavBarGestureHandler implements OnTouchListener,
final Resources resources = context.getResources();
mBottomGestureHeight =
ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, resources);
- mAssistantDragDistThreshold =
- resources.getDimension(R.dimen.gestures_assistant_drag_threshold);
- mAssistantFlingDistThreshold =
- resources.getDimension(R.dimen.gestures_assistant_fling_threshold);
- mAssistantTimeThreshold =
- resources.getInteger(R.integer.assistant_gesture_min_time_threshold);
- mAssistantAngleThreshold =
- resources.getInteger(R.integer.assistant_gesture_corner_deg_threshold);
-
- mAssistantGestureDetector = new GestureDetector(context, new AssistantGestureListener());
- int assistantWidth = resources.getDimensionPixelSize(R.dimen.gestures_assistant_width);
- final float assistantHeight = Math.max(mBottomGestureHeight,
- QuickStepContract.getWindowCornerRadius(context));
- mAssistantLeftRegion.bottom = mAssistantRightRegion.bottom = mDisplaySize.y;
- mAssistantLeftRegion.top = mAssistantRightRegion.top = mDisplaySize.y - assistantHeight;
- mAssistantLeftRegion.left = 0;
- mAssistantLeftRegion.right = assistantWidth;
- mAssistantRightRegion.right = mDisplaySize.x;
- mAssistantRightRegion.left = mDisplaySize.x - assistantWidth;
- float slop = ViewConfiguration.get(context).getScaledTouchSlop();
- mAssistantSquaredSlop = slop * slop;
}
void registerNavBarGestureAttemptCallback(NavBarGestureAttemptCallback callback) {
@@ -138,7 +84,7 @@ public class NavBarGestureHandler implements OnTouchListener,
@Override
public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
- if (mGestureCallback == null || mAssistantGestureActive) {
+ if (mGestureCallback == null) {
return;
}
if (mTouchCameFromNavBar) {
@@ -153,7 +99,7 @@ public class NavBarGestureHandler implements OnTouchListener,
@Override
public void onSwipeUpCancelled() {
- if (mGestureCallback != null && !mAssistantGestureActive) {
+ if (mGestureCallback != null) {
mGestureCallback.onNavBarGestureAttempted(HOME_OR_OVERVIEW_CANCELLED, new PointF());
}
}
@@ -166,52 +112,16 @@ public class NavBarGestureHandler implements OnTouchListener,
case MotionEvent.ACTION_DOWN:
mDownPos.set(event.getX(), event.getY());
mLastPos.set(mDownPos);
- mTouchCameFromAssistantCorner =
- mAssistantLeftRegion.contains(event.getX(), event.getY())
- || mAssistantRightRegion.contains(event.getX(), event.getY());
- mAssistantGestureActive = mTouchCameFromAssistantCorner;
- mTouchCameFromNavBar = !mTouchCameFromAssistantCorner
- && mDownPos.y >= mDisplaySize.y - mBottomGestureHeight;
+ mTouchCameFromNavBar = mDownPos.y >= mDisplaySize.y - mBottomGestureHeight;
if (!mTouchCameFromNavBar && mGestureCallback != null) {
mGestureCallback.setNavBarGestureProgress(null);
}
- mLaunchedAssistant = false;
mSwipeUpTouchTracker.init();
mMotionPauseDetector.clear();
mMotionPauseDetector.setOnMotionPauseListener(this);
break;
case MotionEvent.ACTION_MOVE:
mLastPos.set(event.getX(), event.getY());
- if (!mAssistantGestureActive) {
- break;
- }
-
- if (!mPassedAssistantSlop) {
- // Normal gesture, ensure we pass the slop before we start tracking the gesture
- if (squaredHypot(mLastPos.x - mDownPos.x, mLastPos.y - mDownPos.y)
- > mAssistantSquaredSlop) {
-
- mPassedAssistantSlop = true;
- mAssistantStartDragPos.set(mLastPos.x, mLastPos.y);
- mAssistantDragStartTime = SystemClock.uptimeMillis();
-
- mAssistantGestureActive = isValidAssistantGestureAngle(
- mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y);
- if (!mAssistantGestureActive && mGestureCallback != null) {
- mGestureCallback.onNavBarGestureAttempted(
- ASSISTANT_NOT_STARTED_BAD_ANGLE, new PointF());
- }
- }
- } else {
- // Movement
- mAssistantDistance = (float) Math.hypot(mLastPos.x - mAssistantStartDragPos.x,
- mLastPos.y - mAssistantStartDragPos.y);
- if (mAssistantDistance >= 0) {
- final long diff = SystemClock.uptimeMillis() - mAssistantDragStartTime;
- mAssistantTimeFraction = Math.min(diff * 1f / mAssistantTimeThreshold, 1);
- updateAssistantProgress();
- }
- }
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
@@ -222,35 +132,19 @@ public class NavBarGestureHandler implements OnTouchListener,
intercepted = true;
break;
}
- if (mAssistantGestureActive && !mLaunchedAssistant && mGestureCallback != null) {
- mGestureCallback.onNavBarGestureAttempted(
- ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT, new PointF());
- ValueAnimator animator = ValueAnimator.ofFloat(mAssistantLastProgress, 0)
- .setDuration(RETRACT_GESTURE_ANIMATION_DURATION_MS);
- animator.addUpdateListener(valueAnimator -> {
- float progress = (float) valueAnimator.getAnimatedValue();
- mGestureCallback.setAssistantProgress(progress);
- });
- animator.setInterpolator(Interpolators.DEACCEL_2);
- animator.start();
- }
- mPassedAssistantSlop = false;
break;
}
if (mTouchCameFromNavBar && mGestureCallback != null) {
mGestureCallback.setNavBarGestureProgress(event.getY() - mDownPos.y);
}
mSwipeUpTouchTracker.onMotionEvent(event);
- mAssistantGestureDetector.onTouchEvent(event);
mMotionPauseDetector.addPosition(event);
mMotionPauseDetector.setDisallowPause(mLastPos.y >= mDisplaySize.y - mBottomGestureHeight);
return intercepted;
}
boolean onInterceptTouch(MotionEvent event) {
- return mAssistantLeftRegion.contains(event.getX(), event.getY())
- || mAssistantRightRegion.contains(event.getX(), event.getY())
- || event.getY() >= mDisplaySize.y - mBottomGestureHeight;
+ return event.getY() >= mDisplaySize.y - mBottomGestureHeight;
}
@Override
@@ -263,39 +157,6 @@ public class NavBarGestureHandler implements OnTouchListener,
VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
}
- /**
- * Determine if angle is larger than threshold for assistant detection
- */
- private boolean isValidAssistantGestureAngle(float deltaX, float deltaY) {
- float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
-
- // normalize so that angle is measured clockwise from horizontal in the bottom right corner
- // and counterclockwise from horizontal in the bottom left corner
- angle = angle > 90 ? 180 - angle : angle;
- return (angle > mAssistantAngleThreshold && angle < 90);
- }
-
- private void updateAssistantProgress() {
- if (!mLaunchedAssistant) {
- mAssistantLastProgress =
- Math.min(mAssistantDistance * 1f / mAssistantDragDistThreshold, 1)
- * mAssistantTimeFraction;
- if (mAssistantDistance >= mAssistantDragDistThreshold && mAssistantTimeFraction >= 1) {
- startAssistant(new PointF());
- } else if (mGestureCallback != null) {
- mGestureCallback.setAssistantProgress(mAssistantLastProgress);
- }
- }
- }
-
- private void startAssistant(PointF velocity) {
- if (mGestureCallback != null) {
- mGestureCallback.onNavBarGestureAttempted(ASSISTANT_COMPLETED, velocity);
- }
- VibratorWrapper.INSTANCE.get(mContext).vibrate(VibratorWrapper.EFFECT_CLICK);
- mLaunchedAssistant = true;
- }
-
enum NavBarGestureResult {
UNKNOWN,
HOME_GESTURE_COMPLETED,
@@ -304,9 +165,6 @@ public class NavBarGestureHandler implements OnTouchListener,
OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE,
HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION, // Side swipe on nav bar.
HOME_OR_OVERVIEW_CANCELLED,
- ASSISTANT_COMPLETED,
- ASSISTANT_NOT_STARTED_BAD_ANGLE,
- ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT,
}
/** Callback to let the UI react to attempted nav bar gestures. */
@@ -319,27 +177,5 @@ public class NavBarGestureHandler implements OnTouchListener,
/** Indicates how far a touch originating in the nav bar has moved from the nav bar. */
default void setNavBarGestureProgress(@Nullable Float displacement) {}
-
- /** Indicates the progress of an Assistant gesture. */
- default void setAssistantProgress(float progress) {}
- }
-
- private class AssistantGestureListener extends GestureDetector.SimpleOnGestureListener {
- @Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
- if (!mLaunchedAssistant && mTouchCameFromAssistantCorner) {
- PointF velocity = new PointF(velocityX, velocityY);
- if (!isValidAssistantGestureAngle(velocityX, -velocityY)) {
- if (mGestureCallback != null) {
- mGestureCallback.onNavBarGestureAttempted(ASSISTANT_NOT_STARTED_BAD_ANGLE,
- velocity);
- }
- } else if (mAssistantDistance >= mAssistantFlingDistThreshold) {
- mAssistantLastProgress = 1;
- startAssistant(velocity);
- }
- }
- return true;
- }
}
}
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 1b7aee6b7b..454dd17f37 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -21,29 +21,52 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_T
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
-import android.annotation.Nullable;
import android.annotation.TargetApi;
import android.graphics.PointF;
import android.os.Build;
import android.os.Handler;
-import android.view.View;
+
+import androidx.annotation.ColorInt;
+import androidx.core.graphics.ColorUtils;
import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatedFloat;
import com.android.launcher3.anim.PendingAnimation;
import com.android.quickstep.SwipeUpAnimationLogic;
import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+import com.android.quickstep.util.LottieAnimationColorUtils;
import java.util.ArrayList;
+import java.util.Map;
/** A {@link TutorialController} for the Overview tutorial. */
@TargetApi(Build.VERSION_CODES.R)
final class OverviewGestureTutorialController extends SwipeUpGestureTutorialController {
+ private static final float LAUNCHER_COLOR_BLENDING_RATIO = 0.4f;
+
OverviewGestureTutorialController(OverviewGestureTutorialFragment fragment,
TutorialType tutorialType) {
super(fragment, tutorialType);
+
+ // Set the Lottie animation colors specifically for the Overview gesture
+ if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ LottieAnimationColorUtils.updateColors(
+ mAnimatedGestureDemonstration,
+ Map.of(".onSurfaceOverview", fragment.mRootView.mColorOnSurfaceOverview,
+ ".surfaceOverview", fragment.mRootView.mColorSurfaceOverview,
+ ".secondaryOverview", fragment.mRootView.mColorSecondaryOverview));
+
+ LottieAnimationColorUtils.updateColors(
+ mCheckmarkAnimation,
+ Map.of(".checkmark",
+ Utilities.isDarkTheme(mContext)
+ ? fragment.mRootView.mColorOnSurfaceOverview
+ : fragment.mRootView.mColorSecondaryOverview,
+ ".checkmarkBackground", fragment.mRootView.mColorSurfaceOverview));
+ }
}
@Override
public int getIntroductionTitle() {
@@ -54,7 +77,9 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
@Override
public int getIntroductionSubtitle() {
- return R.string.overview_gesture_intro_subtitle;
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.overview_gesture_tutorial_subtitle
+ : R.string.overview_gesture_intro_subtitle;
}
@Override
@@ -62,6 +87,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
return R.string.overview_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.overview_gesture_tutorial_success
+ : R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.getNumSteps() > 1 && mTutorialFragment.isAtFinalStep()
@@ -69,37 +101,85 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
: R.string.overview_gesture_feedback_complete_without_follow_up;
}
+ @Override
+ public int getTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Overview;
+ }
+
+ @Override
+ public int getSuccessTitleTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_MainTitle_Success_Overview;
+ }
+
+ @Override
+ public int getDoneButtonTextAppearance() {
+ return R.style.TextAppearance_GestureTutorial_ButtonLabel_Overview;
+ }
+
+ @Override
+ public int getDoneButtonColor() {
+ return Utilities.isDarkTheme(mContext)
+ ? mTutorialFragment.mRootView.mColorOnSurfaceOverview
+ : mTutorialFragment.mRootView.mColorSecondaryOverview;
+ }
+
@Override
protected int getMockAppTaskLayoutResId() {
- return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
- ? R.layout.gesture_tutorial_mock_task_view
- : mTutorialFragment.isLargeScreen()
- ? R.layout.gesture_tutorial_tablet_mock_conversation_list
- : R.layout.gesture_tutorial_mock_conversation_list;
+ return mTutorialFragment.isLargeScreen()
+ ? R.layout.gesture_tutorial_tablet_mock_conversation_list
+ : R.layout.gesture_tutorial_mock_conversation_list;
}
@Override
protected int getGestureLottieAnimationId() {
return mTutorialFragment.isLargeScreen()
- ? R.raw.overview_gesture_tutorial_tablet_animation
+ ? mTutorialFragment.isFoldable()
+ ? R.raw.overview_gesture_tutorial_open_foldable_animation
+ : R.raw.overview_gesture_tutorial_tablet_animation
: R.raw.overview_gesture_tutorial_animation;
}
- @Override
- protected int getSwipeActionColorResId() {
- return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
- ? R.color.gesture_overview_background
- : R.color.gesture_overview_tutorial_swipe_rect;
+ @ColorInt
+ private int getFakeTaskViewStartColor() {
+ return mTutorialFragment.mRootView.mColorSurfaceOverview;
+ }
+
+ @ColorInt
+ private int getFakeTaskViewEndColor() {
+ return getMockPreviousAppTaskThumbnailColor();
}
@Override
- protected int getMockPreviousAppTaskThumbnailColorResId() {
- return R.color.gesture_overview_tutorial_swipe_rect;
+ protected int getFakeTaskViewColor() {
+ return isGestureCompleted()
+ ? getFakeTaskViewEndColor()
+ : getFakeTaskViewStartColor();
+ }
+
+ @Override
+ protected int getFakeLauncherColor() {
+ return ColorUtils.blendARGB(
+ mTutorialFragment.mRootView.mColorSurfaceContainer,
+ mTutorialFragment.mRootView.mColorOnSurfaceOverview,
+ LAUNCHER_COLOR_BLENDING_RATIO);
+ }
+
+ @Override
+ protected int getHotseatIconColor() {
+ return mTutorialFragment.mRootView.mColorOnSurfaceOverview;
+ }
+
+ @Override
+ protected int getMockPreviousAppTaskThumbnailColor() {
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? mTutorialFragment.mRootView.mColorSurfaceContainer
+ : mContext.getResources().getColor(
+ R.color.gesture_tutorial_fake_previous_task_view_color);
}
@Override
public void onBackGestureAttempted(BackGestureResult result) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
switch (mTutorialType) {
@@ -109,6 +189,8 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
case BACK_COMPLETED_FROM_RIGHT:
case BACK_CANCELLED_FROM_LEFT:
case BACK_CANCELLED_FROM_RIGHT:
+ case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
+ resetTaskViews();
showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
break;
}
@@ -124,7 +206,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
@Override
public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
switch (mTutorialType) {
@@ -139,39 +221,21 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
}
case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
+ resetTaskViews();
showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
break;
case OVERVIEW_GESTURE_COMPLETED:
+ setGestureCompleted();
mTutorialFragment.releaseFeedbackAnimation();
- if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
- onMotionPaused(true /*arbitrary value*/);
- animateTaskViewToOverview(() -> {
- mFakeTaskView.setVisibility(View.INVISIBLE);
- if(!mTutorialFragment.isLargeScreen()){
- mFakePreviousTaskView.animateToFillScreen(() -> {
- mFakeLauncherView.setBackgroundColor(
- mContext.getColor(
- R.color.gesture_overview_tutorial_swipe_rect
- ));
- showSuccessFeedback();
- });
- } else {
- mFakeLauncherView.setBackgroundColor(
- mContext.getColor(
- R.color.gesture_overview_tutorial_swipe_rect
- ));
- showSuccessFeedback();
- }
- });
- } else {
- animateTaskViewToOverview(null);
- onMotionPaused(true /*arbitrary value*/);
+ animateTaskViewToOverview(ENABLE_NEW_GESTURE_NAV_TUTORIAL.get());
+ onMotionPaused(true /*arbitrary value*/);
+ if (!ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
showSuccessFeedback();
}
break;
case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
case HOME_OR_OVERVIEW_CANCELLED:
- fadeOutFakeTaskView(false, true, null);
+ fadeOutFakeTaskView(false, null);
showFeedback(R.string.overview_gesture_feedback_wrong_swipe_direction);
break;
}
@@ -186,21 +250,34 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
/**
* runnable executed with slight delay to ease the swipe animation after landing on overview
- * @param runnable
*/
- public void animateTaskViewToOverview(@Nullable Runnable runnable) {
+ public void animateTaskViewToOverview(boolean animateDelayedSuccessFeedback) {
PendingAnimation anim = new PendingAnimation(TASK_VIEW_END_ANIMATION_DURATION_MILLIS);
anim.setFloat(mTaskViewSwipeUpAnimation
.getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
- anim.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animator) {
- if (runnable != null) {
- new Handler().postDelayed(runnable, 300);
+ if (animateDelayedSuccessFeedback) {
+ anim.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animator) {
+ new Handler().postDelayed(
+ () -> fadeOutFakeTaskView(
+ /* toOverviewFirst= */ true,
+ /* animatePreviousTask= */ false,
+ /* resetViews= */ false,
+ /* updateListener= */ v -> mFakeTaskView.setBackgroundColor(
+ ColorUtils.blendARGB(
+ getFakeTaskViewStartColor(),
+ getFakeTaskViewEndColor(),
+ v.getAnimatedFraction())),
+ /* onEndRunnable= */ () -> {
+ showSuccessFeedback();
+ resetTaskViews();
+ }),
+ TASK_VIEW_FILL_SCREEN_ANIMATION_DELAY_MILLIS);
}
- }
- });
+ });
+ }
ArrayList animators = new ArrayList<>();
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index c471a13869..01074dd276 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -73,7 +73,7 @@ public class OverviewGestureTutorialFragment extends TutorialFragment {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
- controller.animateTaskViewToOverview(null);
+ controller.animateTaskViewToOverview(false);
}
});
diff --git a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
index b5084843b8..affedb9497 100644
--- a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
+++ b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
@@ -18,6 +18,8 @@ package com.android.quickstep.interaction;
import static com.android.launcher3.config.FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL;
import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
import android.graphics.Insets;
import android.graphics.Rect;
import android.util.AttributeSet;
@@ -26,7 +28,9 @@ import android.view.View;
import android.view.WindowInsets;
import android.widget.RelativeLayout;
+import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import com.android.launcher3.R;
@@ -39,21 +43,70 @@ public class RootSandboxLayout extends RelativeLayout {
private final Rect mTempInclusionBounds = new Rect();
private final Rect mTempExclusionBounds = new Rect();
+ @ColorInt final int mColorSurfaceContainer;
+ @ColorInt final int mColorOnSurfaceHome;
+ @ColorInt final int mColorSurfaceHome;
+ @ColorInt final int mColorSecondaryHome;
+ @ColorInt final int mColorOnSurfaceBack;
+ @ColorInt final int mColorSurfaceBack;
+ @ColorInt final int mColorSecondaryBack;
+ @ColorInt final int mColorOnSurfaceOverview;
+ @ColorInt final int mColorSurfaceOverview;
+ @ColorInt final int mColorSecondaryOverview;
+
private View mFeedbackView;
private View mTutorialStepView;
private View mSkipButton;
private View mDoneButton;
public RootSandboxLayout(Context context) {
- super(context);
+ this(context, null);
}
public RootSandboxLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
}
public RootSandboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public RootSandboxLayout(
+ @NonNull Context context,
+ @Nullable AttributeSet attrs,
+ int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ TypedArray ta = context.obtainStyledAttributes(
+ attrs,
+ R.styleable.RootSandboxLayout,
+ defStyleAttr,
+ defStyleRes);
+ boolean isDarkTheme = Utilities.isDarkTheme(context);
+ int colorSurface = isDarkTheme ? Color.BLACK : Color.WHITE;
+ int colorOnSurface = isDarkTheme ? Color.WHITE : Color.BLACK;
+ int colorSecondary = Color.GRAY;
+
+ mColorSurfaceContainer = ta.getColor(
+ R.styleable.RootSandboxLayout_surfaceContainer, colorSurface);
+ mColorOnSurfaceHome = ta.getColor(
+ R.styleable.RootSandboxLayout_onSurfaceHome, colorOnSurface);
+ mColorSurfaceHome = ta.getColor(R.styleable.RootSandboxLayout_surfaceHome, colorSurface);
+ mColorSecondaryHome = ta.getColor(
+ R.styleable.RootSandboxLayout_secondaryHome, colorSecondary);
+ mColorOnSurfaceBack = ta.getColor(
+ R.styleable.RootSandboxLayout_onSurfaceBack, colorOnSurface);
+ mColorSurfaceBack = ta.getColor(R.styleable.RootSandboxLayout_surfaceBack, colorSurface);
+ mColorSecondaryBack = ta.getColor(
+ R.styleable.RootSandboxLayout_secondaryBack, colorSecondary);
+ mColorOnSurfaceOverview = ta.getColor(
+ R.styleable.RootSandboxLayout_onSurfaceOverview, colorOnSurface);
+ mColorSurfaceOverview = ta.getColor(
+ R.styleable.RootSandboxLayout_surfaceOverview, colorSurface);
+ mColorSecondaryOverview = ta.getColor(
+ R.styleable.RootSandboxLayout_secondaryOverview, colorSecondary);
+
+ ta.recycle();
}
@Override
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
deleted file mode 100644
index 19b7933e24..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.quickstep.interaction;
-
-import android.graphics.PointF;
-
-import com.android.launcher3.R;
-import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
-import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
-
-/** A {@link TutorialController} for the Sandbox Mode. */
-public class SandboxModeTutorialController extends SwipeUpGestureTutorialController {
-
- SandboxModeTutorialController(SandboxModeTutorialFragment fragment, TutorialType tutorialType) {
- super(fragment, tutorialType);
- }
-
- @Override
- public void onBackGestureAttempted(BackGestureResult result) {
- switch (result) {
- case BACK_COMPLETED_FROM_LEFT:
- case BACK_COMPLETED_FROM_RIGHT:
- showRippleEffect(null);
- showFeedback(R.string.sandbox_mode_back_gesture_feedback_successful);
- break;
- case BACK_CANCELLED_FROM_LEFT:
- case BACK_CANCELLED_FROM_RIGHT:
- showFeedback(R.string.back_gesture_feedback_cancelled);
- break;
- case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
- showFeedback(R.string.sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge);
- break;
- }
- }
-
- @Override
- public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
- switch (result) {
- case ASSISTANT_COMPLETED:
- showRippleEffect(null);
- showFeedback(R.string.sandbox_mode_assistant_gesture_feedback_successful);
- break;
- case HOME_GESTURE_COMPLETED:
- animateFakeTaskViewHome(finalVelocity, () -> {
- showFeedback(R.string.sandbox_mode_home_gesture_feedback_successful);
- });
- break;
- case OVERVIEW_GESTURE_COMPLETED:
- fadeOutFakeTaskView(true, true, () -> {
- showFeedback(R.string.sandbox_mode_overview_gesture_feedback_successful);
- });
- break;
- case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
- case HOME_OR_OVERVIEW_CANCELLED:
- case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
- case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
- showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
- break;
- }
- }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
deleted file mode 100644
index 7bd52f750d..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.quickstep.interaction;
-
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.logging.StatsLogManager;
-import com.android.quickstep.interaction.TutorialController.TutorialType;
-
-/** Shows the general navigation gesture sandbox environment. */
-public class SandboxModeTutorialFragment extends TutorialFragment {
-
- public SandboxModeTutorialFragment(boolean fromTutorialMenu) {
- super(fromTutorialMenu);
- }
-
- @Override
- TutorialController createController(TutorialType type) {
- return new SandboxModeTutorialController(this, type);
- }
-
- @Override
- Class getControllerClass() {
- return SandboxModeTutorialController.class;
- }
-
- @Override
- public boolean onTouch(View view, MotionEvent motionEvent) {
- if (motionEvent.getAction() == MotionEvent.ACTION_DOWN && mTutorialController != null) {
- mTutorialController.setRippleHotspot(motionEvent.getX(), motionEvent.getY());
- }
- return super.onTouch(view, motionEvent);
- }
-
- @Override
- void logTutorialStepShown(@NonNull StatsLogManager statsLogManager) {
- // No-Op: tutorial step not currently shown to users
- }
-
- @Override
- void logTutorialStepCompleted(@NonNull StatsLogManager statsLogManager) {
- // No-Op: tutorial step not currently shown to users
- }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index b3243ff31f..558d5dc238 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -15,6 +15,9 @@
*/
package com.android.quickstep.interaction;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+
import static com.android.launcher3.anim.Interpolators.ACCEL;
import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
@@ -38,6 +41,7 @@ import android.view.ViewOutlineProvider;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.InvariantDeviceProfile;
@@ -46,6 +50,7 @@ import com.android.launcher3.anim.AnimatedFloat;
import com.android.launcher3.anim.AnimatorListeners;
import com.android.launcher3.anim.AnimatorPlaybackController;
import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
import com.android.quickstep.GestureState;
import com.android.quickstep.OverviewComponentObserver;
import com.android.quickstep.RecentsAnimationDeviceState;
@@ -61,9 +66,10 @@ import com.android.quickstep.util.TransformParams;
@TargetApi(Build.VERSION_CODES.R)
abstract class SwipeUpGestureTutorialController extends TutorialController {
- private static final int FAKE_PREVIOUS_TASK_MARGIN = Utilities.dpToPx(12);
+ private static final int FAKE_PREVIOUS_TASK_MARGIN = Utilities.dpToPx(24);
protected static final long TASK_VIEW_END_ANIMATION_DURATION_MILLIS = 300;
+ protected static final long TASK_VIEW_FILL_SCREEN_ANIMATION_DELAY_MILLIS = 300;
private static final long HOME_SWIPE_ANIMATION_DURATION_MILLIS = 625;
private static final long OVERVIEW_SWIPE_ANIMATION_DURATION_MILLIS = 1000;
@@ -77,23 +83,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
private final AnimatorListenerAdapter mResetTaskView = new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- mFakeHotseatView.setVisibility(View.INVISIBLE);
- mFakeIconView.setVisibility(View.INVISIBLE);
- if (mTutorialFragment.getActivity() != null) {
- int height = mTutorialFragment.getRootView().getFullscreenHeight();
- int width = mTutorialFragment.getRootView().getWidth();
- mFakeTaskViewRect.set(0, 0, width, height);
- }
- mFakeTaskViewRadius = 0;
- mFakeTaskView.invalidateOutline();
- mFakeTaskView.setVisibility(View.VISIBLE);
- mFakeTaskView.setAlpha(1);
- mFakePreviousTaskView.setVisibility(View.INVISIBLE);
- mFakePreviousTaskView.setAlpha(1);
- mFakePreviousTaskView.setToSingleRowLayout(false);
- mShowTasks = false;
- mShowPreviousTasks = false;
- mRunningWindowAnim = null;
+ resetTaskViews();
}
};
@@ -137,9 +127,46 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
mRunningWindowAnim = null;
}
+ void resetTaskViews() {
+ mFakeHotseatView.setVisibility(View.INVISIBLE);
+ mFakeIconView.setVisibility(View.INVISIBLE);
+ if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ mFakeIconView.getBackground().setTint(getFakeTaskViewColor());
+ }
+ if (mTutorialFragment.getActivity() != null) {
+ int height = mTutorialFragment.getRootView().getFullscreenHeight();
+ int width = mTutorialFragment.getRootView().getWidth();
+ mFakeTaskViewRect.set(0, 0, width, height);
+ }
+ mFakeTaskViewRadius = 0;
+ mFakeTaskView.invalidateOutline();
+ mFakeTaskView.setVisibility(View.VISIBLE);
+ if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ mFakeTaskView.setBackgroundColor(getFakeTaskViewColor());
+ }
+ mFakeTaskView.setAlpha(1);
+ mFakePreviousTaskView.setVisibility(View.INVISIBLE);
+ mFakePreviousTaskView.setAlpha(1);
+ mFakePreviousTaskView.setToSingleRowLayout(false);
+ mShowTasks = false;
+ mShowPreviousTasks = false;
+ mRunningWindowAnim = null;
+ }
+ void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) {
+ fadeOutFakeTaskView(
+ toOverviewFirst,
+ /* animatePreviousTask= */ true,
+ /* resetViews= */ true,
+ /* updateListener= */ null,
+ onEndRunnable);
+ }
+
/** Fades the task view, optionally after animating to a fake Overview. */
- void fadeOutFakeTaskView(boolean toOverviewFirst, boolean reset,
- @Nullable Runnable onEndRunnable) {
+ void fadeOutFakeTaskView(boolean toOverviewFirst,
+ boolean animatePreviousTask,
+ boolean resetViews,
+ @Nullable ValueAnimator.AnimatorUpdateListener updateListener,
+ @Nullable Runnable onEndRunnable) {
cancelRunningAnimation();
PendingAnimation anim = new PendingAnimation(300);
if (toOverviewFirst) {
@@ -150,20 +177,20 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
public void onAnimationEnd(Animator animation, boolean isReverse) {
PendingAnimation fadeAnim =
new PendingAnimation(TASK_VIEW_END_ANIMATION_DURATION_MILLIS);
- if (reset) {
- fadeAnim.setFloat(mTaskViewSwipeUpAnimation
- .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+ fadeAnim.setFloat(mTaskViewSwipeUpAnimation
+ .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+ if (resetViews) {
fadeAnim.addListener(mResetTaskView);
- } else {
- fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
- fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
}
if (onEndRunnable != null) {
fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
}
+ if (updateListener != null) {
+ fadeAnim.addOnFrameListener(updateListener);
+ }
AnimatorSet animset = fadeAnim.buildAnim();
- if (reset && mTutorialFragment.isLargeScreen()) {
+ if (animatePreviousTask && mTutorialFragment.isLargeScreen()) {
animset.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
@@ -185,13 +212,10 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
}
});
} else {
- if (reset) {
- anim.setFloat(mTaskViewSwipeUpAnimation
- .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+ anim.setFloat(mTaskViewSwipeUpAnimation
+ .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+ if (resetViews) {
anim.addListener(mResetTaskView);
- } else {
- anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
- anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
}
if (onEndRunnable != null) {
anim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
@@ -237,6 +261,17 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
// After home animation finishes, fade out and run onEndRunnable.
PendingAnimation fadeAnim = new PendingAnimation(300);
fadeAnim.setViewAlpha(mFakeIconView, 0, ACCEL);
+ final View hotseatIconView = mHotseatIconView;
+ if (hotseatIconView != null) {
+ hotseatIconView.setVisibility(INVISIBLE);
+ fadeAnim.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ super.onAnimationStart(animation);
+ hotseatIconView.setVisibility(VISIBLE);
+ }
+ });
+ }
if (onEndRunnable != null) {
fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
}
@@ -247,7 +282,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
@Override
public void setNavBarGestureProgress(@Nullable Float displacement) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
if (mTutorialType == HOME_NAVIGATION_COMPLETE
@@ -268,7 +303,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
@Override
public void onMotionPaused(boolean unused) {
- if (isGestureCompleted()) {
+ if (skipGestureAttempt()) {
return;
}
if (mShowTasks) {
@@ -309,7 +344,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
}
@Override
- public void updateFinalShift() {
+ public void onCurrentShiftUpdated() {
mRemoteTargetHandles[0].getPlaybackController()
.setProgress(mCurrentShift.value, mDragLengthFactor);
mRemoteTargetHandles[0].getTaskViewSimulator().apply(
@@ -358,6 +393,12 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
false, /* isOpening */
mFakeIconView, mDp);
mFakeIconView.setAlpha(1);
+ if (FeatureFlags.ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ int iconColor = ColorUtils.blendARGB(
+ getFakeTaskViewColor(), getHotseatIconColor(), progress);
+ mFakeIconView.getBackground().setTint(iconColor);
+ mFakeTaskView.setBackgroundColor(iconColor);
+ }
mFakeTaskView.setAlpha(getWindowAlpha(progress));
mFakePreviousTaskView.setAlpha(getWindowAlpha(progress));
}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 6f50e3e4a5..4a1fec3ecf 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -26,10 +26,11 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
-import android.annotation.ColorRes;
import android.annotation.RawRes;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.Matrix;
import android.graphics.Outline;
import android.graphics.Rect;
import android.graphics.drawable.AnimatedVectorDrawable;
@@ -47,11 +48,13 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.CallSuper;
+import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.content.res.AppCompatResources;
@@ -65,6 +68,7 @@ import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttem
import com.android.systemui.shared.system.QuickStepContract;
import com.airbnb.lottie.LottieAnimationView;
+import com.airbnb.lottie.LottieComposition;
import java.util.ArrayList;
@@ -106,7 +110,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
@Nullable View mHotseatIconView;
final ClipIconView mFakeIconView;
final FrameLayout mFakeTaskView;
- final AnimatedTaskbarView mFakeTaskbarView;
+ @Nullable final AnimatedTaskbarView mFakeTaskbarView;
final AnimatedTaskView mFakePreviousTaskView;
final View mRippleView;
final RippleDrawable mRippleDrawable;
@@ -118,8 +122,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
private final AlertDialog mSkipTutorialDialog;
private boolean mGestureCompleted = false;
- private LottieAnimationView mAnimatedGestureDemonstration;
- private LottieAnimationView mCheckmarkAnimation;
+ protected LottieAnimationView mAnimatedGestureDemonstration;
+ protected LottieAnimationView mCheckmarkAnimation;
private RelativeLayout mFullGestureDemonstration;
// These runnables should be used when posting callbacks to their views and cleared from their
@@ -148,7 +152,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
mFakeHotseatView = rootView.findViewById(R.id.gesture_tutorial_fake_hotseat_view);
mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
- mFakeTaskbarView = rootView.findViewById(R.id.gesture_tutorial_fake_taskbar_view);
+ mFakeTaskbarView = ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? null : rootView.findViewById(R.id.gesture_tutorial_fake_taskbar_view);
mFakePreviousTaskView =
rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view);
mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
@@ -172,6 +177,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
mExitingAppStartingCornerRadius = QuickStepContract.getWindowCornerRadius(mContext);
mExitingAppEndingCornerRadius = mContext.getResources().getDimensionPixelSize(
R.dimen.gesture_tutorial_back_gesture_end_corner_radius);
+ mAnimatedGestureDemonstration.addLottieOnCompositionLoadedListener(
+ this::createScalingMatrix);
mFeedbackTitleView.setText(getIntroductionTitle());
mFeedbackSubtitleView.setText(getIntroductionSubtitle());
@@ -211,6 +218,24 @@ abstract class TutorialController implements BackGestureAttemptCallback,
};
}
+ /** Scale the Lottie gesture animation to fit the device based on device dimensions */
+ private void createScalingMatrix(LottieComposition composition) {
+ Rect animationBoundsRect = composition.getBounds();
+ if (animationBoundsRect == null) {
+ mAnimatedGestureDemonstration.setScaleType(ImageView.ScaleType.CENTER_CROP);
+ return;
+ }
+ Matrix scaleMatrix = new Matrix();
+ float pivotX = mScreenWidth / 2f;
+ float pivotY = mScreenHeight;
+ float scaleFactor = mScreenWidth / animationBoundsRect.width();
+
+ scaleMatrix.postScale(scaleFactor, scaleFactor, pivotX, pivotY);
+ scaleMatrix.postTranslate(0,
+ mTutorialFragment.getDeviceProfile().heightPx - animationBoundsRect.height());
+ mAnimatedGestureDemonstration.setImageMatrix(scaleMatrix);
+ }
+
private void showSkipTutorialDialog() {
if (mSkipTutorialDialog != null) {
mSkipTutorialDialog.show();
@@ -233,13 +258,19 @@ abstract class TutorialController implements BackGestureAttemptCallback,
@LayoutRes
protected int getMockHotseatResId() {
- return mTutorialFragment.isLargeScreen()
- ? (mTutorialFragment.isFoldable()
+ if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ return mTutorialFragment.isLargeScreen()
+ ? mTutorialFragment.isFoldable()
+ ? R.layout.redesigned_gesture_tutorial_foldable_mock_hotseat
+ : R.layout.redesigned_gesture_tutorial_tablet_mock_hotseat
+ : R.layout.redesigned_gesture_tutorial_mock_hotseat;
+ } else {
+ return mTutorialFragment.isLargeScreen()
+ ? mTutorialFragment.isFoldable()
? R.layout.gesture_tutorial_foldable_mock_hotseat
- : R.layout.gesture_tutorial_tablet_mock_hotseat)
- : (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
- ? R.layout.redesigned_gesture_tutorial_mock_hotseat
- : R.layout.gesture_tutorial_mock_hotseat);
+ : R.layout.gesture_tutorial_tablet_mock_hotseat
+ : R.layout.gesture_tutorial_mock_hotseat;
+ }
}
@LayoutRes
@@ -252,20 +283,34 @@ abstract class TutorialController implements BackGestureAttemptCallback,
return NO_ID;
}
- @ColorRes
- protected int getMockPreviousAppTaskThumbnailColorResId() {
- return R.color.gesture_tutorial_fake_previous_task_view_color;
+ @ColorInt
+ protected int getMockPreviousAppTaskThumbnailColor() {
+ return mContext.getResources().getColor(
+ R.color.gesture_tutorial_fake_previous_task_view_color);
}
- @ColorRes
- protected int getSwipeActionColorResId() {
- return NO_ID;
+ @ColorInt
+ protected int getFakeTaskViewColor() {
+ return Color.TRANSPARENT;
+ }
+
+ @ColorInt
+ protected abstract int getFakeLauncherColor();
+
+ @ColorInt
+ protected int getExitingAppColor() {
+ return Color.TRANSPARENT;
+ }
+
+ @ColorInt
+ protected int getHotseatIconColor() {
+ return Color.TRANSPARENT;
}
@DrawableRes
public int getMockAppIconResId() {
return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
- ? R.drawable.redesigned_default_sandbox_app_icon
+ ? R.drawable.redesigned_hotseat_icon
: R.drawable.default_sandbox_app_icon;
}
@@ -298,6 +343,29 @@ abstract class TutorialController implements BackGestureAttemptCallback,
return NO_ID;
}
+ @StringRes
+ public int getSuccessFeedbackTitle() {
+ return NO_ID;
+ }
+
+ @StyleRes
+ public int getTitleTextAppearance() {
+ return NO_ID;
+ }
+
+ @StyleRes
+ public int getSuccessTitleTextAppearance() {
+ return NO_ID;
+ }
+
+ @StyleRes
+ public int getDoneButtonTextAppearance() {
+ return NO_ID;
+ }
+
+ @ColorInt
+ public abstract int getDoneButtonColor();
+
void showFeedback() {
if (mGestureCompleted) {
mFeedbackView.setTranslationY(0);
@@ -310,6 +378,14 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
}
+ /**
+ * Only use this when a gesture is completed, but the feedback shouldn't be shown immediately.
+ * In that case, call this method immediately instead.
+ */
+ public void setGestureCompleted() {
+ mGestureCompleted = true;
+ }
+
/**
* Show feedback reflecting a successful gesture attempt.
**/
@@ -343,7 +419,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
void showFeedback(int subtitleResId, boolean isGestureSuccessful) {
showFeedback(
isGestureSuccessful
- ? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,
+ ? getSuccessFeedbackTitle() : R.string.gesture_tutorial_try_again,
subtitleResId,
NO_ID,
isGestureSuccessful,
@@ -363,10 +439,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
mFeedbackTitleView.setText(titleResId);
- mFeedbackSubtitleView.setText(spokenSubtitleResId == NO_ID
- ? mContext.getText(subtitleResId)
- : Utilities.wrapForTts(
- mContext.getText(subtitleResId), mContext.getString(spokenSubtitleResId)));
+ mFeedbackSubtitleView.setText(
+ ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() || spokenSubtitleResId == NO_ID
+ ? mContext.getText(subtitleResId)
+ : Utilities.wrapForTts(
+ mContext.getText(subtitleResId),
+ mContext.getString(spokenSubtitleResId)));
if (isGestureSuccessful) {
if (mTutorialFragment.isAtFinalStep()) {
showActionButton();
@@ -401,17 +479,20 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
private void showSuccessPage() {
+ pauseAndHideLottieAnimation();
mCheckmarkAnimation.setVisibility(View.VISIBLE);
mCheckmarkAnimation.playAnimation();
- mFeedbackTitleView.setTextAppearance(R.style.TextAppearance_GestureTutorial_SuccessTitle);
- mFeedbackSubtitleView.setTextAppearance(
- R.style.TextAppearance_GestureTutorial_SuccessSubtitle);
+ mFeedbackTitleView.setTextAppearance(mContext, getSuccessTitleTextAppearance());
}
public boolean isGestureCompleted() {
return mGestureCompleted;
}
+ public boolean skipGestureAttempt() {
+ return isGestureCompleted() || mTutorialFragment.isRotationPromptShowing();
+ }
+
void hideFeedback() {
if (mFeedbackView.getVisibility() != View.VISIBLE) {
return;
@@ -430,7 +511,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
mFakeTaskView.removeCallbacks(mFakeTaskViewCallback);
mFakeTaskViewCallback = null;
}
- if (mFakeTaskbarViewCallback != null) {
+ if (mFakeTaskbarViewCallback != null && mFakeTaskbarView != null) {
mFakeTaskbarView.removeCallbacks(mFakeTaskbarViewCallback);
mFakeTaskbarViewCallback = null;
}
@@ -522,6 +603,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
updateLayout();
if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
+ mFeedbackTitleView.setTextAppearance(mContext, getTitleTextAppearance());
+ mDoneButton.setTextAppearance(mContext, getDoneButtonTextAppearance());
+ mDoneButton.getBackground().setTint(getDoneButtonColor());
mCheckmarkAnimation.setAnimation(mTutorialFragment.isAtFinalStep()
? R.raw.checkmark_animation_end
: R.raw.checkmark_animation_in_progress);
@@ -546,8 +630,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
protected void resetViewsForBackGesture() {
mFakeTaskView.setVisibility(View.VISIBLE);
- mFakeTaskView.setBackgroundColor(
- mContext.getColor(R.color.gesture_back_tutorial_background));
+ mFakeTaskView.setBackgroundColor(getFakeTaskViewColor());
mExitingAppView.setVisibility(View.VISIBLE);
// reset the exiting app's dimensions
@@ -586,7 +669,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
void hideFakeTaskbar(boolean animateToHotseat) {
- if (!mTutorialFragment.isLargeScreen()) {
+ if (!mTutorialFragment.isLargeScreen() || mFakeTaskbarView == null) {
return;
}
if (mFakeTaskbarViewCallback != null) {
@@ -600,7 +683,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
void showFakeTaskbar(boolean animateFromHotseat) {
- if (!mTutorialFragment.isLargeScreen()) {
+ if (!mTutorialFragment.isLargeScreen() || mFakeTaskbarView == null) {
return;
}
if (mFakeTaskbarViewCallback != null) {
@@ -635,26 +718,39 @@ abstract class TutorialController implements BackGestureAttemptCallback,
}
}
+ private void updateHotseatChildViewColor(@Nullable View child) {
+ if (child == null) return;
+ child.getBackground().setTint(getHotseatIconColor());
+ }
+
private void updateDrawables() {
if (mContext != null) {
mTutorialFragment.getRootView().setBackground(AppCompatResources.getDrawable(
mContext, getMockWallpaperResId()));
mTutorialFragment.updateFeedbackAnimation();
- mFakeLauncherView.setBackgroundColor(
- mContext.getColor(R.color.gesture_tutorial_fake_wallpaper_color));
+ mFakeLauncherView.setBackgroundColor(ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? getFakeLauncherColor()
+ : mContext.getColor(R.color.gesture_tutorial_fake_wallpaper_color));
updateFakeViewLayout(mFakeHotseatView, getMockHotseatResId());
mHotseatIconView = mFakeHotseatView.findViewById(R.id.hotseat_icon_1);
- updateFakeViewLayout(mFakeTaskView, getMockAppTaskLayoutResId());
mFakeTaskView.animate().alpha(1).setListener(
AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel()));
- mFakePreviousTaskView.setFakeTaskViewFillColor(mContext.getResources().getColor(
- getMockPreviousAppTaskThumbnailColorResId()));
+ mFakePreviousTaskView.setFakeTaskViewFillColor(getMockPreviousAppTaskThumbnailColor());
mFakeIconView.setBackground(AppCompatResources.getDrawable(
mContext, getMockAppIconResId()));
if (ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) {
- mFakeLauncherView.setBackgroundColor(
- mContext.getColor(getSwipeActionColorResId()));
+ mExitingAppView.setBackgroundColor(getExitingAppColor());
+ mFakeTaskView.setBackgroundColor(getFakeTaskViewColor());
+ updateHotseatChildViewColor(mHotseatIconView);
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_2));
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_3));
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_4));
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_5));
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_icon_6));
+ updateHotseatChildViewColor(mFakeHotseatView.findViewById(R.id.hotseat_search_bar));
+ } else {
+ updateFakeViewLayout(mFakeTaskView, getMockAppTaskLayoutResId());
}
}
}
@@ -678,8 +774,10 @@ abstract class TutorialController implements BackGestureAttemptCallback,
? R.dimen.gesture_tutorial_tablet_feedback_margin_top
: R.dimen.gesture_tutorial_feedback_margin_top);
- mFakeTaskbarView.setVisibility((mTutorialFragment.isLargeScreen()
- && !ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()) ? View.VISIBLE : GONE);
+ if (mFakeTaskbarView != null) {
+ mFakeTaskbarView.setVisibility(
+ mTutorialFragment.isLargeScreen() ? View.VISIBLE : GONE);
+ }
RelativeLayout.LayoutParams hotseatLayoutParams =
(RelativeLayout.LayoutParams) mFakeHotseatView.getLayoutParams();
@@ -823,9 +921,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
HOME_NAVIGATION,
HOME_NAVIGATION_COMPLETE,
OVERVIEW_NAVIGATION,
- OVERVIEW_NAVIGATION_COMPLETE,
- ASSISTANT,
- ASSISTANT_COMPLETE,
- SANDBOX_MODE
+ OVERVIEW_NAVIGATION_COMPLETE
}
}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 3faa7e477a..84326f5a27 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -117,11 +117,6 @@ abstract class TutorialFragment extends GestureSandboxFragment implements OnTouc
case OVERVIEW_NAVIGATION:
case OVERVIEW_NAVIGATION_COMPLETE:
return new OverviewGestureTutorialFragment(fromTutorialMenu);
- case ASSISTANT:
- case ASSISTANT_COMPLETE:
- return new AssistantGestureTutorialFragment(fromTutorialMenu);
- case SANDBOX_MODE:
- return new SandboxModeTutorialFragment(fromTutorialMenu);
default:
Log.e(LOG_TAG, "Failed to find an appropriate fragment for " + tutorialType.name());
}
@@ -148,6 +143,7 @@ abstract class TutorialFragment extends GestureSandboxFragment implements OnTouc
return null;
}
+ @NonNull
abstract TutorialController createController(TutorialType type);
abstract Class getControllerClass();
@@ -379,9 +375,15 @@ abstract class TutorialFragment extends GestureSandboxFragment implements OnTouc
void changeController(TutorialType tutorialType) {
if (getControllerClass().isInstance(mTutorialController)) {
mTutorialController.setTutorialType(tutorialType);
+ if (isGestureComplete()) {
+ mTutorialController.setGestureCompleted();
+ }
mTutorialController.fadeTaskViewAndRun(mTutorialController::transitToController);
} else {
mTutorialController = createController(tutorialType);
+ if (isGestureComplete()) {
+ mTutorialController.setGestureCompleted();
+ }
mTutorialController.transitToController();
}
mEdgeBackGestureHandler.registerBackGestureAttemptCallback(mTutorialController);
@@ -496,6 +498,11 @@ abstract class TutorialFragment extends GestureSandboxFragment implements OnTouc
return activity != null ? activity.getStatsLogManager() : null;
}
+ protected boolean isRotationPromptShowing() {
+ GestureSandboxActivity activity = getGestureSandboxActivity();
+ return activity != null && activity.isRotationPromptShowing();
+ }
+
@Nullable
private SharedPreferences getSharedPreferences() {
GestureSandboxActivity activity = getGestureSandboxActivity();
diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index 3d5c143413..d3a01f256b 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -50,6 +50,7 @@ import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.DisplayController.Info;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.NavigationMode;
+import com.android.launcher3.util.SafeCloseable;
import com.android.launcher3.util.SettingsCache;
import org.xmlpull.v1.XmlPullParser;
@@ -62,7 +63,8 @@ import java.util.Optional;
* Utility class to log launcher settings changes
*/
public class SettingsChangeLogger implements
- DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener {
+ DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener,
+ SafeCloseable {
/**
* Singleton instance
@@ -188,6 +190,12 @@ public class SettingsChangeLogger implements
prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff));
}
+ @Override
+ public void close() {
+ getPrefs(mContext).unregisterOnSharedPreferenceChangeListener(this);
+ getDevicePrefs(mContext).unregisterOnSharedPreferenceChangeListener(this);
+ }
+
private static class LoggablePref {
public boolean defaultValue;
public int eventIdOn;
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 4690d94175..6288937912 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -227,6 +227,7 @@ public class StatsLogCompatManager extends StatsLogManager {
private SliceItem mSliceItem;
private LauncherAtom.Slice mSlice;
private Optional mCardinality = Optional.empty();
+ private int mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN;
StatsCompatLogger(Context context, ActivityContext activityContext) {
mContext = context;
@@ -319,6 +320,12 @@ public class StatsLogCompatManager extends StatsLogManager {
return this;
}
+ @Override
+ public StatsLogger withInputType(int inputType) {
+ this.mInputType = inputType;
+ return this;
+ }
+
@Override
public void log(EventEnum event) {
if (!Utilities.ATLEAST_R) {
@@ -413,6 +420,7 @@ public class StatsLogCompatManager extends StatsLogManager {
InstanceId instanceId = mInstanceId;
int srcState = mSrcState;
int dstState = mDstState;
+ int inputType = mInputType;
if (IS_VERBOSE) {
String name = (event instanceof Enum) ? ((Enum) event).name() :
event.getId() + "";
@@ -470,7 +478,8 @@ public class StatsLogCompatManager extends StatsLogManager {
cardinality /* cardinality */,
getFeatures(atomInfo) /* features */,
getSearchAttributes(atomInfo) /* searchAttributes */,
- getAttributes(atomInfo) /* attributes */
+ getAttributes(atomInfo) /* attributes */,
+ inputType /* input_type */
);
}
}
@@ -485,6 +494,7 @@ public class StatsLogCompatManager extends StatsLogManager {
private long mLatencyInMillis;
private int mQueryLength = -1;
private int mSubEventType = 0;
+ private int mCardinality = -1;
@Override
public StatsLatencyLogger withInstanceId(InstanceId instanceId) {
@@ -522,6 +532,12 @@ public class StatsLogCompatManager extends StatsLogManager {
return this;
}
+ @Override
+ public StatsLatencyLogger withCardinality(int cardinality) {
+ this.mCardinality = cardinality;
+ return this;
+ }
+
@Override
public void log(EventEnum event) {
if (IS_VERBOSE) {
@@ -540,7 +556,8 @@ public class StatsLogCompatManager extends StatsLogManager {
mLatencyInMillis, // latency_in_millis
mType.getId(), //type
mQueryLength, // query_length
- mSubEventType // sub_event_type
+ mSubEventType, // sub_event_type
+ mCardinality // cardinality
);
}
}
@@ -549,9 +566,10 @@ public class StatsLogCompatManager extends StatsLogManager {
* Helps to construct and log statsd compatible impression events.
*/
private static class StatsCompatImpressionLogger implements StatsImpressionLogger {
- private final IntArray mResultTypeList = new IntArray();
- private final IntArray mResultCountList = new IntArray();
+ private int[] mResultTypeList = new int[]{};
+ private int[] mResultCountList = new int[]{};
private final List mAboveKeyboardList = new ArrayList<>();
+ private int[] mUidList = new int[]{};
private InstanceId mInstanceId = DEFAULT_INSTANCE_ID;
private State mLauncherState = State.UNKNOWN;
private int mQueryLength = -1;
@@ -576,28 +594,32 @@ public class StatsLogCompatManager extends StatsLogManager {
@Override
public StatsImpressionLogger withResultType(IntArray resultType) {
- this.mResultTypeList.clear();
- this.mResultTypeList.addAll(resultType);
+ mResultTypeList = resultType.toArray();
return this;
}
@Override
public StatsImpressionLogger withResultCount(IntArray resultCount) {
- this.mResultCountList.clear();
- this.mResultCountList.addAll(resultCount);
+ mResultCountList = resultCount.toArray();
return this;
}
@Override
public StatsImpressionLogger withAboveKeyboard(List aboveKeyboard) {
- this.mAboveKeyboardList.clear();
+ mAboveKeyboardList.clear();
this.mAboveKeyboardList.addAll(aboveKeyboard);
return this;
}
+ @Override
+ public StatsImpressionLogger withUids(IntArray uid) {
+ mUidList = uid.toArray();
+ return this;
+ }
+
@Override
public void log(EventEnum event) {
- boolean [] mAboveKeyboard = new boolean[mAboveKeyboardList.size()];
+ boolean[] mAboveKeyboard = new boolean[mAboveKeyboardList.size()];
for (int i = 0; i < mAboveKeyboardList.size(); i++) {
mAboveKeyboard[i] = mAboveKeyboardList.get(i);
}
@@ -609,11 +631,12 @@ public class StatsLogCompatManager extends StatsLogManager {
logStringBuilder.append(String.format("ImpressionEvent:%s ", name));
logStringBuilder.append(String.format("LauncherState = %s ", mLauncherState));
logStringBuilder.append(String.format("QueryLength = %s ", mQueryLength));
- for (int i = 0; i < mResultTypeList.size(); i++) {
+ for (int i = 0; i < mResultTypeList.length; i++) {
logStringBuilder.append(String.format(
- "\n ResultType = %s with ResultCount = %s with is_above_keyboard = %s",
- mResultTypeList.get(i), mResultCountList.get(i),
- mAboveKeyboard[i]));
+ "\n ResultType = %s with ResultCount = %s with is_above_keyboard = %s"
+ + " with uid = %s",
+ mResultTypeList[i], mResultCountList[i],
+ mAboveKeyboard[i], mUidList[i]));
}
Log.d(IMPRESSION_TAG, logStringBuilder.toString());
}
@@ -626,11 +649,13 @@ public class StatsLogCompatManager extends StatsLogManager {
mLauncherState.getLauncherState(), // state
mQueryLength, // query_length
//result type list
- mResultTypeList.toArray(),
+ mResultTypeList,
// result count list
- mResultCountList.toArray(),
+ mResultCountList,
// above keyboard list
- mAboveKeyboard
+ mAboveKeyboard,
+ // uid list
+ mUidList
);
}
}
diff --git a/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java b/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java
index 2964868aa0..8335523758 100644
--- a/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java
+++ b/quickstep/src/com/android/quickstep/util/ActiveGestureErrorDetector.java
@@ -32,10 +32,11 @@ public class ActiveGestureErrorDetector {
* Enums associated to gesture navigation events.
*/
public enum GestureEvent {
- MOTION_DOWN, MOTION_UP, SET_END_TARGET, SET_END_TARGET_HOME, SET_END_TARGET_NEW_TASK,
- ON_SETTLED_ON_END_TARGET, START_RECENTS_ANIMATION, FINISH_RECENTS_ANIMATION,
- CANCEL_RECENTS_ANIMATION, SET_ON_PAGE_TRANSITION_END_CALLBACK, CANCEL_CURRENT_ANIMATION,
- CLEANUP_SCREENSHOT, SCROLLER_ANIMATION_ABORTED, TASK_APPEARED, EXPECTING_TASK_APPEARED,
+ MOTION_DOWN, MOTION_UP, MOTION_MOVE, SET_END_TARGET, SET_END_TARGET_HOME,
+ SET_END_TARGET_NEW_TASK, SET_END_TARGET_ALL_APPS, ON_SETTLED_ON_END_TARGET,
+ START_RECENTS_ANIMATION, FINISH_RECENTS_ANIMATION, CANCEL_RECENTS_ANIMATION,
+ SET_ON_PAGE_TRANSITION_END_CALLBACK, CANCEL_CURRENT_ANIMATION, CLEANUP_SCREENSHOT,
+ SCROLLER_ANIMATION_ABORTED, TASK_APPEARED, EXPECTING_TASK_APPEARED,
FLAG_USING_OTHER_ACTIVITY_INPUT_CONSUMER, LAUNCHER_DESTROYED,
/**
@@ -220,6 +221,7 @@ public class ActiveGestureErrorDetector {
case MOTION_DOWN:
case SET_END_TARGET:
case SET_END_TARGET_HOME:
+ case SET_END_TARGET_ALL_APPS:
case SET_END_TARGET_NEW_TASK:
case START_RECENTS_ANIMATION:
case SET_ON_PAGE_TRANSITION_END_CALLBACK:
diff --git a/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java b/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java
index e05d85c2de..409bf9cd39 100644
--- a/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java
+++ b/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java
@@ -155,15 +155,13 @@ public class ActiveGestureLog {
}
public void dump(String prefix, PrintWriter writer) {
- if (FeatureFlags.ENABLE_GESTURE_ERROR_DETECTION.get()) {
- writer.println(prefix + "ActiveGestureErrorDetector:");
- for (int i = 0; i < logs.length; i++) {
- EventLog eventLog = logs[(nextIndex + i) % logs.length];
- if (eventLog == null) {
- continue;
- }
- ActiveGestureErrorDetector.analyseAndDump(prefix + '\t', writer, eventLog);
+ writer.println(prefix + "ActiveGestureErrorDetector:");
+ for (int i = 0; i < logs.length; i++) {
+ EventLog eventLog = logs[(nextIndex + i) % logs.length];
+ if (eventLog == null) {
+ continue;
}
+ ActiveGestureErrorDetector.analyseAndDump(prefix + '\t', writer, eventLog);
}
writer.println(prefix + "ActiveGestureLog history:");
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
index baca76cfba..a92ab2a417 100644
--- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -17,9 +17,11 @@ package com.android.quickstep.util;
import static com.android.launcher3.anim.Interpolators.DEACCEL;
import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.quickstep.AbsSwipeUpHandler.ALL_APPS_SHIFT_THRESHOLD;
import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
+import android.animation.AnimatorSet;
import android.animation.TimeInterpolator;
import android.content.Context;
import android.graphics.Matrix;
@@ -32,11 +34,15 @@ import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatorPlaybackController;
import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.touch.AllAppsSwipeController;
import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.quickstep.LauncherActivityInterface;
import com.android.quickstep.views.RecentsView;
/**
@@ -49,7 +55,9 @@ public class AnimatorControllerWithResistance {
private enum RecentsResistanceParams {
FROM_APP(0.75f, 0.5f, 1f, false),
+ FROM_APP_TO_ALL_APPS(0.75f, 0.5f, 0.8f, false),
FROM_APP_TABLET(1f, 0.7f, 1f, true),
+ FROM_APP_TO_ALL_APPS_TABLET(1f, 0.5f, 0.5f, false),
FROM_OVERVIEW(1f, 0.75f, 0.5f, false);
RecentsResistanceParams(float scaleStartResist, float scaleMaxResist,
@@ -86,6 +94,8 @@ public class AnimatorControllerWithResistance {
private static final TimeInterpolator RECENTS_SCALE_RESIST_INTERPOLATOR = DEACCEL;
private static final TimeInterpolator RECENTS_TRANSLATE_RESIST_INTERPOLATOR = LINEAR;
+ private static final Rect TEMP_RECT = new Rect();
+
private final AnimatorPlaybackController mNormalController;
private final AnimatorPlaybackController mResistanceController;
@@ -145,10 +155,42 @@ public class AnimatorControllerWithResistance {
scaleProperty, translationTarget, translationProperty);
PendingAnimation resistAnim = createRecentsResistanceAnim(params);
+ // Apply All Apps animation during the resistance animation.
+ if (recentsOrientedState.getActivityInterface().allowAllAppsFromOverview()) {
+ StatefulActivity activity =
+ recentsOrientedState.getActivityInterface().getCreatedActivity();
+ if (activity != null) {
+ StateManager stateManager = activity.getStateManager();
+ if (stateManager.isInStableState(LauncherState.BACKGROUND_APP)
+ && stateManager.isInTransition()) {
+
+ // Calculate the resistance progress threshold where All Apps will trigger.
+ float threshold = getAllAppsThreshold(context, recentsOrientedState, dp);
+
+ StateAnimationConfig config = new StateAnimationConfig();
+ AllAppsSwipeController.applyOverviewToAllAppsAnimConfig(dp, config, threshold);
+ AnimatorSet allAppsAnimator = stateManager.createAnimationToNewWorkspace(
+ LauncherState.ALL_APPS, config).getTarget();
+ resistAnim.add(allAppsAnimator);
+ }
+ }
+ }
+
AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
return new AnimatorControllerWithResistance(normalController, resistanceController);
}
+ private static float getAllAppsThreshold(Context context,
+ RecentsOrientedState recentsOrientedState, DeviceProfile dp) {
+ int transitionDragLength =
+ recentsOrientedState.getActivityInterface().getSwipeUpDestinationAndLength(
+ dp, context, TEMP_RECT,
+ recentsOrientedState.getOrientationHandler());
+ float dragLengthFactor = (float) dp.heightPx / transitionDragLength;
+ // -1s are because 0-1 is reserved for the normal transition.
+ return (ALL_APPS_SHIFT_THRESHOLD - 1) / (dragLengthFactor - 1);
+ }
+
/**
* Creates the resistance animation for {@link #createForRecents}, or can be used separately
* when starting from recents, i.e. {@link #createRecentsResistanceFromOverviewAnim}.
@@ -158,8 +200,8 @@ public class AnimatorControllerWithResistance {
Rect startRect = new Rect();
PagedOrientationHandler orientationHandler = params.recentsOrientedState
.getOrientationHandler();
- LauncherActivityInterface.INSTANCE.calculateTaskSize(params.context, params.dp, startRect,
- orientationHandler);
+ params.recentsOrientedState.getActivityInterface()
+ .calculateTaskSize(params.context, params.dp, startRect, orientationHandler);
long distanceToCover = startRect.bottom;
PendingAnimation resistAnim = params.resistAnim != null
? params.resistAnim
@@ -257,9 +299,15 @@ public class AnimatorControllerWithResistance {
this.translationTarget = translationTarget;
this.translationProperty = translationProperty;
if (dp.isTablet) {
- resistanceParams = RecentsResistanceParams.FROM_APP_TABLET;
+ resistanceParams =
+ recentsOrientedState.getActivityInterface().allowAllAppsFromOverview()
+ ? RecentsResistanceParams.FROM_APP_TO_ALL_APPS_TABLET
+ : RecentsResistanceParams.FROM_APP_TABLET;
} else {
- resistanceParams = RecentsResistanceParams.FROM_APP;
+ resistanceParams =
+ recentsOrientedState.getActivityInterface().allowAllAppsFromOverview()
+ ? RecentsResistanceParams.FROM_APP_TO_ALL_APPS
+ : RecentsResistanceParams.FROM_APP;
}
}
diff --git a/quickstep/src/com/android/quickstep/util/AppPairsController.java b/quickstep/src/com/android/quickstep/util/AppPairsController.java
new file mode 100644
index 0000000000..cbde257003
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/AppPairsController.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 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.quickstep.util;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import android.content.Context;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.data.FolderInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.quickstep.views.TaskView;
+
+/**
+ * Mini controller class that handles app pair interactions: saving, modifying, deleting, etc.
+ */
+public class AppPairsController {
+
+ private static final int POINT_THREE_RATIO = 0;
+ private static final int POINT_FIVE_RATIO = 1;
+ private static final int POINT_SEVEN_RATIO = 2;
+ /**
+ * Used to calculate {@link #complement(int)}
+ */
+ private static final int FULL_RATIO = 2;
+
+ private static final int LEFT_TOP = 0;
+ private static final int RIGHT_BOTTOM = 1 << 2;
+
+ // TODO (jeremysim b/274189428): Support saving different ratios in future.
+ public int DEFAULT_RATIO = POINT_FIVE_RATIO;
+
+ private final Context mContext;
+ private final SplitSelectStateController mSplitSelectStateController;
+ public AppPairsController(Context context,
+ SplitSelectStateController splitSelectStateController) {
+ mContext = context;
+ mSplitSelectStateController = splitSelectStateController;
+ }
+
+ /**
+ * Creates a new app pair ItemInfo and adds it to the workspace
+ */
+ public void saveAppPair(TaskView taskView) {
+ TaskView.TaskIdAttributeContainer[] attributes = taskView.getTaskIdAttributeContainers();
+ WorkspaceItemInfo app1 = attributes[0].getItemInfo().clone();
+ WorkspaceItemInfo app2 = attributes[1].getItemInfo().clone();
+ app1.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+ app2.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+ app1.rank = DEFAULT_RATIO + LEFT_TOP;
+ app2.rank = complement(DEFAULT_RATIO) + RIGHT_BOTTOM;
+ FolderInfo newAppPair = FolderInfo.createAppPair(app1, app2);
+ // TODO (jeremysim b/274189428): Generate default title here.
+ newAppPair.title = "App pair 1";
+
+ IconCache iconCache = LauncherAppState.getInstance(mContext).getIconCache();
+ MODEL_EXECUTOR.execute(() -> {
+ newAppPair.contents.forEach(member -> {
+ member.title = "";
+ member.bitmap = iconCache.getDefaultIcon(newAppPair.user);
+ iconCache.getTitleAndIcon(member, member.usingLowResIcon());
+ });
+ MAIN_EXECUTOR.execute(() -> {
+ LauncherAccessibilityDelegate delegate =
+ Launcher.getLauncher(mContext).getAccessibilityDelegate();
+ if (delegate != null) {
+ MAIN_EXECUTOR.execute(() -> delegate.addToWorkspace(newAppPair, true));
+ }
+ });
+ });
+
+ }
+
+ /**
+ * Used to calculate the "opposite" side of the split ratio, so we can know how big the split
+ * apps are supposed to be. This math works because POINT_THREE_RATIO is internally represented
+ * by 0, POINT_FIVE_RATIO is represented by 1, and POINT_SEVEN_RATIO is represented by 2. There
+ * are no other supported ratios for now.
+ */
+ private int complement(int ratio1) {
+ int ratio2 = FULL_RATIO - ratio1;
+ return ratio2;
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
index b1e38ebcbb..0ce54ad2e6 100644
--- a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
+++ b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
@@ -52,6 +52,7 @@ public class AssistContentRequester {
}
private final IActivityTaskManager mActivityTaskManager;
+ private final String mAttributionTag;
private final String mPackageName;
private final Executor mCallbackExecutor;
private final Executor mSystemInteractionExecutor;
@@ -62,6 +63,7 @@ public class AssistContentRequester {
public AssistContentRequester(Context context) {
mActivityTaskManager = ActivityTaskManager.getService();
+ mAttributionTag = context.getAttributionTag();
mPackageName = context.getApplicationContext().getPackageName();
mCallbackExecutor = Executors.MAIN_EXECUTOR;
mSystemInteractionExecutor = Executors.UI_HELPER_EXECUTOR;
@@ -78,7 +80,8 @@ public class AssistContentRequester {
mSystemInteractionExecutor.execute(() -> {
try {
mActivityTaskManager.requestAssistDataForTask(
- new AssistDataReceiver(callback, this), taskId, mPackageName);
+ new AssistDataReceiver(callback, this), taskId, mPackageName,
+ mAttributionTag);
} catch (RemoteException e) {
Log.e(TAG, "Requesting assist content failed for task: " + taskId, e);
}
diff --git a/quickstep/src/com/android/quickstep/util/BaseDepthController.java b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
index cecf58d105..931e46876e 100644
--- a/quickstep/src/com/android/quickstep/util/BaseDepthController.java
+++ b/quickstep/src/com/android/quickstep/util/BaseDepthController.java
@@ -74,6 +74,10 @@ public class BaseDepthController {
// Hints that there is potentially content behind Launcher and that we shouldn't optimize by
// marking the launcher surface as opaque. Only used in certain Launcher states.
private boolean mHasContentBehindLauncher;
+
+ /** Pause blur but allow transparent, can be used when launch something behind the Launcher. */
+ protected boolean mPauseBlurs;
+
/**
* Last blur value, in pixels, that was applied.
* For debugging purposes.
@@ -84,6 +88,8 @@ public class BaseDepthController {
*/
protected boolean mInEarlyWakeUp;
+ private boolean mWaitingOnSurfaceValidity;
+
public BaseDepthController(Launcher activity) {
mLauncher = activity;
mMaxBlurRadius = activity.getResources().getInteger(R.integer.max_depth_blur_radius);
@@ -104,6 +110,15 @@ public class BaseDepthController {
mHasContentBehindLauncher = hasContentBehindLauncher;
}
+ public void pauseBlursOnWindows(boolean pause) {
+ if (pause != mPauseBlurs) {
+ mPauseBlurs = pause;
+ applyDepthAndBlur();
+ }
+ }
+
+ protected void onInvalidSurface() { }
+
protected void applyDepthAndBlur() {
float depth = mDepth;
IBinder windowToken = mLauncher.getRootView().getWindowToken();
@@ -117,13 +132,19 @@ public class BaseDepthController {
if (!BlurUtils.supportsBlursOnWindows()) {
return;
}
- if (mSurface == null || !mSurface.isValid()) {
+ if (mSurface == null) {
return;
}
+ if (!mSurface.isValid()) {
+ mWaitingOnSurfaceValidity = true;
+ onInvalidSurface();
+ return;
+ }
+ mWaitingOnSurfaceValidity = false;
boolean hasOpaqueBg = mLauncher.getScrimView().isFullyOpaque();
- boolean isSurfaceOpaque = !mHasContentBehindLauncher && hasOpaqueBg;
+ boolean isSurfaceOpaque = !mHasContentBehindLauncher && hasOpaqueBg && !mPauseBlurs;
- mCurrentBlur = !mCrossWindowBlursEnabled || hasOpaqueBg
+ mCurrentBlur = !mCrossWindowBlursEnabled || hasOpaqueBg || mPauseBlurs
? 0 : (int) (depth * mMaxBlurRadius);
SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()
.setBackgroundBlurRadius(mSurface, mCurrentBlur)
@@ -163,7 +184,7 @@ public class BaseDepthController {
* Sets the specified app target surface to apply the blur to.
*/
protected void setSurface(SurfaceControl surface) {
- if (mSurface != surface) {
+ if (mSurface != surface || mWaitingOnSurfaceValidity) {
mSurface = surface;
applyDepthAndBlur();
}
diff --git a/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java b/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java
index ad11b7e953..328a7270eb 100644
--- a/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java
@@ -43,6 +43,10 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg
new UnfoldMoveFromCenterRotationListener();
private boolean mAnimationInProgress = false;
+ // Save the last transition progress so we can re-apply it in case we re-register the view for
+ // the animation (by calling onPrepareViewsForAnimation)
+ private Float mLastTransitionProgress = null;
+
public BaseUnfoldMoveFromCenterAnimator(WindowManager windowManager,
RotationChangeProvider rotationChangeProvider) {
mMoveFromCenterAnimation = new UnfoldMoveFromCenterAnimator(windowManager,
@@ -63,11 +67,13 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg
@Override
public void onTransitionProgress(float progress) {
mMoveFromCenterAnimation.onTransitionProgress(progress);
+ mLastTransitionProgress = progress;
}
@CallSuper
@Override
public void onTransitionFinished() {
+ mLastTransitionProgress = null;
mAnimationInProgress = false;
mRotationChangeProvider.removeCallback(mRotationListener);
mMoveFromCenterAnimation.onTransitionFinished();
@@ -93,8 +99,11 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg
mOriginalClipToPadding.clear();
}
+ @CallSuper
protected void onPrepareViewsForAnimation() {
-
+ if (mLastTransitionProgress != null) {
+ mMoveFromCenterAnimation.onTransitionProgress(mLastTransitionProgress);
+ }
}
protected void registerViewForAnimation(View view) {
diff --git a/quickstep/src/com/android/quickstep/util/BorderAnimator.java b/quickstep/src/com/android/quickstep/util/BorderAnimator.java
index 1f1c15bdb8..011d45c8e7 100644
--- a/quickstep/src/com/android/quickstep/util/BorderAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/BorderAnimator.java
@@ -16,17 +16,19 @@
package com.android.quickstep.util;
import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.annotation.ColorInt;
import android.annotation.Nullable;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
+import android.view.View;
import android.view.animation.Interpolator;
import androidx.annotation.NonNull;
import androidx.annotation.Px;
-import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatedFloat;
import com.android.launcher3.anim.AnimatorListeners;
import com.android.launcher3.anim.Interpolators;
@@ -35,7 +37,9 @@ import com.android.launcher3.anim.Interpolators;
* Utility class for drawing a rounded-rect border around a view.
*
* To use this class:
- * 1. Create an instance in the target view.
+ * 1. Create an instance in the target view. NOTE: The border will animate outwards from the
+ * provided border bounds. See {@link SimpleParams} and {@link ScalingParams} to determine
+ * which would be best for your target view.
* 2. Override the target view's {@link android.view.View#draw(Canvas)} method and call
* {@link BorderAnimator#drawBorder(Canvas)} after {@code super.draw(canvas)}.
* 3. Call {@link BorderAnimator#buildAnimator(boolean)} and start the animation or call
@@ -43,7 +47,7 @@ import com.android.launcher3.anim.Interpolators;
*/
public final class BorderAnimator {
- public static final int DEFAULT_BORDER_COLOR = 0xffffffff;
+ public static final int DEFAULT_BORDER_COLOR = Color.WHITE;
private static final long DEFAULT_APPEARANCE_ANIMATION_DURATION_MS = 300;
private static final long DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS = 133;
@@ -51,49 +55,44 @@ public final class BorderAnimator {
@NonNull private final AnimatedFloat mBorderAnimationProgress = new AnimatedFloat(
this::updateOutline);
- @NonNull private final Rect mBorderBounds = new Rect();
- @NonNull private final BorderBoundsBuilder mBorderBoundsBuilder;
- @Px private final int mBorderWidthPx;
@Px private final int mBorderRadiusPx;
- @NonNull private final Runnable mInvalidateViewCallback;
+ @NonNull private final BorderAnimationParams mBorderAnimationParams;
private final long mAppearanceDurationMs;
private final long mDisappearanceDurationMs;
@NonNull private final Interpolator mInterpolator;
@NonNull private final Paint mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- private int mAlignmentAdjustment;
-
@Nullable private Animator mRunningBorderAnimation;
public BorderAnimator(
- @NonNull BorderBoundsBuilder borderBoundsBuilder,
- int borderWidthPx,
- int borderRadiusPx,
+ @Px int borderRadiusPx,
@ColorInt int borderColor,
- @NonNull Runnable invalidateViewCallback) {
- this(borderBoundsBuilder,
- borderWidthPx,
- borderRadiusPx,
+ @NonNull BorderAnimationParams borderAnimationParams) {
+ this(borderRadiusPx,
borderColor,
- invalidateViewCallback,
+ borderAnimationParams,
DEFAULT_APPEARANCE_ANIMATION_DURATION_MS,
DEFAULT_DISAPPEARANCE_ANIMATION_DURATION_MS,
DEFAULT_INTERPOLATOR);
}
+ /**
+ * @param borderRadiusPx the radius of the border's corners, in pixels
+ * @param borderColor the border's color
+ * @param borderAnimationParams params for handling different target view layout situation.
+ * @param appearanceDurationMs appearance animation duration, in milliseconds
+ * @param disappearanceDurationMs disappearance animation duration, in milliseconds
+ * @param interpolator animation interpolator
+ */
public BorderAnimator(
- @NonNull BorderBoundsBuilder borderBoundsBuilder,
- int borderWidthPx,
- int borderRadiusPx,
+ @Px int borderRadiusPx,
@ColorInt int borderColor,
- @NonNull Runnable invalidateViewCallback,
+ @NonNull BorderAnimationParams borderAnimationParams,
long appearanceDurationMs,
long disappearanceDurationMs,
@NonNull Interpolator interpolator) {
- mBorderBoundsBuilder = borderBoundsBuilder;
- mBorderWidthPx = borderWidthPx;
mBorderRadiusPx = borderRadiusPx;
- mInvalidateViewCallback = invalidateViewCallback;
+ mBorderAnimationParams = borderAnimationParams;
mAppearanceDurationMs = appearanceDurationMs;
mDisappearanceDurationMs = disappearanceDurationMs;
mInterpolator = interpolator;
@@ -106,17 +105,11 @@ public final class BorderAnimator {
private void updateOutline() {
float interpolatedProgress = mInterpolator.getInterpolation(
mBorderAnimationProgress.value);
- mAlignmentAdjustment = (int) Utilities.mapBoundToRange(
- mBorderAnimationProgress.value,
- /* lowerBound= */ 0f,
- /* upperBound= */ 1f,
- /* toMin= */ 0f,
- /* toMax= */ (float) (mBorderWidthPx / 2f),
- mInterpolator);
+ mBorderAnimationParams.setProgress(interpolatedProgress);
mBorderPaint.setAlpha(Math.round(255 * interpolatedProgress));
- mBorderPaint.setStrokeWidth(Math.round(mBorderWidthPx * interpolatedProgress));
- mInvalidateViewCallback.run();
+ mBorderPaint.setStrokeWidth(mBorderAnimationParams.getBorderWidth());
+ mBorderAnimationParams.mTargetView.invalidate();
}
/**
@@ -126,13 +119,14 @@ public final class BorderAnimator {
* calling super.
*/
public void drawBorder(Canvas canvas) {
+ float alignmentAdjustment = mBorderAnimationParams.getAlignmentAdjustment();
canvas.drawRoundRect(
- /* left= */ mBorderBounds.left + mAlignmentAdjustment,
- /* top= */ mBorderBounds.top + mAlignmentAdjustment,
- /* right= */ mBorderBounds.right - mAlignmentAdjustment,
- /* bottom= */ mBorderBounds.bottom - mAlignmentAdjustment,
- /* rx= */ mBorderRadiusPx - mAlignmentAdjustment,
- /* ry= */ mBorderRadiusPx - mAlignmentAdjustment,
+ /* left= */ mBorderAnimationParams.mBorderBounds.left + alignmentAdjustment,
+ /* top= */ mBorderAnimationParams.mBorderBounds.top + alignmentAdjustment,
+ /* right= */ mBorderAnimationParams.mBorderBounds.right - alignmentAdjustment,
+ /* bottom= */ mBorderAnimationParams.mBorderBounds.bottom - alignmentAdjustment,
+ /* rx= */ mBorderRadiusPx + mBorderAnimationParams.getRadiusAdjustment(),
+ /* ry= */ mBorderRadiusPx + mBorderAnimationParams.getRadiusAdjustment(),
/* paint= */ mBorderPaint);
}
@@ -141,27 +135,44 @@ public final class BorderAnimator {
*/
@NonNull
public Animator buildAnimator(boolean isAppearing) {
- mBorderBoundsBuilder.updateBorderBounds(mBorderBounds);
mRunningBorderAnimation = mBorderAnimationProgress.animateToValue(isAppearing ? 1f : 0f);
mRunningBorderAnimation.setDuration(
isAppearing ? mAppearanceDurationMs : mDisappearanceDurationMs);
+ mRunningBorderAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mBorderAnimationParams.onShowBorder();
+ }
+ });
mRunningBorderAnimation.addListener(
- AnimatorListeners.forEndCallback(() -> mRunningBorderAnimation = null));
+ AnimatorListeners.forEndCallback(() -> {
+ mRunningBorderAnimation = null;
+ if (isAppearing) {
+ return;
+ }
+ mBorderAnimationParams.onHideBorder();
+ }));
return mRunningBorderAnimation;
}
/**
* Immediately shows/hides the border without an animation.
- *
+ *
* To animate the appearance/disappearance, see {@link BorderAnimator#buildAnimator(boolean)}
*/
public void setBorderVisible(boolean visible) {
if (mRunningBorderAnimation != null) {
mRunningBorderAnimation.end();
}
+ if (visible) {
+ mBorderAnimationParams.onShowBorder();
+ }
mBorderAnimationProgress.updateValue(visible ? 1f : 0f);
+ if (!visible) {
+ mBorderAnimationParams.onHideBorder();
+ }
}
/**
@@ -174,4 +185,168 @@ public final class BorderAnimator {
*/
void updateBorderBounds(Rect rect);
}
+
+ /**
+ * Params for handling different target view layout situation.
+ */
+ private abstract static class BorderAnimationParams {
+
+ @NonNull private final Rect mBorderBounds = new Rect();
+ @NonNull private final BorderBoundsBuilder mBoundsBuilder;
+
+ @NonNull final View mTargetView;
+ @Px final int mBorderWidthPx;
+
+ private float mAnimationProgress = 0f;
+ @Nullable private View.OnLayoutChangeListener mLayoutChangeListener;
+
+ /**
+ * @param borderWidthPx the width of the border, in pixels
+ * @param boundsBuilder callback to update the border bounds
+ * @param targetView the view that will be drawing the border
+ */
+ private BorderAnimationParams(
+ @Px int borderWidthPx,
+ @NonNull BorderBoundsBuilder boundsBuilder,
+ @NonNull View targetView) {
+ mBorderWidthPx = borderWidthPx;
+ mBoundsBuilder = boundsBuilder;
+ mTargetView = targetView;
+ }
+
+ private void setProgress(float progress) {
+ mAnimationProgress = progress;
+ }
+
+ private float getBorderWidth() {
+ return mBorderWidthPx * mAnimationProgress;
+ }
+
+ float getAlignmentAdjustment() {
+ // Outset the border by half the width to create an outwards-growth animation
+ return (-getBorderWidth() / 2f) + getAlignmentAdjustmentInset();
+ }
+
+
+ void onShowBorder() {
+ if (mLayoutChangeListener == null) {
+ mLayoutChangeListener =
+ (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+ onShowBorder();
+ mTargetView.invalidate();
+ };
+ mTargetView.addOnLayoutChangeListener(mLayoutChangeListener);
+ }
+ mBoundsBuilder.updateBorderBounds(mBorderBounds);
+ }
+
+ void onHideBorder() {
+ if (mLayoutChangeListener != null) {
+ mTargetView.removeOnLayoutChangeListener(mLayoutChangeListener);
+ mLayoutChangeListener = null;
+ }
+ }
+
+ abstract int getAlignmentAdjustmentInset();
+
+ abstract float getRadiusAdjustment();
+ }
+
+ /**
+ * Use an instance of this {@link BorderAnimationParams} if the border can be drawn outside the
+ * target view's bounds without any additional logic.
+ */
+ public static final class SimpleParams extends BorderAnimationParams {
+
+ public SimpleParams(
+ @Px int borderWidthPx,
+ @NonNull BorderBoundsBuilder boundsBuilder,
+ @NonNull View targetView) {
+ super(borderWidthPx, boundsBuilder, targetView);
+ }
+
+ @Override
+ int getAlignmentAdjustmentInset() {
+ return 0;
+ }
+
+ @Override
+ float getRadiusAdjustment() {
+ return -getAlignmentAdjustment();
+ }
+ }
+
+ /**
+ * Use an instance of this {@link BorderAnimationParams} if the border would other be clipped by
+ * the target view's bound.
+ *
+ * Note: using these params will set the scales and pivots of the
+ * container and content views, however will only reset the scales back to 1.
+ */
+ public static final class ScalingParams extends BorderAnimationParams {
+
+ @NonNull private final View mContentView;
+
+ /**
+ * @param targetView the view that will be drawing the border. this view will be scaled up
+ * to make room for the border
+ * @param contentView the view around which the border will be drawn. this view will be
+ * scaled down reciprocally to keep its original size and location.
+ */
+ public ScalingParams(
+ @Px int borderWidthPx,
+ @NonNull BorderBoundsBuilder boundsBuilder,
+ @NonNull View targetView,
+ @NonNull View contentView) {
+ super(borderWidthPx, boundsBuilder, targetView);
+ mContentView = contentView;
+ }
+
+ @Override
+ void onShowBorder() {
+ super.onShowBorder();
+ float width = mTargetView.getWidth();
+ float height = mTargetView.getHeight();
+ // Scale up just enough to make room for the border. Fail fast and fix the scaling
+ // onLayout.
+ float scaleX = width == 0 ? 1f : 1f + ((2 * mBorderWidthPx) / width);
+ float scaleY = height == 0 ? 1f : 1f + ((2 * mBorderWidthPx) / height);
+
+ mTargetView.setPivotX(width / 2);
+ mTargetView.setPivotY(height / 2);
+ mTargetView.setScaleX(scaleX);
+ mTargetView.setScaleY(scaleY);
+
+ mContentView.setPivotX(mContentView.getWidth() / 2f);
+ mContentView.setPivotY(mContentView.getHeight() / 2f);
+ mContentView.setScaleX(1f / scaleX);
+ mContentView.setScaleY(1f / scaleY);
+ }
+
+ @Override
+ void onHideBorder() {
+ super.onHideBorder();
+ mTargetView.setPivotX(mTargetView.getWidth());
+ mTargetView.setPivotY(mTargetView.getHeight());
+ mTargetView.setScaleX(1f);
+ mTargetView.setScaleY(1f);
+
+ mContentView.setPivotX(mContentView.getWidth() / 2f);
+ mContentView.setPivotY(mContentView.getHeight() / 2f);
+ mContentView.setScaleX(1f);
+ mContentView.setScaleY(1f);
+ }
+
+ @Override
+ int getAlignmentAdjustmentInset() {
+ // Inset the border since we are scaling the container up
+ return mBorderWidthPx;
+ }
+
+ @Override
+ float getRadiusAdjustment() {
+ // Increase the radius since we are scaling the container up
+ return getAlignmentAdjustment();
+ }
+ }
}
diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java
index 8fdafc6059..e0b527268c 100644
--- a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java
+++ b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java
@@ -27,10 +27,15 @@ import android.view.WindowManager;
import androidx.core.view.OneShotPreDrawListener;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
import com.android.launcher3.Hotseat;
import com.android.launcher3.Launcher;
import com.android.launcher3.Workspace;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.HorizontalInsettableView;
+import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.util.unfold.PreemptiveUnfoldTransitionProgressProvider;
import com.android.systemui.unfold.UnfoldTransitionProgressProvider;
import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener;
import com.android.systemui.unfold.updates.RotationChangeProvider;
@@ -40,7 +45,7 @@ import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;
/**
* Controls animations that are happening during unfolding foldable devices
*/
-public class LauncherUnfoldAnimationController {
+public class LauncherUnfoldAnimationController implements OnDeviceProfileChangeListener {
// Percentage of the width of the quick search bar that will be reduced
// from the both sides of the bar when progress is 0
@@ -55,9 +60,13 @@ public class LauncherUnfoldAnimationController {
private final NaturalRotationUnfoldProgressProvider mNaturalOrientationProgressProvider;
private final UnfoldMoveFromCenterHotseatAnimator mUnfoldMoveFromCenterHotseatAnimator;
private final UnfoldMoveFromCenterWorkspaceAnimator mUnfoldMoveFromCenterWorkspaceAnimator;
+ private final TransitionStatusProvider mExternalTransitionStatusProvider =
+ new TransitionStatusProvider();
+ private PreemptiveUnfoldTransitionProgressProvider mPreemptiveProgressProvider = null;
+ private Boolean mIsTablet = null;
private static final String TRACE_WAIT_TO_HANDLE_UNFOLD_TRANSITION =
- "waitingOneFrameBeforeHandlingUnfoldAnimation";
+ "LauncherUnfoldAnimationController#waitingForTheNextFrame";
@Nullable
private HorizontalInsettableView mQsbInsettable;
@@ -68,8 +77,21 @@ public class LauncherUnfoldAnimationController {
UnfoldTransitionProgressProvider unfoldTransitionProgressProvider,
RotationChangeProvider rotationChangeProvider) {
mLauncher = launcher;
- mProgressProvider = new ScopedUnfoldTransitionProgressProvider(
- unfoldTransitionProgressProvider);
+
+ if (FeatureFlags.PREEMPTIVE_UNFOLD_ANIMATION_START.get()) {
+ mPreemptiveProgressProvider = new PreemptiveUnfoldTransitionProgressProvider(
+ unfoldTransitionProgressProvider, launcher.getMainThreadHandler());
+ mPreemptiveProgressProvider.init();
+
+ mProgressProvider = new ScopedUnfoldTransitionProgressProvider(
+ mPreemptiveProgressProvider);
+ } else {
+ mProgressProvider = new ScopedUnfoldTransitionProgressProvider(
+ unfoldTransitionProgressProvider);
+ }
+
+ unfoldTransitionProgressProvider.addCallback(mExternalTransitionStatusProvider);
+
mUnfoldMoveFromCenterHotseatAnimator = new UnfoldMoveFromCenterHotseatAnimator(launcher,
windowManager, rotationChangeProvider);
mUnfoldMoveFromCenterWorkspaceAnimator = new UnfoldMoveFromCenterWorkspaceAnimator(launcher,
@@ -85,6 +107,8 @@ public class LauncherUnfoldAnimationController {
// Animated only in natural orientation
mNaturalOrientationProgressProvider.addCallback(new QsbAnimationListener());
mNaturalOrientationProgressProvider.addCallback(mUnfoldMoveFromCenterHotseatAnimator);
+
+ mLauncher.addOnDeviceProfileChangeListener(this);
}
/**
@@ -96,17 +120,21 @@ public class LauncherUnfoldAnimationController {
mQsbInsettable = (HorizontalInsettableView) hotseat.getQsb();
}
- handleTransitionOnNextFrame();
+ mProgressProvider.setReadyToHandleTransition(true);
}
- private void handleTransitionOnNextFrame() {
+ private void preemptivelyStartAnimationOnNextFrame() {
Trace.asyncTraceBegin(Trace.TRACE_TAG_APP,
TRACE_WAIT_TO_HANDLE_UNFOLD_TRANSITION, /* cookie= */ 0);
+
+ // Start the animation (and apply the transformations) in pre-draw listener to make sure
+ // that the views are laid out as some transformations depend on the view sizes and position
OneShotPreDrawListener.add(mLauncher.getWorkspace(),
() -> {
Trace.asyncTraceEnd(Trace.TRACE_TAG_APP,
TRACE_WAIT_TO_HANDLE_UNFOLD_TRANSITION, /* cookie= */ 0);
- mProgressProvider.setReadyToHandleTransition(true);
+ mPreemptiveProgressProvider.preemptivelyStartTransition(
+ /* initialProgress= */ 0f);
});
}
@@ -124,14 +152,49 @@ public class LauncherUnfoldAnimationController {
public void onDestroy() {
mProgressProvider.destroy();
mNaturalOrientationProgressProvider.destroy();
+ mLauncher.removeOnDeviceProfileChangeListener(this);
}
- /** Called when launcher finished binding its items. */
+ /**
+ * Called when launcher has finished binding its items
+ */
public void updateRegisteredViewsIfNeeded() {
mUnfoldMoveFromCenterHotseatAnimator.updateRegisteredViewsIfNeeded();
mUnfoldMoveFromCenterWorkspaceAnimator.updateRegisteredViewsIfNeeded();
}
+ @Override
+ public void onDeviceProfileChanged(DeviceProfile dp) {
+ if (!FeatureFlags.PREEMPTIVE_UNFOLD_ANIMATION_START.get()) {
+ return;
+ }
+
+ if (mIsTablet != null && dp.isTablet != mIsTablet) {
+ // We should preemptively start the animation only if:
+ // - We changed to the unfolded screen
+ // - SystemUI IPC connection is alive, so we won't end up in a situation that we won't
+ // receive transition progress events from SystemUI later because there was no
+ // IPC connection established (e.g. because of SystemUI crash)
+ // - SystemUI has not already sent unfold animation progress events. This might happen
+ // if Launcher was not open during unfold, in this case we receive the configuration
+ // change only after we went back to home screen and we don't want to start the
+ // animation in this case.
+ if (dp.isTablet
+ && SystemUiProxy.INSTANCE.get(mLauncher).isActive()
+ && !mExternalTransitionStatusProvider.hasRun()) {
+ // Preemptively start the unfold animation to make sure that we have drawn
+ // the first frame of the animation before the screen gets unblocked
+ preemptivelyStartAnimationOnNextFrame();
+ }
+
+ if (!dp.isTablet) {
+ mExternalTransitionStatusProvider.onFolded();
+ }
+ }
+
+ mIsTablet = dp.isTablet;
+ }
+
private class QsbAnimationListener implements TransitionProgressListener {
@Override
@@ -178,4 +241,48 @@ public class LauncherUnfoldAnimationController {
HOTSEAT_SCALE_PROPERTY.setValue(mLauncher.getHotseat(), value);
}
}
+
+ /**
+ * Class to track the current status of the external transition provider (the events are coming
+ * from the SystemUI side through IPC), it allows to check if the transition has already
+ * finished or currently running on the SystemUI side since last unfold.
+ */
+ private static class TransitionStatusProvider implements TransitionProgressListener {
+
+ private boolean mHasRun = false;
+
+ @Override
+ public void onTransitionStarted() {
+ markAsRun();
+ }
+
+ @Override
+ public void onTransitionProgress(float progress) {
+ markAsRun();
+ }
+
+ @Override
+ public void onTransitionFinished() {
+ markAsRun();
+ }
+
+ /**
+ * Called when the device is folded, so we can reset the status of the animation
+ */
+ public void onFolded() {
+ mHasRun = false;
+ }
+
+ /**
+ * Returns true if there was an animation already (or it is currently running) after
+ * unfolding the device
+ */
+ public boolean hasRun() {
+ return mHasRun;
+ }
+
+ private void markAsRun() {
+ mHasRun = true;
+ }
+ }
}
diff --git a/quickstep/src/com/android/quickstep/util/LottieAnimationColorUtils.java b/quickstep/src/com/android/quickstep/util/LottieAnimationColorUtils.java
new file mode 100644
index 0000000000..f98b04bf54
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/LottieAnimationColorUtils.java
@@ -0,0 +1,90 @@
+/*
+ * 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.quickstep.util;
+
+import static com.airbnb.lottie.LottieProperty.COLOR_FILTER;
+
+import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.airbnb.lottie.LottieAnimationView;
+import com.airbnb.lottie.model.KeyPath;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/** Utility class for programmatically updating Lottie animation tokenized colors. */
+public final class LottieAnimationColorUtils {
+
+ private LottieAnimationColorUtils() {}
+
+ /**
+ * Updates the given Lottie animation's tokenized colors according to the given mapping.
+ *
+ * Use this method signature only when {@code tokenToColorCodeMap} maps to packed ARBG color
+ * integers.
+ *
+ * @param animationView {@link LottieAnimationView} whose animation's colors need to be updated
+ * @param tokenToColorCodeMap A mapping from the color tokens used in the Lottie file used in
+ * {@code animationView} to packed ARBG color integers.
+ */
+ public static void updateColors(
+ @NonNull LottieAnimationView animationView,
+ @NonNull Map tokenToColorCodeMap) {
+ updateColors(animationView, tokenToColorCodeMap, null);
+ }
+
+ /**
+ * Updates the given Lottie animation's tokenized colors according to the given mapping.
+ *
+ * Use this method signature with a non-null theme only when {@code tokenToColorCodeMap} maps
+ * to color resource references.
+ *
+ * @param animationView {@link LottieAnimationView} whose animation's colors need to be updated
+ * @param tokenToColorCodeMap A mapping from the color tokens used in the Lottie file used in
+ * {@code animationView} to packed ARBG color integers or color
+ * resource references.
+ * @param theme {@link Theme} to be used when resolving color resource references. {@code null}
+ * iff {@code tokenToColorCodeMap} maps to packed ARBG color integers.
+ */
+ public static void updateColors(
+ @NonNull LottieAnimationView animationView,
+ @NonNull Map tokenToColorCodeMap,
+ @Nullable Theme theme) {
+ Resources resources = animationView.getResources();
+ final Map tokenToColorMap = theme == null
+ // tokenToColorCodeMap maps directly to ARBG values
+ ? tokenToColorCodeMap
+ // tokenToColorCodeMap maps to color references, build a mapping to resolved colors
+ : tokenToColorCodeMap.keySet().stream().collect(Collectors.toMap(
+ Function.identity(),
+ token -> resources.getColor(tokenToColorCodeMap.get(token), theme)));
+
+ animationView.addLottieOnCompositionLoadedListener(
+ composition -> tokenToColorMap.forEach(
+ (token, color) -> animationView.addValueCallback(
+ new KeyPath("**", token, "**"),
+ COLOR_FILTER,
+ frameInfo -> new PorterDuffColorFilter(
+ color, PorterDuff.Mode.SRC_ATOP))));
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index cf07e6e687..ef7d7a911a 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -78,7 +78,8 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs
public void onStateTransitionComplete(LauncherState finalState) {
HotseatPredictionController client = mLauncher.getHotseatPredictionController();
if (mFromAllApps && finalState == NORMAL && client.hasPredictions()) {
- if (incrementEventCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
+ if (!mLauncher.getDeviceProfile().isTablet
+ && incrementEventCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
client.showEdu();
stateManager.removeStateListener(this);
}
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index c4ba39a76e..f6ad692fcb 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -116,6 +116,7 @@ public class RecentsOrientedState implements
| FLAG_SWIPE_UP_NOT_RUNNING;
private final Context mContext;
+ private final BaseActivityInterface mActivityInterface;
private final OrientationEventListener mOrientationListener;
private final SettingsCache mSettingsCache;
private final SettingsCache.OnChangeListener mRotationChangeListener =
@@ -135,9 +136,10 @@ public class RecentsOrientedState implements
* is enabled
* @see #setRotationWatcherEnabled(boolean)
*/
- public RecentsOrientedState(Context context, BaseActivityInterface sizeStrategy,
+ public RecentsOrientedState(Context context, BaseActivityInterface activityInterface,
IntConsumer rotationChangeListener) {
mContext = context;
+ mActivityInterface = activityInterface;
mOrientationListener = new OrientationEventListener(context) {
@Override
public void onOrientationChanged(int degrees) {
@@ -149,7 +151,7 @@ public class RecentsOrientedState implements
}
};
- mFlags = sizeStrategy.rotationSupportedByActivity
+ mFlags = mActivityInterface.rotationSupportedByActivity
? FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_ACTIVITY : 0;
mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;
@@ -157,6 +159,10 @@ public class RecentsOrientedState implements
initFlags();
}
+ public BaseActivityInterface getActivityInterface() {
+ return mActivityInterface;
+ }
+
/**
* Sets the device profile for the current state.
*/
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
new file mode 100644
index 0000000000..3ff461adf3
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
@@ -0,0 +1,413 @@
+/*
+ * 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.quickstep.util
+
+import android.annotation.IntDef
+import android.app.ActivityManager.RunningTaskInfo
+import android.app.ActivityTaskManager.INVALID_TASK_ID
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.os.UserHandle
+import android.util.Log
+import com.android.internal.annotations.VisibleForTesting
+import com.android.launcher3.logging.StatsLogManager.EventEnum
+import com.android.launcher3.model.data.ItemInfo
+import com.android.launcher3.shortcuts.ShortcutKey
+import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED
+import com.android.launcher3.util.SplitConfigurationOptions.StagePosition
+import com.android.launcher3.util.SplitConfigurationOptions.getOppositeStagePosition
+import com.android.quickstep.util.SplitSelectDataHolder.Companion.SplitLaunchType
+import java.io.PrintWriter
+
+/**
+ * Holds/transforms/signs/seals/delivers information for the transient state of the user
+ * selecting a first app to start split with and then choosing a second app.
+ * This class DOES NOT associate itself with drag-and-drop split screen starts because they come
+ * from the bad part of town.
+ *
+ * After setting the correct fields for initial/second.* variables, this converts them into the
+ * correct [PendingIntent] and [ShortcutInfo] objects where applicable and sends the necessary
+ * data back via [getSplitLaunchData].
+ * [SplitLaunchType] indicates the type of tasks/apps/intents being launched given the provided
+ * state
+ */
+class SplitSelectDataHolder(
+ val context: Context
+) {
+ val TAG = SplitSelectDataHolder::class.simpleName
+
+ /**
+ * Order of the constant indicates the order of which task/app was selected.
+ * Ex. SPLIT_TASK_SHORTCUT means primary split app identified by task, secondary is shortcut
+ * SPLIT_SHORTCUT_TASK means primary split app is determined by shortcut, secondary is task
+ */
+ companion object {
+ @IntDef(SPLIT_TASK_TASK, SPLIT_TASK_PENDINGINTENT, SPLIT_TASK_SHORTCUT,
+ SPLIT_PENDINGINTENT_TASK, SPLIT_PENDINGINTENT_PENDINGINTENT, SPLIT_SHORTCUT_TASK,
+ SPLIT_SINGLE_TASK_FULLSCREEN, SPLIT_SINGLE_INTENT_FULLSCREEN,
+ SPLIT_SINGLE_SHORTCUT_FULLSCREEN)
+ @Retention(AnnotationRetention.SOURCE)
+ annotation class SplitLaunchType
+
+ const val SPLIT_TASK_TASK = 0
+ const val SPLIT_TASK_PENDINGINTENT = 1
+ const val SPLIT_TASK_SHORTCUT = 2
+ const val SPLIT_PENDINGINTENT_TASK = 3
+ const val SPLIT_SHORTCUT_TASK = 4
+ const val SPLIT_PENDINGINTENT_PENDINGINTENT = 5
+
+ // Non-split edge case of launching the initial selected task as a fullscreen task
+ const val SPLIT_SINGLE_TASK_FULLSCREEN = 6
+ const val SPLIT_SINGLE_INTENT_FULLSCREEN = 7
+ const val SPLIT_SINGLE_SHORTCUT_FULLSCREEN = 8
+ }
+
+
+ @StagePosition
+ private var initialStagePosition: Int = STAGE_POSITION_UNDEFINED
+ private var initialTaskId: Int = INVALID_TASK_ID
+ private var secondTaskId: Int = INVALID_TASK_ID
+ private var initialUser: UserHandle? = null
+ private var secondUser: UserHandle? = null
+ private var initialIntent: Intent? = null
+ private var secondIntent: Intent? = null
+ private var secondPendingIntent: PendingIntent? = null
+ private var itemInfo: ItemInfo? = null
+ private var splitEvent: EventEnum? = null
+ private var initialShortcut: ShortcutInfo? = null
+ private var secondShortcut: ShortcutInfo? = null
+ private var initialPendingIntent: PendingIntent? = null
+
+ /**
+ * @param alreadyRunningTask if set to [android.app.ActivityTaskManager.INVALID_TASK_ID]
+ * then @param intent will be used to launch the initial task
+ * @param intent will be ignored if @param alreadyRunningTask is set
+ */
+ fun setInitialTaskSelect(intent: Intent?, @StagePosition stagePosition: Int,
+ itemInfo: ItemInfo?, splitEvent: EventEnum?,
+ alreadyRunningTask: Int) {
+ if (alreadyRunningTask != INVALID_TASK_ID) {
+ initialTaskId = alreadyRunningTask
+ } else {
+ initialIntent = intent!!
+ initialUser = itemInfo!!.user
+ }
+ setInitialData(stagePosition, splitEvent, itemInfo)
+ }
+
+ /**
+ * To be called after first task selected from using a split shortcut from the fullscreen
+ * running app.
+ */
+ fun setInitialTaskSelect(info: RunningTaskInfo,
+ @StagePosition stagePosition: Int, itemInfo: ItemInfo?,
+ splitEvent: EventEnum?) {
+ initialTaskId = info.taskId
+ setInitialData(stagePosition, splitEvent, itemInfo)
+ }
+
+ private fun setInitialData(@StagePosition stagePosition: Int,
+ event: EventEnum?, item: ItemInfo?) {
+ itemInfo = item
+ initialStagePosition = stagePosition
+ splitEvent = event
+ }
+
+ /**
+ * To be called as soon as user selects the second task (even if animations aren't complete)
+ * @param taskId The second task that will be launched.
+ */
+ fun setSecondTask(taskId: Int) {
+ secondTaskId = taskId
+ }
+
+ /**
+ * To be called as soon as user selects the second app (even if animations aren't complete)
+ * @param intent The second intent that will be launched.
+ * @param user The user of that intent.
+ */
+ fun setSecondTask(intent: Intent, user: UserHandle) {
+ secondIntent = intent
+ secondUser = user
+ }
+
+ /**
+ * To be called as soon as user selects the second app (even if animations aren't complete)
+ * Sets [secondUser] from that of the pendingIntent
+ * @param pendingIntent The second PendingIntent that will be launched.
+ */
+ fun setSecondTask(pendingIntent: PendingIntent) {
+ secondPendingIntent = pendingIntent
+ secondUser = pendingIntent.creatorUserHandle
+ }
+
+ private fun getShortcutInfo(intent: Intent?, user: UserHandle?): ShortcutInfo? {
+ val intentPackage = intent?.getPackage()
+ if (intentPackage == null) {
+ return null
+ }
+ val shortcutId = intent.getStringExtra(ShortcutKey.EXTRA_SHORTCUT_ID)
+ ?: return null
+ try {
+ val context: Context =
+ if (user != null) {
+ context.createPackageContextAsUser(intentPackage, 0 /* flags */, user)
+ } else {
+ context.createPackageContext(intentPackage, 0 /* *flags */)
+ }
+ return ShortcutInfo.Builder(context, shortcutId).build()
+ } catch (e: PackageManager.NameNotFoundException) {
+ Log.w(TAG, "Failed to create a ShortcutInfo for " + intent.getPackage())
+ }
+ return null
+ }
+
+ /**
+ * Converts intents to pendingIntents, associating the [user] with the intent if provided
+ */
+ private fun getPendingIntent(intent: Intent?, user: UserHandle?): PendingIntent? {
+ if (intent != initialIntent && intent != secondIntent) {
+ throw IllegalStateException("Invalid intent to convert to PendingIntent")
+ }
+
+ return if (intent == null) {
+ null
+ } else if (user != null) {
+ PendingIntent.getActivityAsUser(context, 0, intent,
+ PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT,
+ null /* options */, user)
+ } else {
+ PendingIntent.getActivity(context, 0, intent,
+ PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT)
+ }
+ }
+
+ /**
+ * @return [SplitLaunchData] with the necessary fields populated as determined by
+ * [SplitLaunchData.splitLaunchType]. This is to be used for launching splitscreen
+ */
+ fun getSplitLaunchData() : SplitLaunchData {
+ // Convert all intents to shortcut infos to see if determine if we launch shortcut or intent
+ convertIntentsToFinalTypes()
+ val splitLaunchType = getSplitLaunchType()
+ if (splitLaunchType == SPLIT_TASK_PENDINGINTENT || splitLaunchType == SPLIT_TASK_SHORTCUT) {
+ // need to get opposite stage position
+ initialStagePosition = getOppositeStagePosition(initialStagePosition)
+ }
+
+ return generateSplitLaunchData(splitLaunchType)
+ }
+
+ /**
+ * @return [SplitLaunchData] with the necessary fields populated as determined by
+ * [SplitLaunchData.splitLaunchType]. This is to be used for launching an initially selected
+ * split task in fullscreen
+ */
+ fun getFullscreenLaunchData() : SplitLaunchData {
+ // Convert all intents to shortcut infos to see if determine if we launch shortcut or intent
+ convertIntentsToFinalTypes()
+ val splitLaunchType = getFullscreenLaunchType()
+
+ return generateSplitLaunchData(splitLaunchType)
+ }
+
+ private fun generateSplitLaunchData(@SplitLaunchType splitLaunchType: Int) : SplitLaunchData {
+ return SplitLaunchData(
+ splitLaunchType,
+ initialTaskId,
+ secondTaskId,
+ initialPendingIntent,
+ secondPendingIntent,
+ initialUser?.identifier ?: -1,
+ secondUser?.identifier ?: -1,
+ initialShortcut,
+ secondShortcut,
+ itemInfo,
+ splitEvent,
+ initialStagePosition)
+ }
+
+ /**
+ * Converts our [initialIntent] and [secondIntent] into shortcuts and pendingIntents, if
+ * possible.
+ *
+ * Note that both [initialIntent] and [secondIntent] will be nullified on method return
+ *
+ * One caveat is that if [secondPendingIntent] is set, we will use that and *not* attempt to
+ * convert [secondIntent]
+ */
+ private fun convertIntentsToFinalTypes() {
+ initialShortcut = getShortcutInfo(initialIntent, checkNotNull(initialUser))
+ initialPendingIntent = getPendingIntent(initialIntent, initialUser)
+ initialIntent = null
+
+ // Only one of the two is currently allowed (secondPendingIntent directly set for widgets)
+ if (secondIntent != null && secondPendingIntent != null) {
+ throw IllegalStateException("Both secondIntent and secondPendingIntent non-null")
+ }
+ // If secondPendingIntent already set, no need to convert. Prioritize using that
+ if (secondPendingIntent != null) {
+ secondIntent = null
+ return
+ }
+
+ secondShortcut = getShortcutInfo(secondIntent, checkNotNull(secondUser))
+ secondPendingIntent = getPendingIntent(secondIntent, secondUser)
+ secondIntent = null
+ }
+
+ /**
+ * Only valid data fields at this point should be tasks, shortcuts, or pendingIntents
+ * Intents need to be converted in [convertIntentsToFinalTypes] prior to calling this method
+ */
+ @VisibleForTesting
+ @SplitLaunchType
+ fun getSplitLaunchType(): Int {
+ if (initialIntent != null || secondIntent != null) {
+ throw IllegalStateException("Intents need to be converted")
+ }
+
+ // Prioritize task launches first
+ if (initialTaskId != INVALID_TASK_ID) {
+ if (secondTaskId != INVALID_TASK_ID) {
+ return SPLIT_TASK_TASK
+ }
+ if (secondShortcut != null) {
+ return SPLIT_TASK_SHORTCUT
+ }
+ if (secondPendingIntent != null) {
+ return SPLIT_TASK_PENDINGINTENT
+ }
+ }
+
+ if (secondTaskId != INVALID_TASK_ID) {
+ if (initialShortcut != null) {
+ return SPLIT_SHORTCUT_TASK
+ }
+ if (initialPendingIntent != null) {
+ return SPLIT_PENDINGINTENT_TASK
+ }
+ }
+
+ // All task+shortcut combinations are handled above, only launch left is with multiple
+ // intents (and respective shortcut infos, if necessary)
+ if (initialPendingIntent != null && secondPendingIntent != null) {
+ return SPLIT_PENDINGINTENT_PENDINGINTENT
+ }
+ throw IllegalStateException("Unidentified split launch type")
+ }
+
+ @SplitLaunchType
+ private fun getFullscreenLaunchType(): Int {
+ if (initialTaskId != INVALID_TASK_ID) {
+ return SPLIT_SINGLE_TASK_FULLSCREEN
+ }
+
+ if (initialShortcut != null) {
+ return SPLIT_SINGLE_SHORTCUT_FULLSCREEN
+ }
+
+ if (initialPendingIntent != null) {
+ return SPLIT_SINGLE_INTENT_FULLSCREEN
+ }
+ throw IllegalStateException("Unidentified fullscreen launch type")
+ }
+
+ data class SplitLaunchData(
+ @SplitLaunchType
+ val splitLaunchType: Int,
+ var initialTaskId: Int = INVALID_TASK_ID,
+ var secondTaskId: Int = INVALID_TASK_ID,
+ var initialPendingIntent: PendingIntent? = null,
+ var secondPendingIntent: PendingIntent? = null,
+ var initialUserId: Int = -1,
+ var secondUserId: Int = -1,
+ var initialShortcut: ShortcutInfo? = null,
+ var secondShortcut: ShortcutInfo? = null,
+ var itemInfo: ItemInfo? = null,
+ var splitEvent: EventEnum? = null,
+ val initialStagePosition: Int = STAGE_POSITION_UNDEFINED
+ )
+
+ /**
+ * @return `true` if first task has been selected and waiting for the second task to be
+ * chosen
+ */
+ fun isSplitSelectActive(): Boolean {
+ return isInitialTaskIntentSet() && !isSecondTaskIntentSet()
+ }
+
+ /**
+ * @return `true` if the first and second task have been chosen and split is waiting to
+ * be launched
+ */
+ fun isBothSplitAppsConfirmed(): Boolean {
+ return isInitialTaskIntentSet() && isSecondTaskIntentSet()
+ }
+
+ private fun isInitialTaskIntentSet(): Boolean {
+ return initialTaskId != INVALID_TASK_ID || initialIntent != null
+ }
+
+ fun getInitialTaskId(): Int {
+ return initialTaskId
+ }
+
+ fun getSecondTaskId(): Int {
+ return secondTaskId
+ }
+
+ private fun isSecondTaskIntentSet(): Boolean {
+ return secondTaskId != INVALID_TASK_ID || secondIntent != null
+ || secondPendingIntent != null
+ }
+
+ fun resetState() {
+ initialStagePosition = STAGE_POSITION_UNDEFINED
+ initialTaskId = INVALID_TASK_ID
+ secondTaskId = INVALID_TASK_ID
+ initialUser = null
+ secondUser = null
+ initialIntent = null
+ secondIntent = null
+ secondPendingIntent = null
+ itemInfo = null
+ splitEvent = null
+ initialShortcut = null
+ secondShortcut = null
+ }
+
+ fun dump(prefix: String, writer: PrintWriter) {
+ writer.println("$prefix ${javaClass.simpleName}")
+ writer.println("$prefix\tinitialStagePosition= $initialStagePosition")
+ writer.println("$prefix\tinitialTaskId= $initialTaskId")
+ writer.println("$prefix\tsecondTaskId= $secondTaskId")
+ writer.println("$prefix\tinitialUser= $initialUser")
+ writer.println("$prefix\tsecondUser= $secondUser")
+ writer.println("$prefix\tinitialIntent= $initialIntent")
+ writer.println("$prefix\tsecondIntent= $secondIntent")
+ writer.println("$prefix\tsecondPendingIntent= $secondPendingIntent")
+ writer.println("$prefix\titemInfo= $itemInfo")
+ writer.println("$prefix\tsplitEvent= $splitEvent")
+ writer.println("$prefix\tinitialShortcut= $initialShortcut")
+ writer.println("$prefix\tsecondShortcut= $secondShortcut")
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 5a883bf4eb..f25619d963 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -17,12 +17,22 @@
package com.android.quickstep.util;
import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static android.app.PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT;
import static android.app.PendingIntent.FLAG_MUTABLE;
import static com.android.launcher3.Utilities.postAsyncCallback;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import static com.android.launcher3.util.SplitConfigurationOptions.DEFAULT_SPLIT_RATIO;
import static com.android.launcher3.util.SplitConfigurationOptions.getOppositeStagePosition;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_PENDINGINTENT_PENDINGINTENT;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_PENDINGINTENT_TASK;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_SHORTCUT_TASK;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_SINGLE_INTENT_FULLSCREEN;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_SINGLE_SHORTCUT_FULLSCREEN;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_SINGLE_TASK_FULLSCREEN;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_PENDINGINTENT;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_SHORTCUT;
+import static com.android.quickstep.util.SplitSelectDataHolder.SPLIT_TASK_TASK;
import android.annotation.NonNull;
import android.app.ActivityManager;
@@ -33,6 +43,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ShortcutInfo;
+import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
@@ -50,6 +61,7 @@ import android.window.TransitionInfo;
import androidx.annotation.Nullable;
import com.android.internal.logging.InstanceId;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.logging.StatsLogManager;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.shortcuts.ShortcutKey;
@@ -70,6 +82,7 @@ import com.android.quickstep.views.TaskView;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
+import java.io.PrintWriter;
import java.util.function.Consumer;
/**
@@ -83,6 +96,8 @@ public class SplitSelectStateController {
private final Handler mHandler;
private final RecentsModel mRecentTasksModel;
private final SplitAnimationController mSplitAnimationController;
+ private final AppPairsController mAppPairsController;
+ private final SplitSelectDataHolder mSplitSelectDataHolder;
private StatsLogManager mStatsLogManager;
private final SystemUiProxy mSystemUiProxy;
private final StateManager mStateManager;
@@ -96,8 +111,15 @@ public class SplitSelectStateController {
private UserHandle mInitialUser;
private int mInitialTaskId = INVALID_TASK_ID;
/** {@link #mSecondTaskIntent} and {@link #mSecondUser} (the user of the Intent) are set
- * together when split is confirmed with an Intent. */
+ * together when split is confirmed with an Intent. Either this or {@link #mSecondPendingIntent}
+ * will be set, but not both
+ */
private Intent mSecondTaskIntent;
+ /**
+ * Set when split is confirmed via a widget. Either this or {@link #mSecondTaskIntent} will be
+ * set, but not both
+ */
+ private PendingIntent mSecondPendingIntent;
private UserHandle mSecondUser;
private int mSecondTaskId = INVALID_TASK_ID;
private boolean mRecentsAnimationRunning;
@@ -127,6 +149,8 @@ public class SplitSelectStateController {
mDepthController = depthController;
mRecentTasksModel = recentsModel;
mSplitAnimationController = new SplitAnimationController(this);
+ mAppPairsController = new AppPairsController(context, this);
+ mSplitSelectDataHolder = new SplitSelectDataHolder(mContext);
}
/**
@@ -145,6 +169,11 @@ public class SplitSelectStateController {
}
setInitialData(stagePosition, splitEvent, itemInfo);
+
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.setInitialTaskSelect(intent, stagePosition, itemInfo, splitEvent,
+ alreadyRunningTask);
+ }
}
/**
@@ -156,6 +185,10 @@ public class SplitSelectStateController {
StatsLogManager.EventEnum splitEvent) {
mInitialTaskId = info.taskId;
setInitialData(stagePosition, splitEvent, itemInfo);
+
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.setInitialTaskSelect(info, stagePosition, itemInfo, splitEvent);
+ }
}
private void setInitialData(@StagePosition int stagePosition,
@@ -169,13 +202,17 @@ public class SplitSelectStateController {
* Pulls the list of active Tasks from RecentsModel, and finds the most recently active Task
* matching a given ComponentName. Then uses that Task (which could be null) with the given
* callback.
- *
+ *
* Used in various task-switching or splitscreen operations when we need to check if there is a
* currently running Task of a certain type and use the most recent one.
*/
- public void findLastActiveTaskAndRunCallback(ComponentKey componentKey,
- Consumer callback) {
+ public void findLastActiveTaskAndRunCallback(
+ @Nullable ComponentKey componentKey, Consumer callback) {
mRecentTasksModel.getTasks(taskGroups -> {
+ if (componentKey == null) {
+ callback.accept(null);
+ return;
+ }
Task lastActiveTask = null;
// Loop through tasks in reverse, since they are ordered with most-recent tasks last.
for (int i = taskGroups.size() - 1; i >= 0; i--) {
@@ -200,7 +237,7 @@ public class SplitSelectStateController {
* Checks if a given Task is the most recently-active Task of type componentName. Used for
* selecting already-running Tasks for splitscreen.
*/
- public boolean isInstanceOfComponent(@Nullable Task task, ComponentKey componentKey) {
+ public boolean isInstanceOfComponent(@Nullable Task task, @NonNull ComponentKey componentKey) {
// Exclude the task that is already staged
if (task == null || task.key.id == mInitialTaskId) {
return false;
@@ -233,6 +270,10 @@ public class SplitSelectStateController {
*/
public void setSecondTask(Task task) {
mSecondTaskId = task.key.id;
+
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.setSecondTask(task.key.id);
+ }
}
/**
@@ -243,30 +284,24 @@ public class SplitSelectStateController {
public void setSecondTask(Intent intent, UserHandle user) {
mSecondTaskIntent = intent;
mSecondUser = user;
+
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.setSecondTask(intent, user);
+ }
}
/**
- * To be called when we want to launch split pairs from an existing GroupedTaskView.
+ * To be called as soon as user selects the second app (even if animations aren't complete)
+ * Sets {@link #mSecondUser} from that of the pendingIntent
+ * @param pendingIntent The second PendingIntent that will be launched.
*/
- public void launchTasks(GroupedTaskView groupedTaskView, Consumer callback,
- boolean freezeTaskList) {
- mLaunchingTaskView = groupedTaskView;
- TaskView.TaskIdAttributeContainer[] taskIdAttributeContainers =
- groupedTaskView.getTaskIdAttributeContainers();
- launchTasks(taskIdAttributeContainers[0].getTask().key.id,
- taskIdAttributeContainers[1].getTask().key.id,
- taskIdAttributeContainers[0].getStagePosition(), callback, freezeTaskList,
- groupedTaskView.getSplitRatio());
- }
+ public void setSecondTask(PendingIntent pendingIntent) {
+ mSecondPendingIntent = pendingIntent;
+ mSecondUser = pendingIntent.getCreatorUserHandle();
- /**
- * To be called when we want to launch split pairs from Overview when split is initiated from
- * Overview.
- */
- public void launchTasks(int taskId1, int taskId2, @StagePosition int stagePosition,
- Consumer callback, boolean freezeTaskList, float splitRatio) {
- launchTasks(taskId1, null /* intent1 */, taskId2, null /* intent2 */, stagePosition,
- callback, freezeTaskList, splitRatio, null);
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.setSecondTask(pendingIntent);
+ }
}
/**
@@ -285,20 +320,24 @@ public class SplitSelectStateController {
@Nullable InstanceId shellInstanceId) {
TestLogging.recordEvent(
TestProtocol.SEQUENCE_MAIN, "launchSplitTasks");
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ launchTasksRefactored(callback, freezeTaskList, splitRatio, shellInstanceId);
+ return;
+ }
+
final ActivityOptions options1 = ActivityOptions.makeBasic();
if (freezeTaskList) {
options1.setFreezeRecentTasksReordering();
}
+ boolean hasSecondaryPendingIntent = mSecondPendingIntent != null;
if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
- final RemoteSplitLaunchTransitionRunner animationRunner =
- new RemoteSplitLaunchTransitionRunner(taskId1, taskId2, callback);
- final RemoteTransition remoteTransition = new RemoteTransition(animationRunner,
- ActivityThread.currentActivityThread().getApplicationThread());
- if (intent1 == null && intent2 == null) {
+ final RemoteTransition remoteTransition = getShellRemoteTransition(taskId1, taskId2,
+ callback);
+ if (intent1 == null && (intent2 == null && !hasSecondaryPendingIntent)) {
mSystemUiProxy.startTasks(taskId1, options1.toBundle(), taskId2,
null /* options2 */, stagePosition, splitRatio, remoteTransition,
shellInstanceId);
- } else if (intent2 == null) {
+ } else if (intent2 == null && !hasSecondaryPendingIntent) {
launchIntentOrShortcut(intent1, mInitialUser, options1, taskId2, stagePosition,
splitRatio, remoteTransition, shellInstanceId);
} else if (intent1 == null) {
@@ -307,22 +346,23 @@ public class SplitSelectStateController {
shellInstanceId);
} else {
mSystemUiProxy.startIntents(getPendingIntent(intent1, mInitialUser),
- options1.toBundle(), getPendingIntent(intent2, mSecondUser),
+ mInitialUser.getIdentifier(), getShortcutInfo(intent1, mInitialUser),
+ options1.toBundle(), hasSecondaryPendingIntent
+ ? mSecondPendingIntent
+ : getPendingIntent(intent2, mSecondUser),
+ mSecondUser.getIdentifier(), getShortcutInfo(intent2, mSecondUser),
null /* options2 */, stagePosition, splitRatio, remoteTransition,
shellInstanceId);
}
} else {
- final RemoteSplitLaunchAnimationRunner animationRunner =
- new RemoteSplitLaunchAnimationRunner(taskId1, taskId2, callback);
- final RemoteAnimationAdapter adapter = new RemoteAnimationAdapter(
- animationRunner, 300, 150,
- ActivityThread.currentActivityThread().getApplicationThread());
+ final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(taskId1, taskId2,
+ callback);
- if (intent1 == null && intent2 == null) {
+ if (intent1 == null && (intent2 == null && !hasSecondaryPendingIntent)) {
mSystemUiProxy.startTasksWithLegacyTransition(taskId1, options1.toBundle(),
taskId2, null /* options2 */, stagePosition, splitRatio, adapter,
shellInstanceId);
- } else if (intent2 == null) {
+ } else if (intent2 == null && !hasSecondaryPendingIntent) {
launchIntentOrShortcutLegacy(intent1, mInitialUser, options1, taskId2,
stagePosition, splitRatio, adapter, shellInstanceId);
} else if (intent1 == null) {
@@ -331,15 +371,222 @@ public class SplitSelectStateController {
shellInstanceId);
} else {
mSystemUiProxy.startIntentsWithLegacyTransition(
- getPendingIntent(intent1, mInitialUser),
+ getPendingIntent(intent1, mInitialUser), mInitialUser.getIdentifier(),
getShortcutInfo(intent1, mInitialUser), options1.toBundle(),
- getPendingIntent(intent2, mSecondUser),
- getShortcutInfo(intent2, mSecondUser), null /* options2 */, stagePosition,
- splitRatio, adapter, shellInstanceId);
+ hasSecondaryPendingIntent
+ ? mSecondPendingIntent
+ : getPendingIntent(intent2, mSecondUser),
+ mSecondUser.getIdentifier(), getShortcutInfo(intent2, mSecondUser),
+ null /* options2 */, stagePosition, splitRatio, adapter, shellInstanceId);
}
}
}
+ private void launchTasksRefactored(Consumer callback, boolean freezeTaskList,
+ float splitRatio, @Nullable InstanceId shellInstanceId) {
+ final ActivityOptions options1 = ActivityOptions.makeBasic();
+ if (freezeTaskList) {
+ options1.setFreezeRecentTasksReordering();
+ }
+
+ SplitSelectDataHolder.SplitLaunchData launchData =
+ mSplitSelectDataHolder.getSplitLaunchData();
+ int firstTaskId = launchData.getInitialTaskId();
+ int secondTaskId = launchData.getSecondTaskId();
+ ShortcutInfo firstShortcut = launchData.getInitialShortcut();
+ ShortcutInfo secondShortcut = launchData.getSecondShortcut();
+ PendingIntent firstPI = launchData.getInitialPendingIntent();
+ PendingIntent secondPI = launchData.getSecondPendingIntent();
+ int firstUserId = launchData.getInitialUserId();
+ int secondUserId = launchData.getSecondUserId();
+ int initialStagePosition = launchData.getInitialStagePosition();
+ Bundle optionsBundle = options1.toBundle();
+
+ if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+ final RemoteTransition remoteTransition = getShellRemoteTransition(firstTaskId,
+ secondTaskId, callback);
+ switch (launchData.getSplitLaunchType()) {
+ case SPLIT_TASK_TASK ->
+ mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId,
+ null /* options2 */, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+
+ case SPLIT_TASK_PENDINGINTENT ->
+ mSystemUiProxy.startIntentAndTask(secondPI, secondUserId, optionsBundle,
+ firstTaskId, null /*options2*/, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+
+ case SPLIT_TASK_SHORTCUT ->
+ mSystemUiProxy.startShortcutAndTask(secondShortcut, optionsBundle,
+ firstTaskId, null /*options2*/, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+
+ case SPLIT_PENDINGINTENT_TASK ->
+ mSystemUiProxy.startIntentAndTask(firstPI, firstUserId, optionsBundle,
+ secondTaskId, null /*options2*/, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+
+ case SPLIT_PENDINGINTENT_PENDINGINTENT ->
+ mSystemUiProxy.startIntents(firstPI, firstUserId, firstShortcut,
+ optionsBundle, secondPI, secondUserId, secondShortcut,
+ null /*options2*/, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+
+ case SPLIT_SHORTCUT_TASK ->
+ mSystemUiProxy.startShortcutAndTask(firstShortcut, optionsBundle,
+ secondTaskId, null /*options2*/, initialStagePosition, splitRatio,
+ remoteTransition, shellInstanceId);
+ }
+ } else {
+ final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId, secondTaskId,
+ callback);
+ switch (launchData.getSplitLaunchType()) {
+ case SPLIT_TASK_TASK ->
+ mSystemUiProxy.startTasksWithLegacyTransition(firstTaskId, optionsBundle,
+ secondTaskId, null /* options2 */, initialStagePosition,
+ splitRatio, adapter, shellInstanceId);
+
+ case SPLIT_TASK_PENDINGINTENT ->
+ mSystemUiProxy.startIntentAndTaskWithLegacyTransition(secondPI,
+ secondUserId, optionsBundle, firstTaskId, null /*options2*/,
+ initialStagePosition, splitRatio, adapter, shellInstanceId);
+
+ case SPLIT_TASK_SHORTCUT ->
+ mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(secondShortcut,
+ optionsBundle, firstTaskId, null /*options2*/, initialStagePosition,
+ splitRatio, adapter, shellInstanceId);
+
+ case SPLIT_PENDINGINTENT_TASK ->
+ mSystemUiProxy.startIntentAndTaskWithLegacyTransition(firstPI, firstUserId,
+ optionsBundle, secondTaskId, null /*options2*/,
+ initialStagePosition, splitRatio, adapter, shellInstanceId);
+
+ case SPLIT_PENDINGINTENT_PENDINGINTENT ->
+ mSystemUiProxy.startIntentsWithLegacyTransition(firstPI, firstUserId,
+ firstShortcut, optionsBundle, secondPI, secondUserId,
+ secondShortcut, null /*options2*/, initialStagePosition, splitRatio,
+ adapter, shellInstanceId);
+
+ case SPLIT_SHORTCUT_TASK ->
+ mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(firstShortcut,
+ optionsBundle, secondTaskId, null /*options2*/,
+ initialStagePosition, splitRatio, adapter, shellInstanceId);
+ }
+ }
+ }
+
+ /**
+ * Used to launch split screen from a split pair that already exists (usually accessible through
+ * Overview). This is different than
+ * {@link #launchTasks(int, Intent, int, Intent, int, Consumer, boolean, float, InstanceId)} in
+ * that this only launches split screen that are existing tasks. This doesn't determine which
+ * API should be used (i.e. launching split with existing tasks vs intents vs shortcuts, etc).
+ *
+ *
+ * NOTE: This is not to be used to launch AppPairs.
+ */
+ public void launchExistingSplitPair(@Nullable GroupedTaskView groupedTaskView,
+ int firstTaskId, int secondTaskId, @StagePosition int stagePosition,
+ Consumer callback, boolean freezeTaskList, float splitRatio) {
+ mLaunchingTaskView = groupedTaskView;
+ final ActivityOptions options1 = ActivityOptions.makeBasic();
+ if (freezeTaskList) {
+ options1.setFreezeRecentTasksReordering();
+ }
+ Bundle optionsBundle = options1.toBundle();
+
+ if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+ final RemoteTransition remoteTransition = getShellRemoteTransition(firstTaskId,
+ secondTaskId, callback);
+ mSystemUiProxy.startTasks(firstTaskId, optionsBundle, secondTaskId,
+ null /* options2 */, stagePosition, splitRatio,
+ remoteTransition, null /*shellInstanceId*/);
+ } else {
+ final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId,
+ secondTaskId, callback);
+ mSystemUiProxy.startTasksWithLegacyTransition(firstTaskId, optionsBundle,
+ secondTaskId, null /* options2 */, stagePosition,
+ splitRatio, adapter, null /*shellInstanceId*/);
+ }
+ }
+
+ /**
+ * Launches the initially selected task/intent in fullscreen (note the same SystemUi APIs are
+ * used as {@link #launchSplitTasks(Consumer)} because they are overloaded to launch both
+ * split and fullscreen tasks)
+ */
+ public void launchInitialAppFullscreen(Consumer callback) {
+ if (!FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ launchSplitTasks(callback);
+ return;
+ }
+
+ final ActivityOptions options1 = ActivityOptions.makeBasic();
+ SplitSelectDataHolder.SplitLaunchData launchData =
+ mSplitSelectDataHolder.getFullscreenLaunchData();
+ int firstTaskId = launchData.getInitialTaskId();
+ int secondTaskId = launchData.getSecondTaskId();
+ PendingIntent firstPI = launchData.getInitialPendingIntent();
+ int firstUserId = launchData.getInitialUserId();
+ int initialStagePosition = launchData.getInitialStagePosition();
+ ShortcutInfo initialShortcut = launchData.getInitialShortcut();
+ Bundle optionsBundle = options1.toBundle();
+
+ final RemoteSplitLaunchTransitionRunner animationRunner =
+ new RemoteSplitLaunchTransitionRunner(firstTaskId, secondTaskId, callback);
+ final RemoteTransition remoteTransition = new RemoteTransition(animationRunner,
+ ActivityThread.currentActivityThread().getApplicationThread(),
+ "LaunchSplitPair");
+ InstanceId instanceId = LogUtils.getShellShareableInstanceId().first;
+ if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+ switch (launchData.getSplitLaunchType()) {
+ case SPLIT_SINGLE_TASK_FULLSCREEN -> mSystemUiProxy.startTasks(firstTaskId,
+ optionsBundle, secondTaskId, null /* options2 */, initialStagePosition,
+ DEFAULT_SPLIT_RATIO, remoteTransition, instanceId);
+ case SPLIT_SINGLE_INTENT_FULLSCREEN -> mSystemUiProxy.startIntentAndTask(firstPI,
+ firstUserId, optionsBundle, secondTaskId, null /*options2*/,
+ initialStagePosition, DEFAULT_SPLIT_RATIO, remoteTransition,
+ instanceId);
+ case SPLIT_SINGLE_SHORTCUT_FULLSCREEN -> mSystemUiProxy.startShortcutAndTask(
+ initialShortcut, optionsBundle, firstTaskId, null /* options2 */,
+ initialStagePosition, DEFAULT_SPLIT_RATIO, remoteTransition, instanceId);
+ }
+ } else {
+ final RemoteAnimationAdapter adapter = getLegacyRemoteAdapter(firstTaskId,
+ secondTaskId, callback);
+ switch (launchData.getSplitLaunchType()) {
+ case SPLIT_SINGLE_TASK_FULLSCREEN -> mSystemUiProxy.startTasksWithLegacyTransition(
+ firstTaskId, optionsBundle, secondTaskId, null /* options2 */,
+ initialStagePosition, DEFAULT_SPLIT_RATIO, adapter, instanceId);
+ case SPLIT_SINGLE_INTENT_FULLSCREEN ->
+ mSystemUiProxy.startIntentAndTaskWithLegacyTransition(firstPI, firstUserId,
+ optionsBundle, secondTaskId, null /*options2*/,
+ initialStagePosition, DEFAULT_SPLIT_RATIO, adapter,
+ instanceId);
+ case SPLIT_SINGLE_SHORTCUT_FULLSCREEN ->
+ mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(
+ initialShortcut, optionsBundle, firstTaskId, null /* options2 */,
+ initialStagePosition, DEFAULT_SPLIT_RATIO, adapter, instanceId);
+ }
+ }
+ }
+
+ private RemoteTransition getShellRemoteTransition(int firstTaskId, int secondTaskId,
+ Consumer callback) {
+ final RemoteSplitLaunchTransitionRunner animationRunner =
+ new RemoteSplitLaunchTransitionRunner(firstTaskId, secondTaskId, callback);
+ return new RemoteTransition(animationRunner,
+ ActivityThread.currentActivityThread().getApplicationThread(), "LaunchSplitPair");
+ }
+
+ private RemoteAnimationAdapter getLegacyRemoteAdapter(int firstTaskId, int secondTaskId,
+ Consumer callback) {
+ final RemoteSplitLaunchAnimationRunner animationRunner =
+ new RemoteSplitLaunchAnimationRunner(firstTaskId, secondTaskId, callback);
+ return new RemoteAnimationAdapter(animationRunner, 300, 150,
+ ActivityThread.currentActivityThread().getApplicationThread());
+ }
+
private void launchIntentOrShortcut(Intent intent, UserHandle user, ActivityOptions options1,
int taskId, @StagePosition int stagePosition, float splitRatio,
RemoteTransition remoteTransition, @Nullable InstanceId shellInstanceId) {
@@ -349,7 +596,7 @@ public class SplitSelectStateController {
options1.toBundle(), taskId, null /* options2 */, stagePosition,
splitRatio, remoteTransition, shellInstanceId);
} else {
- mSystemUiProxy.startIntentAndTask(getPendingIntent(intent, user),
+ mSystemUiProxy.startIntentAndTask(getPendingIntent(intent, user), user.getIdentifier(),
options1.toBundle(), taskId, null /* options2 */, stagePosition, splitRatio,
remoteTransition, shellInstanceId);
}
@@ -366,16 +613,33 @@ public class SplitSelectStateController {
splitRatio, adapter, shellInstanceId);
} else {
mSystemUiProxy.startIntentAndTaskWithLegacyTransition(
- getPendingIntent(intent, user), options1.toBundle(), taskId,
- null /* options2 */, stagePosition, splitRatio, adapter, shellInstanceId);
+ getPendingIntent(intent, user), user.getIdentifier(), options1.toBundle(),
+ taskId, null /* options2 */, stagePosition, splitRatio, adapter,
+ shellInstanceId);
}
}
+ /**
+ * We treat launching by intents as grouped in two ways,
+ * If {@param intent} represents the first app, we always convert the intent to pending intent
+ * It it represents second app, either the second intent OR mSecondPendingIntent will be used
+ * convert second intent to a pendingIntent OR return mSecondPendingIntent as is
+ */
private PendingIntent getPendingIntent(Intent intent, UserHandle user) {
+ boolean isParamFirstIntent = intent != null && intent == mInitialTaskIntent;
+ if (!isParamFirstIntent && mSecondPendingIntent != null) {
+ // Because mSecondPendingIntent and mSecondTaskIntent can't both be set, we know we need
+ // to be using mSecondPendingIntent
+ return mSecondPendingIntent;
+ }
+
+ // intent param must either be mInitialTaskIntent or mSecondTaskIntent, convert either to
+ // a new PendingIntent
return intent == null ? null : (user != null
? PendingIntent.getActivityAsUser(mContext, 0, intent,
- FLAG_MUTABLE, null /* options */, user)
- : PendingIntent.getActivity(mContext, 0, intent, FLAG_MUTABLE));
+ FLAG_MUTABLE | FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT, null /* options */, user)
+ : PendingIntent.getActivity(mContext, 0, intent,
+ FLAG_MUTABLE | FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT));
}
public @StagePosition int getActiveSplitStagePosition() {
@@ -513,7 +777,7 @@ public class SplitSelectStateController {
}
@Override
- public void onAnimationCancelled(boolean isKeyguardOccluded) {
+ public void onAnimationCancelled() {
postAsyncCallback(mHandler, () -> {
if (mSuccessCallback != null) {
// Launching legacy tasks while recents animation is running will always cause
@@ -529,6 +793,9 @@ public class SplitSelectStateController {
* To be called if split select was cancelled
*/
public void resetState() {
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ mSplitSelectDataHolder.resetState();
+ }
mInitialTaskId = INVALID_TASK_ID;
mInitialTaskIntent = null;
mSecondTaskId = INVALID_TASK_ID;
@@ -542,6 +809,7 @@ public class SplitSelectStateController {
mSplitEvent = null;
mAnimateCurrentTaskDismissal = false;
mDismissingFromSplitPair = false;
+ mSecondPendingIntent = null;
}
/**
@@ -549,7 +817,11 @@ public class SplitSelectStateController {
* chosen
*/
public boolean isSplitSelectActive() {
- return isInitialTaskIntentSet() && !isSecondTaskIntentSet();
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ return mSplitSelectDataHolder.isSplitSelectActive();
+ } else {
+ return isInitialTaskIntentSet() && !isSecondTaskIntentSet();
+ }
}
/**
@@ -557,7 +829,11 @@ public class SplitSelectStateController {
* be launched
*/
public boolean isBothSplitAppsConfirmed() {
- return isInitialTaskIntentSet() && isSecondTaskIntentSet();
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ return mSplitSelectDataHolder.isBothSplitAppsConfirmed();
+ } else {
+ return isInitialTaskIntentSet() && isSecondTaskIntentSet();
+ }
}
private boolean isInitialTaskIntentSet() {
@@ -565,15 +841,24 @@ public class SplitSelectStateController {
}
public int getInitialTaskId() {
- return mInitialTaskId;
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ return mSplitSelectDataHolder.getInitialTaskId();
+ } else {
+ return mInitialTaskId;
+ }
}
public int getSecondTaskId() {
- return mSecondTaskId;
+ if (FeatureFlags.ENABLE_SPLIT_LAUNCH_DATA_REFACTOR.get()) {
+ return mSplitSelectDataHolder.getSecondTaskId();
+ } else {
+ return mSecondTaskId;
+ }
}
private boolean isSecondTaskIntentSet() {
- return (mSecondTaskId != INVALID_TASK_ID || mSecondTaskIntent != null);
+ return (mSecondTaskId != INVALID_TASK_ID || mSecondTaskIntent != null
+ || mSecondPendingIntent != null);
}
public void setFirstFloatingTaskView(FloatingTaskView floatingTaskView) {
@@ -583,4 +868,14 @@ public class SplitSelectStateController {
public FloatingTaskView getFirstFloatingTaskView() {
return mFirstFloatingTaskView;
}
+
+ public AppPairsController getAppPairsController() {
+ return mAppPairsController;
+ }
+
+ public void dump(String prefix, PrintWriter writer) {
+ if (mSplitSelectDataHolder != null) {
+ mSplitSelectDataHolder.dump(prefix, writer);
+ }
+ }
}
diff --git a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java
index dd10c2da5d..148a45a386 100644
--- a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java
@@ -21,9 +21,15 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSP
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.PendingIntent;
import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.view.View;
@@ -55,14 +61,38 @@ public class SplitToWorkspaceController {
R.dimen.multi_window_task_divider_size) / 2;
}
+ /**
+ * Handles widget selection from staged split.
+ * @param view Original widget view
+ * @param pendingIntent Provided by widget via InteractionHandler
+ * @return {@code true} if we can attempt launch the widget into split, {@code false} otherwise
+ * to allow launcher to handle the click
+ */
+ public boolean handleSecondWidgetSelectionForSplit(View view, PendingIntent pendingIntent) {
+ if (shouldIgnoreSecondSplitLaunch()) {
+ return false;
+ }
+
+ // Convert original widgetView into bitmap to use for animation
+ // TODO(b/276361926) get the icon for this widget via PackageManager?
+ int width = view.getWidth();
+ int height = view.getHeight();
+ Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(bitmap);
+ view.draw(canvas);
+
+ mController.setSecondTask(pendingIntent);
+
+ startWorkspaceAnimation(view, bitmap, null /*icon*/);
+ return true;
+ }
+
/**
* Handles second app selection from stage split. If the item can't be opened in split or
* it's not in stage split state, we pass it onto Launcher's default item click handler.
*/
public boolean handleSecondAppSelectionForSplit(View view) {
- if ((!ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get()
- && !ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get())
- || !mController.isSplitSelectActive()) {
+ if (shouldIgnoreSecondSplitLaunch()) {
return false;
}
Object tag = view.getTag();
@@ -86,6 +116,12 @@ public class SplitToWorkspaceController {
mController.setSecondTask(intent, user);
+ startWorkspaceAnimation(view, null /*bitmap*/, bitmapInfo.newIcon(mLauncher));
+ return true;
+ }
+
+ private void startWorkspaceAnimation(@NonNull View view, @Nullable Bitmap bitmap,
+ @Nullable Drawable icon) {
boolean isTablet = mLauncher.getDeviceProfile().isTablet;
SplitAnimationTimings timings = AnimUtils.getDeviceSplitToConfirmTimings(isTablet);
PendingAnimation pendingAnimation = new PendingAnimation(timings.getDuration());
@@ -107,8 +143,7 @@ public class SplitToWorkspaceController {
false /* fadeWithThumbnail */, true /* isStagedTask */);
FloatingTaskView secondFloatingTaskView = FloatingTaskView.getFloatingTaskView(mLauncher,
- view, null /* thumbnail */, bitmapInfo.newIcon(mLauncher),
- secondTaskStartingBounds);
+ view, bitmap, icon, secondTaskStartingBounds);
secondFloatingTaskView.setAlpha(1);
secondFloatingTaskView.addConfirmAnimation(pendingAnimation, secondTaskStartingBounds,
secondTaskEndingBounds, true /* fadeWithThumbnail */, false /* isStagedTask */);
@@ -138,6 +173,11 @@ public class SplitToWorkspaceController {
}
});
pendingAnimation.buildAnim().start();
- return true;
+ }
+
+ private boolean shouldIgnoreSecondSplitLaunch() {
+ return (!ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get()
+ && !ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get())
+ || !mController.isSplitSelectActive();
}
}
diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java b/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java
index 7ab285dfa7..441f88d115 100644
--- a/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java
+++ b/quickstep/src/com/android/quickstep/util/SurfaceTransaction.java
@@ -106,6 +106,15 @@ public class SurfaceTransaction {
mTransaction.setShadowRadius(mSurface, radius);
return this;
}
+
+ /**
+ * Requests to show the given surface.
+ * @return this Builder
+ */
+ public SurfaceProperties setShow() {
+ mTransaction.show(mSurface);
+ return this;
+ }
}
/**
diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
index 95473dc39a..bb028a700c 100644
--- a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
+++ b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
@@ -22,13 +22,11 @@ import android.os.Message;
import android.view.SurfaceControl;
import android.view.SurfaceControl.Transaction;
import android.view.View;
+import android.view.View.OnAttachStateChangeListener;
import android.view.ViewRootImpl;
import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
-import java.util.function.Consumer;
-
-
/**
* Helper class to apply surface transactions in sync with RenderThread similar to
* android.view.SyncRtSurfaceTransactionApplier
@@ -39,22 +37,47 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
private static final int MSG_UPDATE_SEQUENCE_NUMBER = 0;
- private final SurfaceControl mBarrierSurfaceControl;
- private final ViewRootImpl mTargetViewRootImpl;
private final Handler mApplyHandler;
+ private boolean mInitialized;
+ private SurfaceControl mBarrierSurfaceControl;
+ private ViewRootImpl mTargetViewRootImpl;
+
private int mLastSequenceNumber = 0;
/**
* @param targetView The view in the surface that acts as synchronization anchor.
*/
public SurfaceTransactionApplier(View targetView) {
- mTargetViewRootImpl = targetView.getViewRootImpl();
- mBarrierSurfaceControl = mTargetViewRootImpl.getSurfaceControl();
+ if (targetView.isAttachedToWindow()) {
+ initialize(targetView);
+ } else {
+ mInitialized = false;
+ targetView.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
+ @Override
+ public void onViewAttachedToWindow(View v) {
+ if (!mInitialized) {
+ targetView.removeOnAttachStateChangeListener(this);
+ initialize(targetView);
+ }
+ }
+
+ @Override
+ public void onViewDetachedFromWindow(View v) {
+ // Do nothing
+ }
+ });
+ }
mApplyHandler = new Handler(this::onApplyMessage);
setCanRelease(true);
}
+ private void initialize(View view) {
+ mTargetViewRootImpl = view.getViewRootImpl();
+ mBarrierSurfaceControl = mTargetViewRootImpl.getSurfaceControl();
+ mInitialized = true;
+ }
+
protected boolean onApplyMessage(Message msg) {
if (msg.what == MSG_UPDATE_SEQUENCE_NUMBER) {
setCanRelease(msg.arg1 == mLastSequenceNumber);
@@ -70,6 +93,10 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
* this method to avoid synchronization issues.
*/
public void scheduleApply(SurfaceTransaction params) {
+ if (!mInitialized) {
+ params.getTransaction().apply();
+ return;
+ }
View view = mTargetViewRootImpl.getView();
if (view == null) {
return;
@@ -93,33 +120,4 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
// Make sure a frame gets scheduled.
view.invalidate();
}
-
- /**
- * Creates an instance of SurfaceTransactionApplier, deferring until the target view is
- * attached if necessary.
- */
- public static void create(
- final View targetView, final Consumer callback) {
- if (targetView == null) {
- // No target view, no applier
- callback.accept(null);
- } else if (targetView.isAttachedToWindow()) {
- // Already attached, we're good to go
- callback.accept(new SurfaceTransactionApplier(targetView));
- } else {
- // Haven't been attached before we can get the view root
- targetView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
- @Override
- public void onViewAttachedToWindow(View v) {
- targetView.removeOnAttachStateChangeListener(this);
- callback.accept(new SurfaceTransactionApplier(targetView));
- }
-
- @Override
- public void onViewDetachedFromWindow(View v) {
- // Do nothing
- }
- });
- }
- }
}
diff --git a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
index a34888f684..9808b2877c 100644
--- a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
+++ b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
@@ -24,6 +24,7 @@ import android.view.WindowManager;
import android.view.WindowMetrics;
import com.android.internal.policy.SystemBarUtils;
+import com.android.launcher3.logging.FileLog;
import com.android.launcher3.util.WindowBounds;
import com.android.launcher3.util.window.CachedDisplayInfo;
import com.android.launcher3.util.window.WindowManagerProxy;
@@ -59,6 +60,7 @@ public class SystemWindowManagerProxy extends WindowManagerProxy {
WindowManager windowManager = displayInfoContext.getSystemService(WindowManager.class);
Set possibleMaximumWindowMetrics =
windowManager.getPossibleMaximumWindowMetrics(DEFAULT_DISPLAY);
+ FileLog.d("b/283944974", "possibleMaximumWindowMetrics: " + possibleMaximumWindowMetrics);
for (WindowMetrics windowMetrics : possibleMaximumWindowMetrics) {
CachedDisplayInfo info = getDisplayInfo(windowMetrics, Surface.ROTATION_0);
WindowBounds[] bounds = estimateWindowBounds(displayInfoContext, info);
diff --git a/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java b/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java
new file mode 100644
index 0000000000..c22e0bc5c0
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java
@@ -0,0 +1,105 @@
+/*
+ * 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.quickstep.util;
+
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+
+import android.app.Activity;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;
+import com.android.quickstep.RecentsModel;
+
+/**
+ * This class tracks the failure of a task launch through the TaskView.launchTask() call, in an
+ * edge case in which starting a new task may initially succeed (startActivity returns true), but
+ * the launch ultimately fails if the activity finishes while it is resuming.
+ *
+ * There are two signals this class checks, the launcher lifecycle and the transition completion.
+ * If we hit either of those signals and the task is no longer valid, then the registered failure
+ * callback will be notified.
+ */
+public class TaskRemovedDuringLaunchListener implements ActivityLifecycleCallbacksAdapter {
+
+ private Activity mActivity;
+ private int mLaunchedTaskId = INVALID_TASK_ID;
+ private Runnable mTaskLaunchFailedCallback = null;
+
+ /**
+ * Registers a failure listener callback if it detects a scenario in which an app launch
+ * failed before the transition finished.
+ */
+ public void register(Activity activity, int launchedTaskId,
+ @NonNull Runnable taskLaunchFailedCallback) {
+ activity.registerActivityLifecycleCallbacks(this);
+ mActivity = activity;
+ mLaunchedTaskId = launchedTaskId;
+ mTaskLaunchFailedCallback = taskLaunchFailedCallback;
+ }
+
+ /**
+ * Unregisters the failure listener.
+ */
+ private void unregister() {
+ mActivity.unregisterActivityLifecycleCallbacks(this);
+ mActivity = null;
+ mLaunchedTaskId = INVALID_TASK_ID;
+ mTaskLaunchFailedCallback = null;
+ }
+
+ /**
+ * Called when the transition finishes.
+ */
+ public void onTransitionFinished() {
+ // The transition finished and Launcher was not stopped, check if the launch failed
+ checkTaskLaunchFailed();
+ }
+
+ @Override
+ public void onActivityStopped(Activity activity) {
+ // The normal task launch case, Launcher stops and updates its state correctly
+ unregister();
+ }
+
+ @Override
+ public void onActivityResumed(Activity activity) {
+ // The transition hasn't finished but Launcher was resumed, check if the launch failed
+ checkTaskLaunchFailed();
+ }
+
+ @Override
+ public void onActivityDestroyed(Activity activity) {
+ // If we somehow don't get any of the above signals, then just unregister this listener
+ unregister();
+ }
+
+ private void checkTaskLaunchFailed() {
+ if (mLaunchedTaskId != INVALID_TASK_ID) {
+ final int launchedTaskId = mLaunchedTaskId;
+ final Runnable taskLaunchFailedCallback = mTaskLaunchFailedCallback;
+ RecentsModel.INSTANCE.getNoCreate().isTaskRemoved(mLaunchedTaskId, (taskRemoved) -> {
+ if (taskRemoved) {
+ ActiveGestureLog.INSTANCE.addLog("Launch failed, task (id=" + launchedTaskId
+ + ") finished mid transition");
+ taskLaunchFailedCallback.run();
+ }
+ }, (task) -> true /* filter */);
+ unregister();
+ }
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java
new file mode 100644
index 0000000000..91e8376990
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java
@@ -0,0 +1,72 @@
+/*
+ * 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.quickstep.util;
+
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;
+import com.android.quickstep.RecentsModel;
+import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
+
+/**
+ * This class tracks the failure of a task launch through the Launcher.startActivitySafely() call,
+ * in an edge case in which a task may already be visible on screen (ie. in PIP) and no transition
+ * will be run in WM, which results in expected callbacks to not be processed.
+ *
+ * We transiently register a task stack listener during a task launch and if the restart signal is
+ * received, then the registered callback will be notified.
+ */
+public class TaskRestartedDuringLaunchListener implements TaskStackChangeListener {
+
+ private static final String TAG = "TaskRestartedDuringLaunchListener";
+
+ private @NonNull Runnable mTaskRestartedCallback = null;
+
+ /**
+ * Registers a failure listener callback if it detects a scenario in which an app launch
+ * resulted in an already existing task to be "restarted".
+ */
+ public void register(@NonNull Runnable taskRestartedCallback) {
+ TaskStackChangeListeners.getInstance().registerTaskStackListener(this);
+ mTaskRestartedCallback = taskRestartedCallback;
+ }
+
+ /**
+ * Unregisters the failure listener.
+ */
+ public void unregister() {
+ TaskStackChangeListeners.getInstance().unregisterTaskStackListener(this);
+ mTaskRestartedCallback = null;
+ }
+
+ @Override
+ public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
+ boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
+ if (wasVisible) {
+ Log.d(TAG, "Detected activity restart during launch for task=" + task.taskId);
+ mTaskRestartedCallback.run();
+ unregister();
+ }
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index f8893bd9dd..303a5283d8 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -411,7 +411,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
// transitions, the animation leashes are reparented to an animation container so we
// can bump layers as needed.
builder.setLayer(mDrawsBelowRecents
- ? Integer.MIN_VALUE + 1
+ ? Integer.MIN_VALUE + app.prefixOrderIndex
: ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);
}
}
diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java
index aa9a45bd8b..0f20e430fc 100644
--- a/quickstep/src/com/android/quickstep/util/TransformParams.java
+++ b/quickstep/src/com/android/quickstep/util/TransformParams.java
@@ -17,11 +17,9 @@ package com.android.quickstep.util;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import android.util.FloatProperty;
import android.view.RemoteAnimationTarget;
-import android.view.SurfaceControl;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.Interpolators;
@@ -61,7 +59,6 @@ public class TransformParams {
private float mCornerRadius;
private RemoteAnimationTargets mTargetSet;
private SurfaceTransactionApplier mSyncTransactionApplier;
- private SurfaceControl mRecentsSurface;
private BuilderProxy mHomeBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
private BuilderProxy mBaseBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
@@ -141,8 +138,9 @@ public class TransformParams {
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
RemoteAnimationTargets targets = mTargetSet;
SurfaceTransaction transaction = new SurfaceTransaction();
- mRecentsSurface = getRecentsSurface(targets);
-
+ if (targets == null) {
+ return transaction;
+ }
for (int i = 0; i < targets.unfilteredApps.length; i++) {
RemoteAnimationTarget app = targets.unfilteredApps[i];
SurfaceProperties builder = transaction.forSurface(app.leash);
@@ -176,20 +174,6 @@ public class TransformParams {
return transaction;
}
- private static SurfaceControl getRecentsSurface(RemoteAnimationTargets targets) {
- for (int i = 0; i < targets.unfilteredApps.length; i++) {
- RemoteAnimationTarget app = targets.unfilteredApps[i];
- if (app.mode == targets.targetMode) {
- if (app.windowConfiguration.getActivityType() == ACTIVITY_TYPE_RECENTS) {
- return app.leash;
- }
- } else {
- return app.leash;
- }
- }
- return null;
- }
-
// Pubic getters so outside packages can read the values.
public float getProgress() {
@@ -204,10 +188,6 @@ public class TransformParams {
return mCornerRadius;
}
- public SurfaceControl getRecentsSurface() {
- return mRecentsSurface;
- }
-
public RemoteAnimationTargets getTargetSet() {
return mTargetSet;
}
diff --git a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterHotseatAnimator.java b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterHotseatAnimator.java
index 70a12d6435..c8141b4642 100644
--- a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterHotseatAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterHotseatAnimator.java
@@ -48,6 +48,8 @@ public class UnfoldMoveFromCenterHotseatAnimator extends BaseUnfoldMoveFromCente
View child = hotseatIcons.getChildAt(i);
registerViewForAnimation(child);
}
+
+ super.onPrepareViewsForAnimation();
}
@Override
diff --git a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java
index 7da103ee58..c05b38f5f2 100644
--- a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java
@@ -58,6 +58,8 @@ public class UnfoldMoveFromCenterWorkspaceAnimator extends BaseUnfoldMoveFromCen
setClipChildren(workspace, false);
setClipToPadding(workspace, true);
+
+ super.onPrepareViewsForAnimation();
}
@Override
diff --git a/quickstep/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProvider.kt b/quickstep/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProvider.kt
new file mode 100644
index 0000000000..a9cd0484fd
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProvider.kt
@@ -0,0 +1,161 @@
+/*
+ * 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.quickstep.util.unfold
+
+import android.os.Handler
+import android.os.Trace
+import android.util.Log
+import com.android.systemui.unfold.UnfoldTransitionProgressProvider
+import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener
+
+/**
+ * Transition progress provider wrapper that can preemptively start the transition on demand
+ * without relying on the source provider. When the source provider has started the animation
+ * it switches to it.
+ *
+ * This might be useful when we want to synchronously start the unfold animation and render
+ * the first frame during turning on the screen. For example, this is used in Launcher where
+ * we need to render the first frame of the animation immediately after receiving a configuration
+ * change event so Window Manager will wait for this frame to be rendered before unblocking
+ * the screen. We can't rely on the original transition progress as it starts the animation
+ * after the screen fully turned on (and unblocked), at this moment it is already too late to
+ * start the animation.
+ *
+ * Using this provider we could render the first frame preemptively by sending 'transition started'
+ * and '0' transition progress before the original progress provider sends these events.
+ */
+class PreemptiveUnfoldTransitionProgressProvider(
+ private val source: UnfoldTransitionProgressProvider,
+ private val handler: Handler
+) : UnfoldTransitionProgressProvider, TransitionProgressListener {
+
+ private val timeoutRunnable = Runnable {
+ if (isRunning) {
+ listeners.forEach { it.onTransitionFinished() }
+ onPreemptiveStartFinished()
+ Log.wtf(TAG, "Timeout occurred when waiting for the source transition to start")
+ }
+ }
+
+ private val listeners = arrayListOf()
+ private var isPreemptivelyRunning = false
+ private var isSourceRunning = false
+
+ private val isRunning: Boolean
+ get() = isPreemptivelyRunning || isSourceRunning
+
+ private val sourceListener =
+ object : TransitionProgressListener {
+ override fun onTransitionStarted() {
+ handler.removeCallbacks(timeoutRunnable)
+
+ if (!isRunning) {
+ listeners.forEach { it.onTransitionStarted() }
+ }
+
+ onPreemptiveStartFinished()
+ isSourceRunning = true
+ }
+
+ override fun onTransitionProgress(progress: Float) {
+ if (isRunning) {
+ listeners.forEach { it.onTransitionProgress(progress) }
+ isSourceRunning = true
+ }
+ }
+
+ override fun onTransitionFinishing() {
+ if (isRunning) {
+ listeners.forEach { it.onTransitionFinishing() }
+ isSourceRunning = true
+ }
+ }
+
+ override fun onTransitionFinished() {
+ if (isRunning) {
+ listeners.forEach { it.onTransitionFinished() }
+ }
+
+ isSourceRunning = false
+ onPreemptiveStartFinished()
+ handler.removeCallbacks(timeoutRunnable)
+ }
+ }
+
+ fun init() {
+ source.addCallback(sourceListener)
+ }
+
+ /**
+ * Starts the animation preemptively.
+ *
+ * - If the source provider is already running, this method won't change any behavior
+ * - If the source provider has not started running yet, it will call onTransitionStarted
+ * for all listeners and optionally onTransitionProgress(initialProgress) if supplied.
+ * When the source provider starts the animation it will switch to send progress and finished
+ * events from it.
+ * If the source provider won't start the animation within a timeout, the animation will be
+ * cancelled and onTransitionFinished will be delivered to the current listeners.
+ */
+ @JvmOverloads
+ fun preemptivelyStartTransition(initialProgress: Float? = null) {
+ if (!isRunning) {
+ Trace.beginAsyncSection("$TAG#startedPreemptively", 0)
+
+ listeners.forEach { it.onTransitionStarted() }
+ initialProgress?.let { progress ->
+ listeners.forEach { it.onTransitionProgress(progress) }
+ }
+
+ handler.removeCallbacks(timeoutRunnable)
+ handler.postDelayed(timeoutRunnable, PREEMPTIVE_UNFOLD_TIMEOUT_MS)
+ }
+
+ isPreemptivelyRunning = true
+ }
+
+ fun cancelPreemptiveStart() {
+ handler.removeCallbacks(timeoutRunnable)
+ if (isRunning) {
+ listeners.forEach { it.onTransitionFinished() }
+ }
+ onPreemptiveStartFinished()
+ }
+
+ private fun onPreemptiveStartFinished() {
+ if (isPreemptivelyRunning) {
+ Trace.endAsyncSection("$TAG#startedPreemptively", 0)
+ isPreemptivelyRunning = false
+ }
+ }
+
+ override fun destroy() {
+ handler.removeCallbacks(timeoutRunnable)
+ source.removeCallback(sourceListener)
+ source.destroy()
+ }
+
+ override fun addCallback(listener: TransitionProgressListener) {
+ listeners += listener
+ }
+
+ override fun removeCallback(listener: TransitionProgressListener) {
+ listeners -= listener
+ }
+}
+
+const val TAG = "PreemptiveUnfoldTransitionProgressProvider"
+const val PREEMPTIVE_UNFOLD_TIMEOUT_MS = 1700L
diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
index ccc2df61c9..1cfaf14224 100644
--- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
@@ -309,7 +309,7 @@ public class DesktopTaskView extends TaskView {
@Override
public RunnableList launchTasks() {
- SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
+ SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps(mActivity.getDisplayId());
Launcher.getLauncher(mActivity).getStateManager().goToState(NORMAL, false /* animated */);
return null;
}
@@ -321,7 +321,7 @@ public class DesktopTaskView extends TaskView {
}
@Override
- public void launchTask(@NonNull Consumer callback, boolean freezeTaskList) {
+ public void launchTask(@NonNull Consumer callback, boolean isQuickswitch) {
launchTasks();
callback.accept(true);
}
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 7cd6756362..7bbe36a0ed 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -92,6 +92,8 @@ public final class DigitalWellBeingToast {
private Task mTask;
private boolean mHasLimit;
+
+ private long mAppUsageLimitTimeMs;
private long mAppRemainingTimeMs;
@Nullable
private View mBanner;
@@ -113,10 +115,12 @@ public final class DigitalWellBeingToast {
mHasLimit = false;
mTaskView.setContentDescription(mTask.titleDescription);
replaceBanner(null);
- mAppRemainingTimeMs = 0;
+ mAppUsageLimitTimeMs = -1;
+ mAppRemainingTimeMs = -1;
}
private void setLimit(long appUsageLimitTimeMs, long appRemainingTimeMs) {
+ mAppUsageLimitTimeMs = appUsageLimitTimeMs;
mAppRemainingTimeMs = appRemainingTimeMs;
mHasLimit = true;
TextView toast = mActivity.getViewCache().getView(R.layout.digital_wellbeing_toast,
@@ -138,11 +142,12 @@ public final class DigitalWellBeingToast {
}
public void initialize(Task task) {
+ mAppUsageLimitTimeMs = mAppRemainingTimeMs = -1;
mTask = task;
THREAD_POOL_EXECUTOR.execute(() -> {
final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit(
- task.getTopComponent().getPackageName(),
- UserHandle.of(task.key.userId));
+ mTask.getTopComponent().getPackageName(),
+ UserHandle.of(mTask.key.userId));
final long appUsageLimitTimeMs =
usageLimit != null ? usageLimit.getTotalUsageLimit() : -1;
diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
index 5bfd0350b5..c91b18347c 100644
--- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
@@ -223,13 +223,11 @@ public class GroupedTaskView extends TaskView {
// Callbacks run from remote animation when recents animation not currently running
InteractionJankMonitorWrapper.begin(this,
InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER, "Enter form GroupedTaskView");
- recentsView.getSplitSelectController().launchTasks(this /*groupedTaskView*/,
- success -> {
- endCallback.executeAllAndDestroy();
- InteractionJankMonitorWrapper.end(
- InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);
- },
- false /* freezeTaskList */);
+ launchTask(success -> {
+ endCallback.executeAllAndDestroy();
+ InteractionJankMonitorWrapper.end(
+ InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);
+ }, false /* freezeTaskList */);
// Callbacks get run from recentsView for case when recents animation already running
recentsView.addSideTaskLaunchCallback(endCallback);
@@ -237,10 +235,10 @@ public class GroupedTaskView extends TaskView {
}
@Override
- public void launchTask(@NonNull Consumer callback, boolean freezeTaskList) {
- getRecentsView().getSplitSelectController().launchTasks(mTask.key.id, mSecondaryTask.key.id,
- SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, callback, freezeTaskList,
- getSplitRatio());
+ public void launchTask(@NonNull Consumer callback, boolean isQuickswitch) {
+ getRecentsView().getSplitSelectController().launchExistingSplitPair(this, mTask.key.id,
+ mSecondaryTask.key.id, SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT,
+ callback, isQuickswitch, getSplitRatio());
}
@Override
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index c165accc52..4dbf4e3655 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -17,7 +17,9 @@ package com.android.quickstep.views;
import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
+import static com.android.launcher3.LauncherState.EDIT_MODE;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
@@ -38,6 +40,7 @@ import com.android.launcher3.LauncherState;
import com.android.launcher3.logging.StatsLogManager;
import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.statehandlers.DesktopVisibilityController;
+import com.android.launcher3.statemanager.StateManager;
import com.android.launcher3.statemanager.StateManager.StateListener;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.PendingSplitSelectInfo;
@@ -78,9 +81,11 @@ public class LauncherRecentsView extends RecentsView CONTENT_ALPHA =
new FloatProperty("contentAlpha") {
@Override
@@ -805,8 +803,29 @@ public abstract class RecentsView {
+ Animator animatorFade = mActivity.getStateManager().createStateElementAnimation(
+ RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM, 1f, 0f);
+ Animator animatorAppear = mActivity.getStateManager().createStateElementAnimation(
+ RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM, 0f, 1f);
+ animatorFade.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(@NonNull Animator animation) {
+ RecentsView.this.invalidateTaskList();
+ updateClearAllFunction();
+ reloadIfNeeded();
+ if (mPendingAnimation != null) {
+ mPendingAnimation.addEndListener(success -> {
+ animatorAppear.start();
+ });
+ } else {
+ animatorAppear.start();
+ }
+ }
+ });
+ animatorFade.start();
+ });
}
// make sure filter is turned off by default
mFilterState.setFilterBy(null);
@@ -825,8 +844,6 @@ public abstract class RecentsView= 0; --i) {
+ showTransaction.getTransaction().show(apps[i].leash);
+ }
+ surfaceApplier.scheduleApply(showTransaction);
+ }
+ });
anim.play(appAnimator);
anim.addListener(new AnimatorListenerAdapter() {
@Override
@@ -1293,6 +1321,29 @@ public abstract class RecentsView 0) {
newFocusedTaskView = getTaskViewAt(0);
@@ -1689,10 +1740,10 @@ public abstract class RecentsView 0) {
TaskView taskView = requireTaskViewAt(0);
@@ -2183,8 +2234,8 @@ public abstract class RecentsView tasksToUpdate = Arrays.stream(containers).filter(Objects::nonNull)
+ .map(TaskIdAttributeContainer::getTask)
+ .collect(Collectors.toCollection(ArrayList::new));
if (mTmpRunningTasks != null) {
for (Task t : mTmpRunningTasks) {
- if (task == t) {
- // Skip loading if this is the task that we are animating into
- skipLoadingTask = true;
- break;
- }
+ // Skip loading if this is the task that we are animating into
+ // TODO(b/280812109) change this equality check to use A.equals(B)
+ tasksToUpdate.removeIf(task -> task == t);
}
}
- if (skipLoadingTask) {
+ if (tasksToUpdate.isEmpty()) {
continue;
}
- if (!mHasVisibleTaskData.get(task.key.id)) {
- // Ignore thumbnail update if it's current running task during the gesture
- // We snapshot at end of gesture, it will update then
- int changes = dataChanges;
- if (taskView == getRunningTaskView() && mGestureActive) {
- changes &= ~TaskView.FLAG_UPDATE_THUMBNAIL;
+ for (Task task : tasksToUpdate) {
+ if (!mHasVisibleTaskData.get(task.key.id)) {
+ // Ignore thumbnail update if it's current running task during the gesture
+ // We snapshot at end of gesture, it will update then
+ int changes = dataChanges;
+ if (taskView == getRunningTaskView() && mGestureActive) {
+ changes &= ~TaskView.FLAG_UPDATE_THUMBNAIL;
+ }
+ taskView.onTaskListVisibilityChanged(true /* visible */, changes);
}
- taskView.onTaskListVisibilityChanged(true /* visible */, changes);
+ mHasVisibleTaskData.put(task.key.id, visible);
}
- mHasVisibleTaskData.put(task.key.id, visible);
} else {
- if (mHasVisibleTaskData.get(task.key.id)) {
- taskView.onTaskListVisibilityChanged(false /* visible */, dataChanges);
+ for (TaskIdAttributeContainer container : containers) {
+ if (container == null) {
+ continue;
+ }
+
+ if (mHasVisibleTaskData.get(container.getTask().key.id)) {
+ taskView.onTaskListVisibilityChanged(false /* visible */, dataChanges);
+ }
+ mHasVisibleTaskData.delete(container.getTask().key.id);
}
- mHasVisibleTaskData.delete(task.key.id);
}
}
}
@@ -2258,7 +2318,11 @@ public abstract class RecentsView
- mSplitSelectStateController.launchSplitTasks(launchSuccess ->
+ mSplitSelectStateController.launchInitialAppFullscreen(launchSuccess ->
resetFromSplitSelectionState()));
pendingAnimation.buildAnim().start();
@@ -3679,19 +3742,33 @@ public abstract class RecentsView {
ActivityManagerWrapper.getInstance().removeTask(primaryTaskId);
if (secondaryTaskId != -1) {
ActivityManagerWrapper.getInstance().removeTask(secondaryTaskId);
}
- },
- REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+ });
}
protected void onDismissAnimationEnds() {
@@ -3923,9 +3999,8 @@ public abstract class RecentsView {
- UI_HELPER_EXECUTOR.getHandler().postDelayed(
- ActivityManagerWrapper.getInstance()::removeAllRecentTasks,
- REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+ UI_HELPER_EXECUTOR.getHandler().post(
+ ActivityManagerWrapper.getInstance()::removeAllRecentTasks);
removeTasksViewsAndClearAllButton();
startHome();
});
@@ -4038,6 +4113,7 @@ public abstract class RecentsView= 0; i--) {
TaskView child = requireTaskViewAt(i);
@@ -4678,6 +4754,7 @@ public abstract class RecentsView : ArrowPopup {
shouldScaleArrow = true
mIsArrowRotated = true
// This synchronizes the arrow and menu to open at the same time
- OPEN_CHILD_FADE_START_DELAY = OPEN_FADE_START_DELAY
- OPEN_CHILD_FADE_DURATION = OPEN_FADE_DURATION
- CLOSE_FADE_START_DELAY = CLOSE_CHILD_FADE_START_DELAY
- CLOSE_FADE_DURATION = CLOSE_CHILD_FADE_DURATION
+ mOpenChildFadeStartDelay = mOpenFadeStartDelay
+ mOpenChildFadeDuration = mOpenFadeDuration
+ mCloseFadeStartDelay = mCloseChildFadeStartDelay
+ mCloseFadeDuration = mCloseChildFadeDuration
}
private var alignedOptionIndex: Int = 0
@@ -213,7 +213,7 @@ class TaskMenuViewWithArrow : ArrowPopup {
scrim?.let {
anim.play(
ObjectAnimator.ofFloat(it, View.ALPHA, 0f, scrimAlpha)
- .setDuration(OPEN_DURATION.toLong())
+ .setDuration(mOpenDuration.toLong())
)
}
}
@@ -222,7 +222,7 @@ class TaskMenuViewWithArrow : ArrowPopup {
scrim?.let {
anim.play(
ObjectAnimator.ofFloat(it, View.ALPHA, scrimAlpha, 0f)
- .setDuration(CLOSE_DURATION.toLong())
+ .setDuration(mCloseDuration.toLong())
)
}
}
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 42589ced5d..83a5c72127 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -45,6 +45,7 @@ import android.app.ActivityOptions;
import android.app.ActivityTaskManager;
import android.content.Context;
import android.content.Intent;
+import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.PointF;
import android.graphics.Rect;
@@ -92,6 +93,7 @@ import com.android.launcher3.util.ViewPool.Reusable;
import com.android.quickstep.RecentsModel;
import com.android.quickstep.RemoteAnimationTargets;
import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle;
+import com.android.quickstep.TaskAnimationManager;
import com.android.quickstep.TaskIconCache;
import com.android.quickstep.TaskOverlayFactory;
import com.android.quickstep.TaskThumbnailCache;
@@ -102,6 +104,7 @@ import com.android.quickstep.util.CancellableTask;
import com.android.quickstep.util.RecentsOrientedState;
import com.android.quickstep.util.SplitSelectStateController;
import com.android.quickstep.util.TaskCornerRadius;
+import com.android.quickstep.util.TaskRemovedDuringLaunchListener;
import com.android.quickstep.util.TransformParams;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -436,25 +439,21 @@ public class TaskView extends FrameLayout implements Reusable {
setWillNotDraw(!keyboardFocusHighlightEnabled);
+ TypedArray ta = context.obtainStyledAttributes(
+ attrs, R.styleable.TaskView, defStyleAttr, defStyleRes);
+
mBorderAnimator = !keyboardFocusHighlightEnabled
? null
: new BorderAnimator(
- /* borderBoundsBuilder= */ this::updateBorderBounds,
- /* borderWidthPx= */ context.getResources().getDimensionPixelSize(
- R.dimen.keyboard_quick_switch_border_width),
/* borderRadiusPx= */ (int) mCurrentFullscreenParams.mCornerRadius,
- /* borderColor= */ attrs == null
- ? DEFAULT_BORDER_COLOR
- : context.getTheme()
- .obtainStyledAttributes(
- attrs,
- R.styleable.TaskView,
- defStyleAttr,
- defStyleRes)
- .getColor(
- R.styleable.TaskView_borderColor,
- DEFAULT_BORDER_COLOR),
- /* invalidateViewCallback= */ TaskView.this::invalidate);
+ /* borderColor= */ ta.getColor(
+ R.styleable.TaskView_borderColor, DEFAULT_BORDER_COLOR),
+ /* borderAnimationParams= */ new BorderAnimator.SimpleParams(
+ /* borderWidthPx= */ context.getResources().getDimensionPixelSize(
+ R.dimen.keyboard_quick_switch_border_width),
+ /* boundsBuilder= */ this::updateBorderBounds,
+ /* targetView= */ this));
+ ta.recycle();
}
protected void updateBorderBounds(Rect bounds) {
@@ -581,6 +580,7 @@ public class TaskView extends FrameLayout implements Reusable {
mIconView, STAGE_POSITION_UNDEFINED);
mSnapshotView.bind(task);
setOrientationState(orientedState);
+ mDigitalWellBeingToast.initialize(mTask);
}
/**
@@ -650,7 +650,7 @@ public class TaskView extends FrameLayout implements Reusable {
* index 0 will contain the taskId, index 1 will be -1 indicating a null taskID value
*/
public int[] getTaskIds() {
- return mTaskIdContainer;
+ return Arrays.copyOf(mTaskIdContainer, mTaskIdContainer.length);
}
public boolean containsMultipleTasks() {
@@ -800,6 +800,14 @@ public class TaskView extends FrameLayout implements Reusable {
recentsView.addSideTaskLaunchCallback(callbackList);
return callbackList;
}
+ if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+ // If the recents transition is running (ie. in live tile mode), then the start
+ // of a new task will merge into the existing transition and it currently will
+ // not be run independently, so we need to rely on the onTaskAppeared() call
+ // for the new task to trigger the side launch callback to flush this runnable
+ // list (which is usually flushed when the app launch animation finishes)
+ recentsView.addSideTaskLaunchCallback(opts.onEndCallback);
+ }
return opts.onEndCallback;
} else {
notifyTaskLaunchFailed(TAG);
@@ -814,23 +822,54 @@ public class TaskView extends FrameLayout implements Reusable {
* Starts the task associated with this view without any animation
*/
public void launchTask(@NonNull Consumer callback) {
- launchTask(callback, false /* freezeTaskList */);
+ launchTask(callback, false /* isQuickswitch */);
}
/**
* Starts the task associated with this view without any animation
*/
- public void launchTask(@NonNull Consumer callback, boolean freezeTaskList) {
+ public void launchTask(@NonNull Consumer callback, boolean isQuickswitch) {
if (mTask != null) {
TestLogging.recordEvent(
TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
+ final TaskRemovedDuringLaunchListener
+ failureListener = new TaskRemovedDuringLaunchListener();
+ if (isQuickswitch) {
+ // We only listen for failures to launch in quickswitch because the during this
+ // gesture launcher is in the background state, vs other launches which are in
+ // the actual overview state
+ failureListener.register(mActivity, mTask.key.id, () -> {
+ notifyTaskLaunchFailed(TAG);
+ RecentsView rv = getRecentsView();
+ if (rv != null) {
+ // Disable animations for now, as it is an edge case and the app usually
+ // covers launcher and also any state transition animation also gets
+ // clobbered by QuickstepTransitionManager.createWallpaperOpenAnimations
+ // when launcher shows again
+ rv.startHome(false /* animated */);
+ if (rv.mSizeStrategy.getTaskbarController() != null) {
+ // LauncherTaskbarUIController depends on the launcher state when
+ // checking whether to handle resume, but that can come in before
+ // startHome() changes the state, so force-refresh here to ensure the
+ // taskbar is updated
+ rv.mSizeStrategy.getTaskbarController().refreshResumedState();
+ }
+ }
+ });
+ }
// Indicate success once the system has indicated that the transition has started
- ActivityOptions opts = makeCustomAnimation(getContext(), 0, 0,
- () -> callback.accept(true), MAIN_EXECUTOR.getHandler());
+ ActivityOptions opts = ActivityOptions.makeCustomTaskAnimation(getContext(), 0, 0,
+ MAIN_EXECUTOR.getHandler(),
+ elapsedRealTime -> {
+ callback.accept(true);
+ },
+ elapsedRealTime -> {
+ failureListener.onTransitionFinished();
+ });
opts.setLaunchDisplayId(
getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId());
- if (freezeTaskList) {
+ if (isQuickswitch) {
opts.setFreezeRecentTasksReordering();
}
opts.setDisableStartingWindow(mSnapshotView.shouldShowSplashView());
@@ -986,7 +1025,7 @@ public class TaskView extends FrameLayout implements Reusable {
mIconLoadRequest = iconCache.updateIconInBackground(mTask,
(task) -> {
setIcon(mIconView, task.icon);
- mDigitalWellBeingToast.initialize(mTask);
+ mDigitalWellBeingToast.initialize(task);
});
}
} else {
diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt b/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt
index 172cb469be..2c16c15caf 100644
--- a/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt
+++ b/quickstep/tests/src/com/android/launcher3/taskbar/TaskbarBaseTestCase.kt
@@ -16,8 +16,10 @@
package com.android.launcher3.taskbar
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController
+import com.android.launcher3.taskbar.bubbles.BubbleControllers
import com.android.launcher3.taskbar.overlay.TaskbarOverlayController
import com.android.systemui.shared.rotation.RotationButtonController
+import java.util.Optional
import org.junit.Before
import org.mockito.Mock
import org.mockito.MockitoAnnotations
@@ -40,7 +42,6 @@ abstract class TaskbarBaseTestCase {
@Mock lateinit var taskbarKeyguardController: TaskbarKeyguardController
@Mock lateinit var stashedHandleViewController: StashedHandleViewController
@Mock lateinit var taskbarStashController: TaskbarStashController
- @Mock lateinit var taskbarEduController: TaskbarEduController
@Mock lateinit var taskbarAutohideSuspendController: TaskbarAutohideSuspendController
@Mock lateinit var taskbarPopupController: TaskbarPopupController
@Mock
@@ -54,6 +55,8 @@ abstract class TaskbarBaseTestCase {
@Mock lateinit var taskbarOverlayController: TaskbarOverlayController
@Mock lateinit var taskbarEduTooltipController: TaskbarEduTooltipController
@Mock lateinit var keyboardQuickSwitchController: KeyboardQuickSwitchController
+ @Mock lateinit var taskbarPinningController: TaskbarDividerPopupController
+ @Mock lateinit var optionalBubbleControllers: Optional
lateinit var taskbarControllers: TaskbarControllers
@@ -81,7 +84,6 @@ abstract class TaskbarBaseTestCase {
taskbarKeyguardController,
stashedHandleViewController,
taskbarStashController,
- taskbarEduController,
taskbarAutohideSuspendController,
taskbarPopupController,
taskbarForceVisibleImmersiveController,
@@ -93,7 +95,9 @@ abstract class TaskbarBaseTestCase {
taskbarSpringOnStashController,
taskbarRecentAppsController,
taskbarEduTooltipController,
- keyboardQuickSwitchController
+ keyboardQuickSwitchController,
+ taskbarPinningController,
+ optionalBubbleControllers,
)
}
}
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index 2c5825fd0b..59f9d5f61d 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -34,7 +34,7 @@ import org.junit.rules.TestRule;
*/
public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
public static final boolean ENABLE_SHELL_TRANSITIONS =
- SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
+ SystemProperties.getBoolean("persist.wm.debug.shell_transit", true);
@Override
protected TestRule getRulesInsideActivityMonitor() {
return RuleChain.
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java
new file mode 100644
index 0000000000..9c6c93d74a
--- /dev/null
+++ b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java
@@ -0,0 +1,100 @@
+/*
+ * 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.quickstep;
+
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+
+import static junit.framework.TestCase.assertEquals;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.launcher3.tapl.LauncherInstrumentation;
+import com.android.launcher3.tapl.Taskbar;
+import com.android.launcher3.ui.AbstractLauncherUiTest;
+import com.android.launcher3.ui.TaplTestsLauncher3;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.LauncherLayoutBuilder;
+import com.android.launcher3.util.TestUtil;
+
+import org.junit.After;
+import org.junit.Assume;
+
+import java.util.List;
+
+public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest {
+
+ protected static final String TEST_APP_NAME = "LauncherTestApp";
+ protected static final String TEST_APP_PACKAGE =
+ getInstrumentation().getContext().getPackageName();
+ protected static final String CALCULATOR_APP_PACKAGE =
+ resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
+
+ protected AutoCloseable mLauncherLayout;
+ protected boolean mTaskbarWasInTransientMode;
+
+
+ @Override
+ public void setUp() throws Exception {
+ Assume.assumeTrue(mLauncher.isTablet());
+ super.setUp();
+
+ LauncherLayoutBuilder layoutBuilder = new LauncherLayoutBuilder().atHotseat(0).putApp(
+ "com.google.android.apps.nexuslauncher.tests",
+ "com.android.launcher3.testcomponent.BaseTestingActivity");
+ mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder);
+ TaplTestsLauncher3.initialize(this);
+ startAppFast(CALCULATOR_APP_PACKAGE);
+ mLauncher.enableBlockTimeout(true);
+ mLauncher.showTaskbarIfHidden();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mLauncher.enableBlockTimeout(false);
+ if (mLauncherLayout != null) {
+ mLauncherLayout.close();
+ }
+ }
+
+ protected static boolean isTaskbarInTransientMode(Context context) {
+ return DisplayController.isTransientTaskbar(context);
+ }
+
+ protected Taskbar getTaskbar() {
+ Taskbar taskbar = mLauncher.getLaunchedAppState().getTaskbar();
+ List taskbarIconNames = taskbar.getIconNames();
+ List hotseatIconNames = mLauncher.getHotseatIconNames();
+
+ assertEquals("Taskbar and hotseat icon counts do not match",
+ taskbarIconNames.size(), hotseatIconNames.size());
+
+ for (int i = 0; i < taskbarIconNames.size(); i++) {
+ assertEquals("Taskbar and Hotseat icons do not match",
+ taskbarIconNames, hotseatIconNames);
+ }
+
+ return taskbar;
+ }
+
+ protected static void setTaskbarMode(LauncherInstrumentation launcher,
+ boolean expectTransientTaskbar) {
+ launcher.enableTransientTaskbar(expectTransientTaskbar);
+ launcher.recreateTaskbar();
+ launcher.checkForAnomaly(true, true);
+ AbstractLauncherUiTest.checkDetectedLeaks(launcher);
+ }
+}
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 62d46d3d8e..97e34c5f10 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -62,6 +62,7 @@ import com.android.launcher3.util.rule.FailureWatcher;
import com.android.launcher3.util.rule.SamplerRule;
import com.android.launcher3.util.rule.ScreenRecordRule;
import com.android.launcher3.util.rule.TestStabilityRule;
+import com.android.launcher3.util.rule.ViewCaptureRule;
import com.android.quickstep.views.RecentsView;
import org.junit.After;
@@ -115,10 +116,12 @@ public class FallbackRecentsTest {
Utilities.enableRunningInTestHarnessForTests();
}
+ final ViewCaptureRule viewCaptureRule = new ViewCaptureRule();
mOrderSensitiveRules = RuleChain
.outerRule(new SamplerRule())
.around(new NavigationModeSwitchRule(mLauncher))
- .around(new FailureWatcher(mDevice, mLauncher));
+ .around(viewCaptureRule)
+ .around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture()));
mOtherLauncherActivity = context.getPackageManager().queryIntentActivities(
getHomeIntentInPackage(context),
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java
new file mode 100644
index 0000000000..1b5313bad0
--- /dev/null
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java
@@ -0,0 +1,46 @@
+/*
+ * 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.quickstep;
+
+import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
+
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar {
+
+ @Test
+ @TaskbarModeSwitch(mode = PERSISTENT)
+ public void testHideShowTaskbar() {
+ getTaskbar().hide();
+ mLauncher.getLaunchedAppState().showTaskbar();
+ }
+
+ @Test
+ @TaskbarModeSwitch(mode = PERSISTENT)
+ public void testHideTaskbarPersistsOnRecreate() {
+ getTaskbar().hide();
+ mLauncher.recreateTaskbar();
+ mLauncher.getLaunchedAppState().assertTaskbarHidden();
+ }
+}
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index bc5fa19ce1..32eadcea61 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -17,29 +17,36 @@
package com.android.quickstep;
import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
+import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import android.content.Intent;
+import android.platform.test.annotations.PlatinumTest;
import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.Until;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.tapl.LaunchedAppState;
import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
import com.android.launcher3.tapl.Overview;
import com.android.launcher3.tapl.OverviewActions;
import com.android.launcher3.tapl.OverviewTask;
import com.android.launcher3.ui.TaplTestsLauncher3;
+import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
+import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
import com.android.quickstep.views.RecentsView;
import org.junit.After;
@@ -55,6 +62,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
private static final String APP_NAME = "LauncherTestApp";
private static final String CALCULATOR_APP_PACKAGE =
resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
+ private static final String READ_DEVICE_CONFIG_PERMISSION =
+ "android.permission.READ_DEVICE_CONFIG";
@Before
public void setUp() throws Exception {
@@ -91,6 +100,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testWorkspaceSwitchToAllApps() {
assertNotNull("switchToAllApps() returned null",
mLauncher.getWorkspace().switchToAllApps());
@@ -100,6 +110,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testOverview() throws Exception {
startTestAppsWithCheck();
// mLauncher.pressHome() also tests an important case of pressing home while in background.
@@ -167,6 +178,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@NavigationModeSwitch
@PortraitLandscape
@ScreenRecord // b/195673272
+ @PlatinumTest(focusArea = "launcher")
public void testOverviewActions() throws Exception {
// Experimenting for b/165029151:
final Overview overview = mLauncher.goHome().switchToOverview();
@@ -180,35 +192,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
actionsView.clickAndDismissScreenshot();
}
- @Test
- @PortraitLandscape
- public void testSplitFromOverview() {
- assumeTrue(!mLauncher.isTablet());
-
- startTestActivity(2);
- startTestActivity(3);
-
- mLauncher.goHome().switchToOverview().getCurrentTask()
- .tapMenu()
- .tapSplitMenuItem()
- .getCurrentTask()
- .open();
- }
-
- @Test
- @PortraitLandscape
- public void testSplitFromOverviewForTablet() {
- assumeTrue(mLauncher.isTablet());
-
- startTestActivity(2);
- startTestActivity(3);
-
- mLauncher.goHome().switchToOverview().getOverviewActions()
- .clickSplit()
- .getTestActivityTask(2)
- .open();
- }
-
private int getCurrentOverviewPage(Launcher launcher) {
return launcher.getOverviewPanel().getCurrentPage();
}
@@ -230,6 +213,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@NavigationModeSwitch
@PortraitLandscape
@ScreenRecord // b/238461765
+ @PlatinumTest(focusArea = "launcher")
public void testSwitchToOverview() throws Exception {
startTestAppsWithCheck();
assertNotNull("Workspace.switchToOverview() returned null",
@@ -242,6 +226,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testBackground() throws Exception {
startAppFast(CALCULATOR_APP_PACKAGE);
final LaunchedAppState launchedAppState = getAndAssertLaunchedApp();
@@ -296,6 +281,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testQuickSwitchFromApp() throws Exception {
startTestActivity(2);
startTestActivity(3);
@@ -325,6 +311,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@ScreenRecord // b/242163205
+ @PlatinumTest(focusArea = "launcher")
+ @TaskbarModeSwitch(mode = PERSISTENT)
public void testQuickSwitchToPreviousAppForTablet() throws Exception {
assumeTrue(mLauncher.isTablet());
startTestActivity(2);
@@ -356,6 +344,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testQuickSwitchFromHome() throws Exception {
startTestActivity(2);
mLauncher.goHome().quickSwitchToPreviousApp();
@@ -367,7 +356,11 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@PortraitLandscape
@NavigationModeSwitch
+ @PlatinumTest(focusArea = "launcher")
public void testPressBack() throws Exception {
+ InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+ READ_DEVICE_CONFIG_PERMISSION);
+ assumeFalse(FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get());
mLauncher.getWorkspace().switchToAllApps();
mLauncher.pressBack();
mLauncher.getWorkspace();
@@ -379,9 +372,10 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);
}
- @Ignore
@Test
@PortraitLandscape
+ @TaskbarModeSwitch(mode = PERSISTENT)
+ @PlatinumTest(focusArea = "launcher")
public void testOverviewForTablet() throws Exception {
assumeTrue(mLauncher.isTablet());
@@ -444,4 +438,72 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
launcher -> assertEquals("Still have tasks after dismissing all",
0, getTaskCount(launcher)));
}
+
+ @Test
+ @PortraitLandscape
+ public void testOverviewDeadzones() throws Exception {
+ startTestAppsWithCheck();
+
+ Overview overview = mLauncher.goHome().switchToOverview();
+ assertTrue("Launcher internal state should be Overview",
+ isInState(() -> LauncherState.OVERVIEW));
+ executeOnLauncher(
+ launcher -> assertTrue("Should have at least 3 tasks",
+ getTaskCount(launcher) >= 3));
+
+ // It should not dismiss overview when tapping between tasks
+ overview.touchBetweenTasks();
+ overview = mLauncher.getOverview();
+ assertTrue("Launcher internal state should be Overview",
+ isInState(() -> LauncherState.OVERVIEW));
+
+ // Dismiss when tapping to the right of the focused task
+ overview.touchOutsideFirstTask();
+ assertTrue("Launcher internal state should be Home",
+ isInState(() -> LauncherState.NORMAL));
+ }
+
+ @Test
+ @PortraitLandscape
+ public void testTaskbarDeadzonesForTablet() throws Exception {
+ assumeTrue(mLauncher.isTablet());
+
+ startTestAppsWithCheck();
+
+ Overview overview = mLauncher.goHome().switchToOverview();
+ assertTrue("Launcher internal state should be Overview",
+ isInState(() -> LauncherState.OVERVIEW));
+ executeOnLauncher(
+ launcher -> assertTrue("Should have at least 3 tasks",
+ getTaskCount(launcher) >= 3));
+
+ // On persistent taskbar, it should not dismiss when tapping the taskbar
+ overview.touchTaskbarBottomCorner(/* tapRight= */ false);
+ assertTrue("Launcher internal state should be Overview",
+ isInState(() -> LauncherState.OVERVIEW));
+
+ // On persistent taskbar, it should not dismiss when tapping the taskbar
+ overview.touchTaskbarBottomCorner(/* tapRight= */ true);
+ assertTrue("Launcher internal state should be Overview",
+ isInState(() -> LauncherState.OVERVIEW));
+ }
+
+ @Test
+ @ScreenRecord // b/242163205
+ public void testDisableRotationCheckForPhone() throws Exception {
+ assumeFalse(mLauncher.isTablet());
+ try {
+ mLauncher.setExpectedRotationCheckEnabled(false);
+ mLauncher.setEnableRotation(false);
+ mLauncher.getDevice().setOrientationLeft();
+ startTestActivity(7);
+ Wait.atMost("Device should not be in natural orientation",
+ () -> !mDevice.isNaturalOrientation(), DEFAULT_UI_TIMEOUT, mLauncher);
+ mLauncher.goHome();
+ } finally {
+ mLauncher.setExpectedRotationCheckEnabled(true);
+ mLauncher.setEnableRotation(true);
+ mLauncher.getDevice().setOrientationNatural();
+ }
+ }
}
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java
index d3fbe93632..e8cadabe72 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java
@@ -15,14 +15,17 @@
*/
package com.android.quickstep;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
import android.content.Intent;
+import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.ui.TaplTestsLauncher3;
-import com.android.launcher3.util.rule.TestStabilityRule;
import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
import org.junit.After;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -37,13 +40,6 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest {
super.setUp();
TaplTestsLauncher3.initialize(this);
- mLauncher.getWorkspace()
- .deleteAppIcon(mLauncher.getWorkspace().getHotseatAppIcon(0))
- .switchToAllApps()
- .getAppIcon(CALCULATOR_APP_NAME)
- .dragToHotseat(0);
-
- startAppFast(CALCULATOR_APP_PACKAGE);
if (mLauncher.isTablet()) {
mLauncher.enableBlockTimeout(true);
mLauncher.showTaskbarIfHidden();
@@ -58,14 +54,25 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest {
}
@Test
- // TODO (b/270201357): When this test is proven stable, remove this TestStabilityRule and
- // introduce into presubmit as well.
- @TestStabilityRule.Stability(
- flavors = TestStabilityRule.LOCAL | TestStabilityRule.PLATFORM_POSTSUBMIT)
+ @PortraitLandscape
+ public void testSplitFromOverview() {
+ createAndLaunchASplitPair();
+ }
+
+ @Test
@PortraitLandscape
@TaskbarModeSwitch
public void testSplitAppFromHomeWithItself() throws Exception {
- Assume.assumeTrue(mLauncher.isTablet());
+ // Currently only tablets have Taskbar in Overview, so test is only active on tablets
+ assumeTrue(mLauncher.isTablet());
+
+ mLauncher.getWorkspace()
+ .deleteAppIcon(mLauncher.getWorkspace().getHotseatAppIcon(0))
+ .switchToAllApps()
+ .getAppIcon(CALCULATOR_APP_NAME)
+ .dragToHotseat(0);
+
+ startAppFast(CALCULATOR_APP_PACKAGE);
mLauncher.goHome()
.switchToAllApps()
@@ -79,4 +86,50 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest {
.getAppIcon(CALCULATOR_APP_NAME)
.launchIntoSplitScreen();
}
+
+ @Test
+ public void testSaveAppPairMenuItemExistsOnSplitPair() throws Exception {
+ assumeTrue(FeatureFlags.ENABLE_APP_PAIRS.get());
+
+ createAndLaunchASplitPair();
+
+ assertTrue("Save app pair menu item is missing",
+ mLauncher.goHome()
+ .switchToOverview()
+ .getCurrentTask()
+ .tapMenu()
+ .hasMenuItem("Save app pair"));
+ }
+
+ @Test
+ public void testSaveAppPairMenuItemDoesNotExistOnSingleTask() throws Exception {
+ assumeTrue(FeatureFlags.ENABLE_APP_PAIRS.get());
+
+ startAppFast(CALCULATOR_APP_PACKAGE);
+
+ assertFalse("Save app pair menu item is erroneously appearing on single task",
+ mLauncher.goHome()
+ .switchToOverview()
+ .getCurrentTask()
+ .tapMenu()
+ .hasMenuItem("Save app pair"));
+ }
+
+ private void createAndLaunchASplitPair() {
+ startTestActivity(2);
+ startTestActivity(3);
+
+ if (mLauncher.isTablet()) {
+ mLauncher.goHome().switchToOverview().getOverviewActions()
+ .clickSplit()
+ .getTestActivityTask(2)
+ .open();
+ } else {
+ mLauncher.goHome().switchToOverview().getCurrentTask()
+ .tapMenu()
+ .tapSplitMenuItem()
+ .getCurrentTask()
+ .open();
+ }
+ }
}
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
index 735c5e6fd4..40be4806ec 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
@@ -15,258 +15,142 @@
*/
package com.android.quickstep;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
-import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
-import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT;
-
-import static junit.framework.TestCase.assertEquals;
-
-import android.content.Intent;
+import static com.android.quickstep.TaplTestsTaskbar.TaskbarMode.PERSISTENT;
+import static com.android.quickstep.TaplTestsTaskbar.TaskbarMode.TRANSIENT;
import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-import com.android.launcher3.tapl.Taskbar;
-import com.android.launcher3.ui.TaplTestsLauncher3;
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
-import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
-import org.junit.After;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Collection;
@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class TaplTestsTaskbar extends AbstractQuickStepTest {
+@RunWith(Parameterized.class)
+public class TaplTestsTaskbar extends AbstractTaplTestsTaskbar {
- private static final String TEST_APP_NAME = "LauncherTestApp";
- private static final String TEST_APP_PACKAGE =
- getInstrumentation().getContext().getPackageName();
- private static final String CALCULATOR_APP_PACKAGE =
- resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
+ private final TaplTestsTaskbar.TaskbarMode mTaskbarMode;
+
+ public enum TaskbarMode {
+ TRANSIENT, PERSISTENT
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection data() {
+ return Arrays.asList(new Object[][]{
+ {PERSISTENT}, {TRANSIENT}
+ });
+ }
+
+ public TaplTestsTaskbar(TaskbarMode mode) {
+ mTaskbarMode = mode;
+ }
@Override
public void setUp() throws Exception {
- Assume.assumeTrue(mLauncher.isTablet());
+ mTaskbarWasInTransientMode = isTaskbarInTransientMode(mTargetContext);
+ setTaskbarMode(mLauncher, isTaskbarTestModeTransient());
super.setUp();
- mLauncher.useTestWorkspaceLayoutOnReload();
- TaplTestsLauncher3.initialize(this);
-
- startAppFast(CALCULATOR_APP_PACKAGE);
- mLauncher.enableBlockTimeout(true);
- mLauncher.showTaskbarIfHidden();
}
- @After
- public void tearDown() {
- mLauncher.useDefaultWorkspaceLayoutOnReload();
- mLauncher.enableBlockTimeout(false);
+ @Override
+ public void tearDown() throws Exception {
+ setTaskbarMode(mLauncher, mTaskbarWasInTransientMode);
+ super.tearDown();
}
@Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testHideShowTaskbar() {
- getTaskbar().hide();
- mLauncher.getLaunchedAppState().showTaskbar();
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testHideTaskbarPersistsOnRecreate() {
- getTaskbar().hide();
- mLauncher.recreateTaskbar();
- mLauncher.getLaunchedAppState().assertTaskbarHidden();
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchApp() throws Exception {
+ public void testLaunchApp() {
getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchApp() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
- mLauncher.getLaunchedAppState().assertTaskbarHidden();
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testOpenMenu() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME).openMenu();
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientOpenMenu() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME).openMenu();
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchShortcut() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchShortcut() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchAppInSplitscreen() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen(
- TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchAppInSplitscreen() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen(
- TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- mLauncher.getLaunchedAppState().assertTaskbarHidden();
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchShortcutInSplitscreen() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchShortcutInSplitscreen() throws Exception {
- getTaskbar().getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchApp_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchApp_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testOpenMenu_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).openMenu();
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientOpenMenu_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).openMenu();
- }
-
- @Test
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchShortcut_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchShortcut_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .launch(TEST_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchAppInSplitscreen_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchAppInSplitscreen_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = PERSISTENT)
- public void testLaunchShortcutInSplitscreen_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- @Test
- @ScreenRecord // b/231615831
- @PortraitLandscape
- @TaskbarModeSwitch(mode = TRANSIENT)
- public void testTransientLaunchShortcutInSplitscreen_FromTaskbarAllApps() throws Exception {
- getTaskbar().openAllApps()
- .getAppIcon(TEST_APP_NAME)
- .openDeepShortcutMenu()
- .getMenuItem("Shortcut 1")
- .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
- }
-
- private Taskbar getTaskbar() {
- Taskbar taskbar = mLauncher.getLaunchedAppState().getTaskbar();
- List taskbarIconNames = taskbar.getIconNames();
- List hotseatIconNames = mLauncher.getHotseatIconNames();
-
- assertEquals("Taskbar and hotseat icon counts do not match",
- taskbarIconNames.size(), hotseatIconNames.size());
-
- for (int i = 0; i < taskbarIconNames.size(); i++) {
- assertEquals("Taskbar and Hotseat icons do not match",
- taskbarIconNames, hotseatIconNames);
+ // We are using parameterized test runner to share code between different test cases with
+ // taskbar variants. But, sometimes we only need to assert things for particular Taskbar
+ // variants.
+ if (isTaskbarTestModeTransient()) {
+ mLauncher.getLaunchedAppState().assertTaskbarHidden();
}
+ }
- return taskbar;
+ @Test
+ public void testOpenMenu() {
+ getTaskbar().getAppIcon(TEST_APP_NAME).openMenu();
+ }
+
+ @Test
+ public void testLaunchShortcut() {
+ getTaskbar().getAppIcon(TEST_APP_NAME)
+ .openDeepShortcutMenu()
+ .getMenuItem("Shortcut 1")
+ .launch(TEST_APP_PACKAGE);
+ }
+
+ @Test
+ @ScreenRecord // b/231615831
+ @PortraitLandscape
+ public void testLaunchAppInSplitscreen() {
+ getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen(
+ TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
+ // We are using parameterized test runner to share code between different test cases with
+ // taskbar variants. But, sometimes we only need to assert things for particular Taskbar
+ // variants.
+ if (isTaskbarTestModeTransient()) {
+ mLauncher.getLaunchedAppState().assertTaskbarHidden();
+ }
+ }
+
+ @Test
+ @ScreenRecord // b/231615831
+ @PortraitLandscape
+ public void testLaunchShortcutInSplitscreen() {
+ getTaskbar().getAppIcon(TEST_APP_NAME)
+ .openDeepShortcutMenu()
+ .getMenuItem("Shortcut 1")
+ .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
+ }
+
+ @Test
+ public void testLaunchApp_fromTaskbarAllApps() {
+ getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
+ }
+
+ @Test
+ public void testOpenMenu_fromTaskbarAllApps() {
+ getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).openMenu();
+ }
+
+ @Test
+ public void testLaunchShortcut_fromTaskbarAllApps() {
+ getTaskbar().openAllApps()
+ .getAppIcon(TEST_APP_NAME)
+ .openDeepShortcutMenu()
+ .getMenuItem("Shortcut 1")
+ .launch(TEST_APP_PACKAGE);
+ }
+
+ @Test
+ @ScreenRecord // b/231615831
+ @PortraitLandscape
+ public void testLaunchAppInSplitscreen_fromTaskbarAllApps() {
+ getTaskbar().openAllApps()
+ .getAppIcon(TEST_APP_NAME)
+ .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
+ }
+
+ @Test
+ @ScreenRecord // b/231615831
+ @PortraitLandscape
+ public void testLaunchShortcutInSplitscreen_fromTaskbarAllApps() {
+ getTaskbar().openAllApps()
+ .getAppIcon(TEST_APP_NAME)
+ .openDeepShortcutMenu()
+ .getMenuItem("Shortcut 1")
+ .dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
+ }
+
+ private boolean isTaskbarTestModeTransient() {
+ return TRANSIENT == mTaskbarMode;
}
}
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java
new file mode 100644
index 0000000000..b58fe29a96
--- /dev/null
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java
@@ -0,0 +1,67 @@
+/*
+ * 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.quickstep;
+
+import static com.android.launcher3.config.FeatureFlags.ENABLE_CURSOR_HOVER_STATES;
+import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT;
+
+
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.launcher3.util.TestUtil;
+import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TaplTestsTransientTaskbar extends AbstractTaplTestsTaskbar {
+
+ @Test
+ @TaskbarModeSwitch(mode = TRANSIENT)
+ public void testShowTaskbarUnstashHintOnHover() {
+ try (AutoCloseable flag = TestUtil.overrideFlag(ENABLE_CURSOR_HOVER_STATES, true)) {
+ getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
+ mLauncher.getLaunchedAppState().hoverToShowTaskbarUnstashHint();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ @TaskbarModeSwitch(mode = TRANSIENT)
+ public void testUnstashTaskbarOnScreenBottomEdgeHover() {
+ try (AutoCloseable flag = TestUtil.overrideFlag(ENABLE_CURSOR_HOVER_STATES, true)) {
+ getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
+ mLauncher.getLaunchedAppState().hoverScreenBottomEdgeToUnstashTaskbar();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ @TaskbarModeSwitch(mode = TRANSIENT)
+ public void testHoverBelowHintedTaskbarToUnstash() {
+ try (AutoCloseable flag = TestUtil.overrideFlag(ENABLE_CURSOR_HOVER_STATES, true)) {
+ getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
+ mLauncher.getLaunchedAppState().hoverBelowHintedTaskbarToUnstash();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt b/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
index 512df8e3d0..0b3c0e8945 100644
--- a/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
+++ b/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
@@ -18,6 +18,7 @@
package com.android.quickstep.util
import android.app.ActivityManager
+import android.app.PendingIntent
import android.content.ComponentName
import android.content.Context
import android.content.Intent
@@ -36,8 +37,6 @@ import com.android.launcher3.util.withArgCaptor
import com.android.quickstep.RecentsModel
import com.android.quickstep.SystemUiProxy
import com.android.systemui.shared.recents.model.Task
-import java.util.ArrayList
-import java.util.function.Consumer
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull
@@ -47,7 +46,9 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations
+import java.util.function.Consumer
@RunWith(AndroidJUnit4::class)
class SplitSelectStateControllerTest {
@@ -59,6 +60,7 @@ class SplitSelectStateControllerTest {
@Mock lateinit var handler: Handler
@Mock lateinit var context: Context
@Mock lateinit var recentsModel: RecentsModel
+ @Mock lateinit var pendingIntent: PendingIntent
lateinit var splitSelectStateController: SplitSelectStateController
@@ -142,12 +144,12 @@ class SplitSelectStateControllerTest {
Consumer {
assertEquals(
"ComponentName package mismatched",
- it.key.baseIntent.component.packageName,
+ it.key.baseIntent.component?.packageName,
matchingPackage
)
assertEquals(
"ComponentName class mismatched",
- it.key.baseIntent.component.className,
+ it.key.baseIntent.component?.className,
matchingClass
)
assertEquals(it, groupTask1.task1)
@@ -234,12 +236,12 @@ class SplitSelectStateControllerTest {
Consumer {
assertEquals(
"ComponentName package mismatched",
- it.key.baseIntent.component.packageName,
+ it.key.baseIntent.component?.packageName,
matchingPackage
)
assertEquals(
"ComponentName class mismatched",
- it.key.baseIntent.component.className,
+ it.key.baseIntent.component?.className,
matchingClass
)
assertEquals("userId mismatched", it.key.userId, nonPrimaryUserHandle.identifier)
@@ -286,12 +288,12 @@ class SplitSelectStateControllerTest {
Consumer {
assertEquals(
"ComponentName package mismatched",
- it.key.baseIntent.component.packageName,
+ it.key.baseIntent.component?.packageName,
matchingPackage
)
assertEquals(
"ComponentName class mismatched",
- it.key.baseIntent.component.className,
+ it.key.baseIntent.component?.className,
matchingClass
)
assertEquals(it, groupTask2.task2)
@@ -348,6 +350,15 @@ class SplitSelectStateControllerTest {
assertFalse(splitSelectStateController.isSplitSelectActive)
}
+ @Test
+ fun secondPendingIntentSet() {
+ val itemInfo = ItemInfo()
+ `when`(pendingIntent.creatorUserHandle).thenReturn(primaryUserHandle)
+ splitSelectStateController.setInitialTaskSelect(null, 0, itemInfo, null, 1)
+ splitSelectStateController.setSecondTask(pendingIntent)
+ assertTrue(splitSelectStateController.isBothSplitAppsConfirmed)
+ }
+
// Generate GroupTask with default userId.
private fun generateGroupTask(
task1ComponentName: ComponentName,
diff --git a/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt b/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt
new file mode 100644
index 0000000000..f73be7269d
--- /dev/null
+++ b/quickstep/tests/src/com/android/quickstep/util/unfold/PreemptiveUnfoldTransitionProgressProviderTest.kt
@@ -0,0 +1,261 @@
+/*
+ * 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.quickstep.util.unfold
+
+import android.os.Handler
+import android.testing.AndroidTestingRunner
+import android.testing.TestableLooper
+import android.testing.TestableLooper.RunWithLooper
+import android.util.Log
+import androidx.test.filters.SmallTest
+import com.android.launcher3.util.any
+import com.android.launcher3.util.mock
+import com.android.systemui.unfold.UnfoldTransitionProgressProvider
+import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.anyBoolean
+import org.mockito.Mockito.anyFloat
+import org.mockito.Mockito.inOrder
+import org.mockito.Mockito.never
+import org.mockito.Mockito.verify
+
+@SmallTest
+@RunWith(AndroidTestingRunner::class)
+@RunWithLooper
+class PreemptiveUnfoldTransitionProgressProviderTest {
+
+ private lateinit var testableLooper: TestableLooper
+ private lateinit var source: TransitionProgressListener
+ private lateinit var handler: Handler
+ private lateinit var oldWtfHandler: Log.TerribleFailureHandler
+ private val listener: TransitionProgressListener = mock()
+ private val testWtfHandler: Log.TerribleFailureHandler = mock()
+
+ private lateinit var provider: PreemptiveUnfoldTransitionProgressProvider
+
+ @Before
+ fun before() {
+ testableLooper = TestableLooper.get(this)
+ handler = Handler(testableLooper.looper)
+
+ val testSource = createSource()
+ source = testSource as TransitionProgressListener
+
+ oldWtfHandler = Log.setWtfHandler(testWtfHandler)
+
+ provider = PreemptiveUnfoldTransitionProgressProvider(testSource, handler)
+ provider.init()
+ provider.addCallback(listener)
+ }
+
+ @After
+ fun after() {
+ Log.setWtfHandler(oldWtfHandler)
+ }
+
+ @Test
+ fun preemptiveStartInitialProgressNull_transitionStarts() {
+ provider.preemptivelyStartTransition(initialProgress = null)
+
+ verify(listener).onTransitionStarted()
+ verify(listener, never()).onTransitionProgress(anyFloat())
+ }
+
+ @Test
+ fun preemptiveStartWithInitialProgress_startsAnimationAndSendsProgress() {
+ provider.preemptivelyStartTransition(initialProgress = 0.5f)
+
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionProgress(0.5f)
+ }
+
+ @Test
+ fun preemptiveStartAndCancel_finishesAnimation() {
+ provider.preemptivelyStartTransition()
+ provider.cancelPreemptiveStart()
+
+ with(inOrder(listener)) {
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionFinished()
+ }
+ }
+
+ @Test
+ fun preemptiveStartAndThenSourceStartsTransition_transitionStarts() {
+ provider.preemptivelyStartTransition()
+ source.onTransitionStarted()
+
+ verify(listener).onTransitionStarted()
+ }
+
+ @Test
+ fun preemptiveStartAndThenSourceStartsAndFinishesTransition_transitionFinishes() {
+ provider.preemptivelyStartTransition()
+
+ source.onTransitionStarted()
+ source.onTransitionFinished()
+
+ with(inOrder(listener)) {
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionFinished()
+ }
+ }
+
+ @Test
+ fun preemptiveStartAndThenSourceStartsAnimationAndSendsProgress_sendsProgress() {
+ provider.preemptivelyStartTransition()
+
+ source.onTransitionStarted()
+ source.onTransitionProgress(0.4f)
+
+ verify(listener).onTransitionProgress(0.4f)
+ }
+
+ @Test
+ fun preemptiveStartAndThenSourceSendsProgress_sendsProgress() {
+ provider.preemptivelyStartTransition()
+
+ source.onTransitionProgress(0.4f)
+
+ verify(listener).onTransitionProgress(0.4f)
+ }
+
+ @Test
+ fun preemptiveStartAfterTransitionRunning_transitionStarted() {
+ source.onTransitionStarted()
+
+ provider.preemptivelyStartTransition()
+
+ verify(listener).onTransitionStarted()
+ }
+
+ @Test
+ fun preemptiveStartAfterTransitionRunningAndThenFinished_transitionFinishes() {
+ source.onTransitionStarted()
+
+ provider.preemptivelyStartTransition()
+ source.onTransitionFinished()
+
+ with(inOrder(listener)) {
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionFinished()
+ }
+ }
+
+ @Test
+ fun preemptiveStart_transitionDoesNotFinishAfterTimeout_finishesTransition() {
+ provider.preemptivelyStartTransition()
+
+ testableLooper.moveTimeForward(PREEMPTIVE_UNFOLD_TIMEOUT_MS + 1)
+ testableLooper.processAllMessages()
+
+ with(inOrder(listener)) {
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionFinished()
+ }
+ }
+
+ @Test
+ fun preemptiveStart_transitionFinishAfterTimeout_logsWtf() {
+ provider.preemptivelyStartTransition()
+
+ testableLooper.moveTimeForward(PREEMPTIVE_UNFOLD_TIMEOUT_MS + 1)
+ testableLooper.processAllMessages()
+
+ verify(testWtfHandler).onTerribleFailure(any(), any(), anyBoolean())
+ }
+
+ @Test
+ fun preemptiveStart_transitionDoesNotFinishBeforeTimeout_doesNotFinishTransition() {
+ provider.preemptivelyStartTransition()
+
+ testableLooper.moveTimeForward(PREEMPTIVE_UNFOLD_TIMEOUT_MS - 1)
+ testableLooper.processAllMessages()
+
+ verify(listener).onTransitionStarted()
+ }
+
+ @Test
+ fun preemptiveStart_transitionStarted_timeoutHappened_doesNotFinishTransition() {
+ provider.preemptivelyStartTransition()
+
+ source.onTransitionStarted()
+ testableLooper.moveTimeForward(PREEMPTIVE_UNFOLD_TIMEOUT_MS + 1)
+ testableLooper.processAllMessages()
+
+ verify(listener).onTransitionStarted()
+ }
+
+ @Test
+ fun noPreemptiveStart_transitionStarted_startsTransition() {
+ source.onTransitionStarted()
+
+ verify(listener).onTransitionStarted()
+ }
+
+ @Test
+ fun noPreemptiveStart_transitionProgress_sendsProgress() {
+ source.onTransitionStarted()
+
+ source.onTransitionProgress(0.5f)
+
+ verify(listener).onTransitionProgress(0.5f)
+ }
+
+ @Test
+ fun noPreemptiveStart_transitionFinishes_finishesTransition() {
+ source.onTransitionStarted()
+ source.onTransitionProgress(0.5f)
+
+ source.onTransitionFinished()
+
+ with(inOrder(listener)) {
+ verify(listener).onTransitionStarted()
+ verify(listener).onTransitionFinished()
+ }
+ }
+
+ private fun createSource(): UnfoldTransitionProgressProvider =
+ object : TransitionProgressListener, UnfoldTransitionProgressProvider {
+
+ private val listeners = arrayListOf()
+
+ override fun addCallback(listener: TransitionProgressListener) {
+ listeners += listener
+ }
+
+ override fun removeCallback(listener: TransitionProgressListener) {
+ listeners -= listener
+ }
+
+ override fun destroy() {}
+
+ override fun onTransitionStarted() =
+ listeners.forEach(TransitionProgressListener::onTransitionStarted)
+
+ override fun onTransitionFinishing() =
+ listeners.forEach(TransitionProgressListener::onTransitionFinishing)
+
+ override fun onTransitionFinished() =
+ listeners.forEach(TransitionProgressListener::onTransitionFinished)
+
+ override fun onTransitionProgress(progress: Float) =
+ listeners.forEach { it.onTransitionProgress(progress) }
+ }
+}
diff --git a/res/color/app_subtitle_text_dark.xml b/res/color-night-v31/all_apps_button_color.xml
similarity index 84%
rename from res/color/app_subtitle_text_dark.xml
rename to res/color-night-v31/all_apps_button_color.xml
index 220d10fc8f..a1d1b6706e 100644
--- a/res/color/app_subtitle_text_dark.xml
+++ b/res/color-night-v31/all_apps_button_color.xml
@@ -14,6 +14,5 @@
limitations under the License.
-->
- -
-
+
diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml
index c3a82695c2..e279fa051a 100644
--- a/res/drawable/add_item_dialog_background.xml
+++ b/res/drawable/add_item_dialog_background.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index 4e7e82f5f0..dbf893dcb3 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -23,15 +23,15 @@
-
+ android:color="?attr/workspaceAccentColor" />
+
-
-
+
diff --git a/res/drawable/bg_widgets_content.xml b/res/drawable/bg_widgets_content.xml
index b0b699ba22..1528a9787a 100644
--- a/res/drawable/bg_widgets_content.xml
+++ b/res/drawable/bg_widgets_content.xml
@@ -24,7 +24,7 @@
-
-
+
@@ -32,7 +32,7 @@
-
-
+
@@ -42,7 +42,7 @@
-
-
+
@@ -52,7 +52,7 @@
-
-
+
diff --git a/res/drawable/bg_widgets_full_sheet.xml b/res/drawable/bg_widgets_full_sheet.xml
index dfcd354ce7..66a1d40507 100644
--- a/res/drawable/bg_widgets_full_sheet.xml
+++ b/res/drawable/bg_widgets_full_sheet.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/res/drawable/bg_widgets_header_states.xml b/res/drawable/bg_widgets_header_states.xml
index f45a7ababf..d03778d0c6 100644
--- a/res/drawable/bg_widgets_header_states.xml
+++ b/res/drawable/bg_widgets_header_states.xml
@@ -24,7 +24,7 @@
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
+
diff --git a/res/drawable/bg_widgets_header_large_screen.xml b/res/drawable/bg_widgets_header_two_pane.xml
similarity index 96%
rename from res/drawable/bg_widgets_header_large_screen.xml
rename to res/drawable/bg_widgets_header_two_pane.xml
index e1408cc235..ca3feef1f0 100644
--- a/res/drawable/bg_widgets_header_large_screen.xml
+++ b/res/drawable/bg_widgets_header_two_pane.xml
@@ -20,7 +20,7 @@
android:paddingTop="@dimen/widget_list_header_view_vertical_padding"
android:paddingBottom="@dimen/widget_list_header_view_vertical_padding" >