From e72dd4a859f726fcd2c6a25574608b293e7418a2 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Sun, 2 May 2021 23:20:55 -0700 Subject: [PATCH 01/16] Call windowInsetController.hide method when hiding keyboard Bug: 186608200 Test: manual Change-Id: I9a819aec217a91e8b6de58d074dbdb134dacaeb8 --- src/com/android/launcher3/util/UiThreadHelper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java index be14e01f0d..f5e1234a28 100644 --- a/src/com/android/launcher3/util/UiThreadHelper.java +++ b/src/com/android/launcher3/util/UiThreadHelper.java @@ -48,7 +48,13 @@ public class UiThreadHelper { WindowInsets rootInsets = launcher.getRootView().getRootWindowInsets(); boolean isImeShown = rootInsets != null && rootInsets.isVisible( WindowInsets.Type.ime()); - if (!isImeShown) return; + if (isImeShown) { + // this call is already asynchronous + launcher.getAppsView().getWindowInsetsController().hide( + WindowInsets.Type.ime() + ); + } + return; } Message.obtain(HANDLER.get(launcher), MSG_HIDE_KEYBOARD, token).sendToTarget(); From 7e6e1693efb64d57a9ae4e62d398a6d0b6da7d9e Mon Sep 17 00:00:00 2001 From: Santiago Etchebehere Date: Mon, 3 May 2021 20:12:50 -0700 Subject: [PATCH 02/16] Update the label of Wallpapers button Use the updated name Bug: 179129352 Test: manual Change-Id: Ia4878ce924b7d7f3ba1d8d661c8ac00c7310ee20 --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d6936ab69d..eae32b79f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -221,7 +221,7 @@ Wallpapers - Styles & wallpapers + Wallpaper & style Home settings From 7fbc9619333d7f6727a70f7151e42ea035427554 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 3 May 2021 22:26:52 -0700 Subject: [PATCH 03/16] Allow binder calls from creating recents orientated state for now - Should probably remove if possible since this is on a hot path Bug: 187074722 Test: Presubmit Change-Id: I104e1175acba7b90cd9824b905ffe68089beed9e --- .../src/com/android/quickstep/util/TaskViewSimulator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index e63f8bbea8..f578ad1741 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -36,6 +36,7 @@ import androidx.annotation.NonNull; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.util.TraceHelper; import com.android.quickstep.AnimatedFloat; import com.android.quickstep.BaseActivityInterface; import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper; @@ -95,7 +96,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { mContext = context; mSizeStrategy = sizeStrategy; - mOrientationState = new RecentsOrientedState(context, sizeStrategy, i -> { }); + // TODO(b/187074722): Don't create this per-TaskViewSimulator + mOrientationState = TraceHelper.allowIpcs("", + () -> new RecentsOrientedState(context, sizeStrategy, i -> { })); mOrientationState.setGestureActive(true); mCurrentFullscreenParams = new FullscreenDrawParams(context); mOrientationStateId = mOrientationState.getStateId(); From 79d76b5041e0ac328e5c7d94f7ee326b630729f2 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Wed, 28 Apr 2021 23:16:22 +0100 Subject: [PATCH 04/16] Fix LayoutParams cast exception in drag-n-drop Test: Pick up a widget from home screen. Then drop it and immediately pick it up again before the resize frame is dismissed. No crash is observed. Bug: 186663184 Change-Id: Ia40676fbbf5d6dc2e2043aa7acd6ae00f1fa4179 --- .../launcher3/AppWidgetResizeFrame.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 5d41bb5c3e..401b58b2d5 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -71,6 +71,22 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O private final View[] mDragHandles = new View[HANDLE_COUNT]; private final List mSystemGestureExclusionRects = new ArrayList<>(HANDLE_COUNT); + private final OnAttachStateChangeListener mWidgetViewAttachStateChangeListener = + new OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View view) { + // Do nothing + } + + @Override + public void onViewDetachedFromWindow(View view) { + // When the app widget view is detached, we should close the resize frame. + // An example is when the dragging starts, the widget view is detached from + // CellLayout and then reattached to DragLayout. + close(false); + } + }; + private LauncherAppWidgetHostView mWidgetView; private CellLayout mCellLayout; @@ -191,7 +207,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O private void setupForWidget(LauncherAppWidgetHostView widgetView, CellLayout cellLayout, DragLayer dragLayer) { mCellLayout = cellLayout; + if (mWidgetView != null) { + mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); + } mWidgetView = widgetView; + mWidgetView.addOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo) widgetView.getAppWidgetInfo(); mResizeMode = info.resizeMode; @@ -641,6 +661,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O @Override protected void handleClose(boolean animate) { mDragLayer.removeView(this); + if (mWidgetView != null) { + mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); + } } @Override From 96d4ec4544204b8f27dd96bd043cd13927ecb4aa Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 4 May 2021 09:08:09 -0700 Subject: [PATCH 05/16] All apps motion tuning [1/n] - reverse spring direction to enable overshoot - change master interpolators for swipe / fling Test: manual Bug: 183001675 Bug: 186121789 Change-Id: I5869d84daab99594cc2a261cb8f5d28e0293afe1 --- .../launcher3/allapps/AllAppsContainerView.java | 4 ++-- .../allapps/AllAppsTransitionController.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 40f7ab167c..1d31caf745 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -75,7 +75,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag public class AllAppsContainerView extends SpringRelativeLayout implements DragSource, Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener { - private static final float FLING_VELOCITY_MULTIPLIER = 1800f; + private static final float FLING_VELOCITY_MULTIPLIER = 1000f; // Starts the springs after at least 25% of the animation has passed. private static final float FLING_ANIMATION_THRESHOLD = 0.25f; @@ -611,7 +611,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo public void onAnimationUpdate(ValueAnimator valueAnimator) { if (shouldSpring && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) { - absorbSwipeUpVelocity(-Math.abs( + absorbSwipeUpVelocity(Math.abs( Math.round(velocity * FLING_VELOCITY_MULTIPLIER))); shouldSpring = false; } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index c61c0d6d53..c4c7891d58 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -15,13 +15,15 @@ */ package com.android.launcher3.allapps; +import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT; -import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.launcher3.anim.Interpolators.ACCEL_0_75; +import static com.android.launcher3.anim.Interpolators.ACCEL_2; +import static com.android.launcher3.anim.Interpolators.DEACCEL; +import static com.android.launcher3.anim.Interpolators.DEACCEL_2; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS; import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS; @@ -154,9 +156,9 @@ public class AllAppsTransitionController return; } - Interpolator interpolator = config.userControlled ? LINEAR : toState == OVERVIEW - ? config.getInterpolator(ANIM_OVERVIEW_SCALE, FAST_OUT_SLOW_IN) - : FAST_OUT_SLOW_IN; + Interpolator interpolator = toState.equals(ALL_APPS) + ? (config.userControlled ? ACCEL_2 : ACCEL_0_75) : + (config.userControlled ? DEACCEL_2 : DEACCEL); Animator anim = createSpringAnimation(mProgress, targetProgress); anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator)); From 474c616e981c60bcfc05114b4823b9176178240d Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Mon, 3 May 2021 18:26:44 -0700 Subject: [PATCH 06/16] Adds AllSetActivity in Launcher. Mostly copied from its location in Tips. Some exceptions: - Accent color (used for the icon at the top and link text) is derived from intent extras to match the rest of SUW. If needed, we could also pass other colors this way; currently they just use default light/dark mode colors. - Currently there is no animation in the middle. Not sure if one is expected, but we can add it later if so. Bug: 184722307 Test: Manually passing arbitrary colors via adb: adb shell am start -a com.android.quickstep.action.GESTURE_ONBOARDING_ALL_SET --ei accent_color_dark_mode -2134901760 --ei accent_color_light_mode 2147418112 Change-Id: I1fb8b20b88b7485d28f06afd2b421999ad847266 --- quickstep/AndroidManifest.xml | 32 +++- quickstep/res/drawable/ic_all_set.xml | 24 +++ quickstep/res/layout/activity_allset.xml | 80 ++++++++++ quickstep/res/values/attrs.xml | 22 +++ quickstep/res/values/dimens.xml | 7 + quickstep/res/values/strings.xml | 9 ++ quickstep/res/values/styles.xml | 7 +- .../quickstep/interaction/AllSetActivity.java | 133 ++++++++++++++++ .../quickstep/interaction/AnnotationSpan.java | 143 ++++++++++++++++++ 9 files changed, 452 insertions(+), 5 deletions(-) create mode 100644 quickstep/res/drawable/ic_all_set.xml create mode 100644 quickstep/res/layout/activity_allset.xml create mode 100644 quickstep/res/values/attrs.xml create mode 100644 quickstep/src/com/android/quickstep/interaction/AllSetActivity.java create mode 100644 quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index 842abc399f..7ab09c5ce9 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -103,16 +103,40 @@ android:clearTaskOnLaunch="true" android:exported="false"/> + + android:autoRemoveFromRecents="true" + android:excludeFromRecents="true" + android:screenOrientation="portrait" + android:permission="android.permission.REBOOT" + android:exported="true"> + + + + + + + + + + + + diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml new file mode 100644 index 0000000000..a6a17e5ebc --- /dev/null +++ b/quickstep/res/layout/activity_allset.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + diff --git a/quickstep/res/values/attrs.xml b/quickstep/res/values/attrs.xml new file mode 100644 index 0000000000..336fb572d5 --- /dev/null +++ b/quickstep/res/values/attrs.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 9c0a083084..4f9b3ebe59 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -99,6 +99,13 @@ 24dp 18dp + + 40dp + 28dp + 80dp + 52dp + 24dp + 8dp 64dp diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index a0f1638c8a..7ada496c40 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -177,6 +177,15 @@ Tutorial %1$d/%2$d + + All set! + + Swipe up to go home + + You\u2019re ready to start using your phone + + Navigation settings for accessibility + Share diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 7c7d20a20a..0a8ecb8bde 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -59,7 +59,7 @@ parent="TextAppearance.GestureTutorial"> start ?android:attr/textColorPrimary - google-sans + google-sans-text 0.03 18sp 24sp @@ -99,6 +99,11 @@ @color/gesture_tutorial_primary_color + + - + + diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index 01616d45ec..b3374f33b9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -22,12 +22,12 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y; import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET; import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; -import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_TRANSLATION; +import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION; +import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; import android.util.FloatProperty; @@ -97,10 +97,10 @@ public abstract class BaseRecentsViewStateController PagedOrientationHandler orientationHandler = ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler(); FloatProperty taskViewsFloat = orientationHandler.getSplitSelectTaskOffset( - TASK_PRIMARY_TRANSLATION, TASK_SECONDARY_TRANSLATION, mLauncher.getDeviceProfile()); + TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, + mLauncher.getDeviceProfile()); setter.setFloat(mRecentsView, taskViewsFloat, - toState.getOverviewSecondaryTranslation(mLauncher), - config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR)); + toState.getOverviewSecondaryTranslation(mLauncher), LINEAR); setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0, config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT)); diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index 01d51f82cb..3d33e57a36 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -25,6 +25,7 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO import android.animation.AnimatorSet; import android.app.ActivityOptions; import android.content.res.Resources; +import android.graphics.Rect; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -64,6 +65,7 @@ public class SplitSelectStateController { private final SystemUiProxy mSystemUiProxy; private TaskView mInitialTaskView; private SplitPositionOption mInitialPosition; + private Rect mInitialBounds; private final Handler mHandler; public SplitSelectStateController(Handler handler, SystemUiProxy systemUiProxy) { @@ -74,9 +76,11 @@ public class SplitSelectStateController { /** * To be called after first task selected */ - public void setInitialTaskSelect(TaskView taskView, SplitPositionOption positionOption) { + public void setInitialTaskSelect(TaskView taskView, SplitPositionOption positionOption, + Rect initialBounds) { mInitialTaskView = taskView; mInitialPosition = positionOption; + mInitialBounds = initialBounds; } /** @@ -220,9 +224,14 @@ public class SplitSelectStateController { public void resetState() { mInitialTaskView = null; mInitialPosition = null; + mInitialBounds = null; } public boolean isSplitSelectActive() { return mInitialTaskView != null; } + + public Rect getInitialBounds() { + return mInitialBounds; + } } diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index f5a8ff8170..2c5f66170b 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -245,8 +245,8 @@ public class LauncherRecentsView extends RecentsView TASK_PRIMARY_TRANSLATION = - new FloatProperty("taskPrimaryTranslation") { + public static final FloatProperty TASK_PRIMARY_SPLIT_TRANSLATION = + new FloatProperty("taskPrimarySplitTranslation") { @Override public void setValue(RecentsView recentsView, float v) { - recentsView.setTaskViewsPrimaryTranslation(v); + recentsView.setTaskViewsPrimarySplitTranslation(v); } @Override public Float get(RecentsView recentsView) { - return recentsView.mTaskViewsPrimaryTranslation; + return recentsView.mTaskViewsPrimarySplitTranslation; + } + }; + + public static final FloatProperty TASK_SECONDARY_SPLIT_TRANSLATION = + new FloatProperty("taskSecondarySplitTranslation") { + @Override + public void setValue(RecentsView recentsView, float v) { + recentsView.setTaskViewsSecondarySplitTranslation(v); + } + + @Override + public Float get(RecentsView recentsView) { + return recentsView.mTaskViewsSecondarySplitTranslation; } }; @@ -279,7 +292,6 @@ public abstract class RecentsView secondaryViewTranslate = - taskView.getSecondaryDissmissTranslationProperty(); - int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView); - int verticalFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor(); + SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController(); ResourceProvider rp = DynamicResource.provider(mActivity); SpringProperty sp = new SpringProperty(SpringProperty.FLAG_CAN_SPRING_ON_START) .setDampingRatio(rp.getFloat(R.dimen.dismiss_task_trans_y_damping_ratio)) .setStiffness(rp.getFloat(R.dimen.dismiss_task_trans_y_stiffness)); + FloatProperty dismissingTaskViewTranslate = + taskView.getSecondaryDissmissTranslationProperty();; + // TODO(b/186800707) translate entire grid size distance + int translateDistance = mOrientationHandler.getSecondaryDimension(taskView); + int positiveNegativeFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor(); + if (splitController.isSplitSelectActive()) { + // Have the task translate towards whatever side was just pinned + int dir = mOrientationHandler.getSplitTaskViewDismissDirection(splitController + .getActiveSplitPositionOption(), mActivity.getDeviceProfile()); + switch (dir) { + case PagedOrientationHandler.SPLIT_TRANSLATE_SECONDARY_NEGATIVE: + dismissingTaskViewTranslate = taskView + .getSecondaryDissmissTranslationProperty(); + positiveNegativeFactor = -1; + break; - anim.add(ObjectAnimator.ofFloat(taskView, secondaryViewTranslate, - verticalFactor * secondaryTaskDimension).setDuration(duration), LINEAR, sp); + case PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_POSITIVE: + dismissingTaskViewTranslate = taskView.getPrimaryDismissTranslationProperty(); + positiveNegativeFactor = 1; + break; + + case PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_NEGATIVE: + dismissingTaskViewTranslate = taskView.getPrimaryDismissTranslationProperty(); + positiveNegativeFactor = -1; + break; + default: + throw new IllegalStateException("Invalid split task translation: " + dir); + } + } + anim.add(ObjectAnimator.ofFloat(taskView, dismissingTaskViewTranslate, + positiveNegativeFactor * translateDistance).setDuration(duration), LINEAR, sp); if (LIVE_TILE.get() && taskView.isRunningTask()) { anim.addOnFrameCallback(() -> { @@ -2206,18 +2255,6 @@ public abstract class RecentsView view.getVisibility() != GONE && view != mSplitHiddenTaskView); - // x is correct, y is before tasks move up - int[] locationOnScreen = mSplitHiddenTaskView.getLocationOnScreen(); int[] newScroll = new int[getChildCount()]; getPageScrolls(newScroll, false, SIMPLE_SCROLL_LOGIC); @@ -2842,20 +2888,42 @@ public abstract class RecentsView= 0; i--) { View child = getChildAt(i); if (child == mSplitHiddenTaskView) { + TaskView taskView = (TaskView) child; - int left = newScroll[i] + getPaddingStart(); - int topMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx; - int top = -mSplitHiddenTaskView.getHeight() - locationOnScreen[1]; - mSplitHiddenTaskView.layout(left, top, - left + mSplitHiddenTaskView.getWidth(), - top + mSplitHiddenTaskView.getHeight()); - pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, TRANSLATION_Y, - -top + mSplitPlaceholderView.getHeight() - topMargin)); + int dir = mOrientationHandler.getSplitTaskViewDismissDirection(splitOption, + mActivity.getDeviceProfile()); + FloatProperty dismissingTaskViewTranslate; + Rect hiddenBounds = new Rect(taskView.getLeft(), taskView.getTop(), + taskView.getRight(), taskView.getBottom()); + int distanceDelta = 0; + if (dir == PagedOrientationHandler.SPLIT_TRANSLATE_SECONDARY_NEGATIVE) { + dismissingTaskViewTranslate = taskView + .getSecondaryDissmissTranslationProperty(); + distanceDelta = initialBounds.top - hiddenBounds.top; + taskView.layout(initialBounds.left, hiddenBounds.top, initialBounds.right, + hiddenBounds.bottom); + } else { + dismissingTaskViewTranslate = taskView + .getPrimaryDismissTranslationProperty(); + distanceDelta = initialBounds.left - hiddenBounds.left; + taskView.layout(hiddenBounds.left, initialBounds.top, hiddenBounds.right, + initialBounds.bottom); + if (dir == PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_POSITIVE) { + distanceDelta *= -1; + } + } + pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, + dismissingTaskViewTranslate, + distanceDelta)); pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, ALPHA, 1)); } else { // If insertion is on last index (furthest from clear all), we directly add the view // else we translate all views to the right of insertion index further right, // ignore views to left + if (showAsGrid()) { + // TODO(b/186800707) handle more elegantly for grid + continue; + } int scrollDiff = newScroll[i] - oldScroll[i]; if (scrollDiff != 0) { FloatProperty translationProperty = child instanceof TaskView @@ -2881,6 +2949,12 @@ public abstract class RecentsView SPLIT_SELECT_TRANSLATION_X = + new FloatProperty("splitSelectTranslationX") { + @Override + public void setValue(TaskView taskView, float v) { + taskView.setSplitSelectTranslationX(v); + } + + @Override + public Float get(TaskView taskView) { + return taskView.mSplitSelectTranslationX; + } + }; + + private static final FloatProperty SPLIT_SELECT_TRANSLATION_Y = + new FloatProperty("splitSelectTranslationY") { + @Override + public void setValue(TaskView taskView, float v) { + taskView.setSplitSelectTranslationY(v); + } + + @Override + public Float get(TaskView taskView) { + return taskView.mSplitSelectTranslationY; + } + }; + private static final FloatProperty DISMISS_TRANSLATION_X = new FloatProperty("dismissTranslationX") { @Override @@ -345,6 +371,9 @@ public class TaskView extends FrameLayout implements Reusable { // The following grid translations scales with mGridProgress. private float mGridTranslationX; private float mGridTranslationY; + // Used when in SplitScreenSelectState + private float mSplitSelectTranslationY; + private float mSplitSelectTranslationX; private ObjectAnimator mIconAndDimAnimator; private float mIconScaleAnimStartProgress = 0; @@ -825,8 +854,10 @@ public class TaskView extends FrameLayout implements Reusable { protected void resetViewTransforms() { // fullscreenTranslation and accumulatedTranslation should not be reset, as // resetViewTransforms is called during Quickswitch scrolling. - mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX = 0f; - mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY = 0f; + mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX = + mSplitSelectTranslationX = 0f; + mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY = + mSplitSelectTranslationY = 0f; applyTranslationX(); applyTranslationY(); setTranslationZ(0); @@ -956,6 +987,15 @@ public class TaskView extends FrameLayout implements Reusable { setScaleY(scale); } + private void setSplitSelectTranslationX(float x) { + mSplitSelectTranslationX = x; + applyTranslationX(); + } + + private void setSplitSelectTranslationY(float y) { + mSplitSelectTranslationY = y; + applyTranslationY(); + } private void setDismissTranslationX(float x) { mDismissTranslationX = x; applyTranslationX(); @@ -1056,12 +1096,12 @@ public class TaskView extends FrameLayout implements Reusable { private void applyTranslationX() { setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX - + getPersistentTranslationX()); + + mSplitSelectTranslationX + getPersistentTranslationX()); } private void applyTranslationY() { setTranslationY(mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY - + getPersistentTranslationY()); + + mSplitSelectTranslationY + getPersistentTranslationY()); } /** @@ -1085,6 +1125,16 @@ public class TaskView extends FrameLayout implements Reusable { + getGridTrans(mGridTranslationY); } + public FloatProperty getPrimarySplitTranslationProperty() { + return getPagedOrientationHandler().getPrimaryValue( + SPLIT_SELECT_TRANSLATION_X, SPLIT_SELECT_TRANSLATION_Y); + } + + public FloatProperty getSecondarySplitTranslationProperty() { + return getPagedOrientationHandler().getSecondaryValue( + SPLIT_SELECT_TRANSLATION_X, SPLIT_SELECT_TRANSLATION_Y); + } + public FloatProperty getPrimaryDismissTranslationProperty() { return getPagedOrientationHandler().getPrimaryValue( DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y); diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java index 2fd5efc3f6..44e55e102c 100644 --- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java @@ -159,6 +159,19 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { return VIEW_TRANSLATE_X; } + @Override + public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, + DeviceProfile dp) { + // Don't use device profile here because we know we're in fake landscape, only split option + // available is top/left + if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) { + // Top (visually left) side + return SPLIT_TRANSLATE_PRIMARY_NEGATIVE; + } + throw new IllegalStateException("Invalid split stage position: " + + splitPosition.mStagePosition); + } + @Override public int getPrimaryScroll(View view) { return view.getScrollY(); diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java index 6c2f17ee34..d8e5a485fd 100644 --- a/src/com/android/launcher3/touch/PagedOrientationHandler.java +++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java @@ -42,6 +42,10 @@ import java.util.List; */ public interface PagedOrientationHandler { + int SPLIT_TRANSLATE_PRIMARY_POSITIVE = 0; + int SPLIT_TRANSLATE_PRIMARY_NEGATIVE = 1; + int SPLIT_TRANSLATE_SECONDARY_NEGATIVE = 2; + PagedOrientationHandler PORTRAIT = new PortraitPagedViewHandler(); PagedOrientationHandler LANDSCAPE = new LandscapePagedViewHandler(); PagedOrientationHandler SEASCAPE = new SeascapePagedViewHandler(); @@ -71,6 +75,13 @@ public interface PagedOrientationHandler { int getSecondaryDimension(View view); FloatProperty getPrimaryViewTranslate(); FloatProperty getSecondaryViewTranslate(); + + /** + * @param splitPosition The position where the view to be split will go + * @return {@link #SPLIT_TRANSLATE_*} constants to indicate which direction the + * dismissal should happen + */ + int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, DeviceProfile dp); int getPrimaryScroll(View view); float getPrimaryScale(View view); int getChildStart(View view); diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java index f6a6448602..01897d727d 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -155,6 +155,25 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { return VIEW_TRANSLATE_Y; } + @Override + public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, + DeviceProfile dp) { + if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) { + if (dp.isLandscape) { + // Left side + return SPLIT_TRANSLATE_PRIMARY_NEGATIVE; + } else { + // Top side + return SPLIT_TRANSLATE_SECONDARY_NEGATIVE; + } + } else if (splitPosition.mStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) { + // We don't have a bottom option, so should be right + return SPLIT_TRANSLATE_PRIMARY_POSITIVE; + } + throw new IllegalStateException("Invalid split stage position: " + + splitPosition.mStagePosition); + } + @Override public int getPrimaryScroll(View view) { return view.getScrollX();