From d4a5bb244af9c54a52855c28fa406efc7d249213 Mon Sep 17 00:00:00 2001 From: Nicolo' Mazzucato Date: Wed, 16 Feb 2022 17:30:48 +0100 Subject: [PATCH 1/9] Fix Launcher icons not animated during unfold If icons are re-bound during the animation, they were not moved. I was able to reproduce this case 100% of times by folding, restarting launcher and unfolding. From a perfetto trace it seems that in this case `finishBindingItems` was called after the animation already started, therefore not registering any view. With this cl, items are animated also after they are rebound. Bug: 197834977 Test: folded -> restarted launcher -> unfolded -> verified icons are now moving towards the center Change-Id: I5b001c502860c17d6ea5d54d099f04b2ddf1820a --- .../launcher3/BaseQuickstepLauncher.java | 15 ++++++++++ .../BaseUnfoldMoveFromCenterAnimator.java | 19 ++++++++++++ .../LauncherUnfoldAnimationController.java | 29 ++++++++++++------- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index af4f49d324..a26f3e890d 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -65,6 +65,7 @@ import com.android.launcher3.util.ActivityOptionsWrapper; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.ObjectWrapper; +import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.UiThreadHelper; import com.android.quickstep.OverviewCommandHelper; @@ -496,6 +497,20 @@ public abstract class BaseQuickstepLauncher extends Launcher WellbeingModel.INSTANCE.get(this); } + @Override + public void onInitialBindComplete(IntSet boundPages, RunnableList pendingTasks) { + 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. + if (mLauncherUnfoldAnimationController != null) { + // This is needed in case items are rebound while the unfold animation is in + // progress. + mLauncherUnfoldAnimationController.updateRegisteredViewsIfNeeded(); + } + }); + super.onInitialBindComplete(boundPages, pendingTasks); + } + @Override public Stream getSupportedShortcuts() { Stream base = Stream.of(WellbeingModel.SHORTCUT_FACTORY); diff --git a/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java b/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java index 861ff96b5e..143042fb31 100644 --- a/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java +++ b/quickstep/src/com/android/quickstep/util/BaseUnfoldMoveFromCenterAnimator.java @@ -36,6 +36,8 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg private final Map mOriginalClipToPadding = new HashMap<>(); private final Map mOriginalClipChildren = new HashMap<>(); + private boolean mAnimationInProgress = false; + public BaseUnfoldMoveFromCenterAnimator(WindowManager windowManager) { mMoveFromCenterAnimation = new UnfoldMoveFromCenterAnimator(windowManager, new LauncherViewsMoveFromCenterTranslationApplier()); @@ -44,6 +46,7 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg @CallSuper @Override public void onTransitionStarted() { + mAnimationInProgress = true; mMoveFromCenterAnimation.updateDisplayProperties(); onPrepareViewsForAnimation(); onTransitionProgress(0f); @@ -58,7 +61,23 @@ public abstract class BaseUnfoldMoveFromCenterAnimator implements TransitionProg @CallSuper @Override public void onTransitionFinished() { + mAnimationInProgress = false; mMoveFromCenterAnimation.onTransitionFinished(); + clearRegisteredViews(); + } + + /** + * Re-prepares views for animation. This is useful in case views are re-bound while the + * animation is in progress. + */ + public void updateRegisteredViewsIfNeeded() { + if (mAnimationInProgress) { + clearRegisteredViews(); + onPrepareViewsForAnimation(); + } + } + + private void clearRegisteredViews() { mMoveFromCenterAnimation.clearRegisteredViews(); mOriginalClipChildren.clear(); diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java index 333df10dde..f2d46b7a8e 100644 --- a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java +++ b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java @@ -48,13 +48,14 @@ public class LauncherUnfoldAnimationController { SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION); private final Launcher mLauncher; + private final ScopedUnfoldTransitionProgressProvider mProgressProvider; + private final NaturalRotationUnfoldProgressProvider mNaturalOrientationProgressProvider; + private final UnfoldMoveFromCenterHotseatAnimator mUnfoldMoveFromCenterHotseatAnimator; + private final UnfoldMoveFromCenterWorkspaceAnimator mUnfoldMoveFromCenterWorkspaceAnimator; @Nullable private HorizontalInsettableView mQsbInsettable; - private final ScopedUnfoldTransitionProgressProvider mProgressProvider; - private final NaturalRotationUnfoldProgressProvider mNaturalOrientationProgressProvider; - public LauncherUnfoldAnimationController( Launcher launcher, WindowManager windowManager, @@ -62,21 +63,21 @@ public class LauncherUnfoldAnimationController { mLauncher = launcher; mProgressProvider = new ScopedUnfoldTransitionProgressProvider( unfoldTransitionProgressProvider); + mUnfoldMoveFromCenterHotseatAnimator = new UnfoldMoveFromCenterHotseatAnimator(launcher, + windowManager); + mUnfoldMoveFromCenterWorkspaceAnimator = new UnfoldMoveFromCenterWorkspaceAnimator(launcher, + windowManager); mNaturalOrientationProgressProvider = new NaturalRotationUnfoldProgressProvider(launcher, WindowManagerGlobal.getWindowManagerService(), mProgressProvider); mNaturalOrientationProgressProvider.init(); // Animated in all orientations - mProgressProvider.addCallback(new UnfoldMoveFromCenterWorkspaceAnimator(launcher, - windowManager)); - mProgressProvider - .addCallback(new LauncherScaleAnimationListener()); + mProgressProvider.addCallback(mUnfoldMoveFromCenterWorkspaceAnimator); + mProgressProvider.addCallback(new LauncherScaleAnimationListener()); // Animated only in natural orientation - mNaturalOrientationProgressProvider - .addCallback(new QsbAnimationListener()); - mNaturalOrientationProgressProvider - .addCallback(new UnfoldMoveFromCenterHotseatAnimator(launcher, windowManager)); + mNaturalOrientationProgressProvider.addCallback(new QsbAnimationListener()); + mNaturalOrientationProgressProvider.addCallback(mUnfoldMoveFromCenterHotseatAnimator); } /** @@ -108,6 +109,12 @@ public class LauncherUnfoldAnimationController { mNaturalOrientationProgressProvider.destroy(); } + /** Called when launcher finished binding its items. */ + public void updateRegisteredViewsIfNeeded() { + mUnfoldMoveFromCenterHotseatAnimator.updateRegisteredViewsIfNeeded(); + mUnfoldMoveFromCenterWorkspaceAnimator.updateRegisteredViewsIfNeeded(); + } + private class QsbAnimationListener implements TransitionProgressListener { @Override From 5765d42ada91f94b65a44ae982a2a3e714e65427 Mon Sep 17 00:00:00 2001 From: Nicolo' Mazzucato Date: Mon, 21 Feb 2022 18:11:23 +0100 Subject: [PATCH 2/9] Fix jump in animation for hotseat while re-arranging icons While re-arranging icons the hotseat remains in scale 1.0f, while the workspace reduces it's scale (as defined by SpringLoadedState.java). Previously, the code to aggregate animations was assuming hotseat and workspace always had the same scale. MultiScaleProperty.get() was being used to set the starting value of the animation. Previously, it was returning the last aggregated value. However, this value was correct only for the workspace, but not for the hotseat. Returning the current view scale makes it always correct. Bug: 220271046 Test: Dragged icons from hotseat to workspace, and verified animation didn't jump Change-Id: Ic01776c1d8e3967624626ed7c44d194a06295790 --- .../QuickstepAtomicAnimationFactory.java | 5 +-- .../LauncherUnfoldAnimationController.java | 15 ++++---- .../quickstep/util/WorkspaceRevealAnim.java | 21 +++++++----- .../android/launcher3/LauncherAnimUtils.java | 16 ++++----- .../WorkspaceStateTransitionAnimation.java | 34 +++++++++++++------ .../util/MultiScalePropertyFactory.java | 28 +++++++++++---- .../launcher3/util/MultiScalePropertyTest.kt | 5 +-- 7 files changed, 81 insertions(+), 43 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java index 75cf5cb3a5..bd7e5de866 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java @@ -22,7 +22,7 @@ import static com.android.launcher3.LauncherState.HINT_STATE; import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator; +import static com.android.launcher3.WorkspaceStateTransitionAnimation.getWorkspaceSpringScaleAnimator; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; @@ -172,7 +172,8 @@ public class QuickstepAtomicAnimationFactory extends } else if (fromState == HINT_STATE && toState == NORMAL) { config.setInterpolator(ANIM_DEPTH, DEACCEL_3); if (mHintToNormalDuration == -1) { - ValueAnimator va = getSpringScaleAnimator(mActivity, mActivity.getWorkspace(), + ValueAnimator va = getWorkspaceSpringScaleAnimator(mActivity, + mActivity.getWorkspace(), toState.getWorkspaceScaleAndTranslation(mActivity).scale); mHintToNormalDuration = (int) va.getDuration(); } diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java index 333df10dde..3b5804634a 100644 --- a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java +++ b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java @@ -15,14 +15,14 @@ */ package com.android.quickstep.util; +import static com.android.launcher3.LauncherAnimUtils.HOTSEAT_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherAnimUtils.SCALE_INDEX_UNFOLD_ANIMATION; -import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY_FACTORY; +import static com.android.launcher3.LauncherAnimUtils.WORKSPACE_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.Utilities.comp; import android.annotation.Nullable; import android.util.FloatProperty; import android.util.MathUtils; -import android.view.View; import android.view.WindowManager; import android.view.WindowManagerGlobal; @@ -30,6 +30,7 @@ import androidx.core.view.OneShotPreDrawListener; import com.android.launcher3.Hotseat; import com.android.launcher3.Launcher; +import com.android.launcher3.Workspace; import com.android.launcher3.util.HorizontalInsettableView; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener; @@ -44,8 +45,10 @@ public class LauncherUnfoldAnimationController { // Percentage of the width of the quick search bar that will be reduced // from the both sides of the bar when progress is 0 private static final float MAX_WIDTH_INSET_FRACTION = 0.15f; - private static final FloatProperty UNFOLD_SCALE_PROPERTY = - SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION); + private static final FloatProperty WORKSPACE_SCALE_PROPERTY = + WORKSPACE_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION); + private static final FloatProperty HOTSEAT_SCALE_PROPERTY = + HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_UNFOLD_ANIMATION); private final Launcher mLauncher; @@ -147,8 +150,8 @@ public class LauncherUnfoldAnimationController { } private void setScale(float value) { - UNFOLD_SCALE_PROPERTY.setValue(mLauncher.getWorkspace(), value); - UNFOLD_SCALE_PROPERTY.setValue(mLauncher.getHotseat(), value); + WORKSPACE_SCALE_PROPERTY.setValue(mLauncher.getWorkspace(), value); + HOTSEAT_SCALE_PROPERTY.setValue(mLauncher.getHotseat(), value); } } } diff --git a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java index 8659b687c3..5326d2bb66 100644 --- a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java +++ b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java @@ -15,8 +15,9 @@ */ package com.android.quickstep.util; +import static com.android.launcher3.LauncherAnimUtils.HOTSEAT_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherAnimUtils.SCALE_INDEX_REVEAL_ANIM; -import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY_FACTORY; +import static com.android.launcher3.LauncherAnimUtils.WORKSPACE_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; @@ -32,6 +33,7 @@ import android.util.FloatProperty; import android.view.View; import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.Hotseat; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Workspace; @@ -51,8 +53,11 @@ public class WorkspaceRevealAnim { // Should be used for animations running alongside this WorkspaceRevealAnim. public static final int DURATION_MS = 350; - private static final FloatProperty REVEAL_SCALE_PROPERTY = - SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_REVEAL_ANIM); + private static final FloatProperty WORKSPACE_SCALE_PROPERTY = + WORKSPACE_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_REVEAL_ANIM); + + private static final FloatProperty HOTSEAT_SCALE_PROPERTY = + HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_REVEAL_ANIM); private final float mScaleStart; private final AnimatorSet mAnimators = new AnimatorSet(); @@ -67,8 +72,8 @@ public class WorkspaceRevealAnim { workspace.setPivotToScaleWithSelf(launcher.getHotseat()); // Add reveal animations. - addRevealAnimatorsForView(workspace); - addRevealAnimatorsForView(launcher.getHotseat()); + addRevealAnimatorsForView(workspace, WORKSPACE_SCALE_PROPERTY); + addRevealAnimatorsForView(launcher.getHotseat(), HOTSEAT_SCALE_PROPERTY); // Add overview scrim animation. if (animateOverviewScrim) { @@ -93,8 +98,8 @@ public class WorkspaceRevealAnim { mAnimators.setInterpolator(Interpolators.DECELERATED_EASE); } - private void addRevealAnimatorsForView(View v) { - ObjectAnimator scale = ObjectAnimator.ofFloat(v, REVEAL_SCALE_PROPERTY, mScaleStart, 1f); + private void addRevealAnimatorsForView(T v, FloatProperty scaleProperty) { + ObjectAnimator scale = ObjectAnimator.ofFloat(v, scaleProperty, mScaleStart, 1f); scale.setDuration(DURATION_MS); scale.setInterpolator(Interpolators.DECELERATED_EASE); mAnimators.play(scale); @@ -107,7 +112,7 @@ public class WorkspaceRevealAnim { mAnimators.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - REVEAL_SCALE_PROPERTY.set(v, 1f); + scaleProperty.set(v, 1f); v.setAlpha(1f); } }); diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java index 430039276e..c43172cc56 100644 --- a/src/com/android/launcher3/LauncherAnimUtils.java +++ b/src/com/android/launcher3/LauncherAnimUtils.java @@ -67,18 +67,16 @@ public class LauncherAnimUtils { }; /** - * Property to set the scale of workspace and hotseat. The value is based on a combination + * Property to set the scale of workspace. The value is based on a combination * of all the ones set, to have a smooth experience even in the case of overlapping scaling * animation. */ - public static final MultiScalePropertyFactory SCALE_PROPERTY_FACTORY = - new MultiScalePropertyFactory("scale_property") { - @Override - protected void apply(View view, float scale) { - view.setScaleX(scale); - view.setScaleY(scale); - } - }; + public static final MultiScalePropertyFactory WORKSPACE_SCALE_PROPERTY_FACTORY = + new MultiScalePropertyFactory("workspace_scale_property"); + + /** Property to set the scale of hotseat. */ + public static final MultiScalePropertyFactory HOTSEAT_SCALE_PROPERTY_FACTORY = + new MultiScalePropertyFactory("hotseat_scale_property"); public static final int SCALE_INDEX_UNFOLD_ANIMATION = 1; public static final int SCALE_INDEX_UNLOCK_ANIMATION = 2; diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 98e785f47b..d94e84cbac 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -18,11 +18,12 @@ package com.android.launcher3; import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE; +import static com.android.launcher3.LauncherAnimUtils.HOTSEAT_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherAnimUtils.SCALE_INDEX_WORKSPACE_STATE; -import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; +import static com.android.launcher3.LauncherAnimUtils.WORKSPACE_SCALE_PROPERTY_FACTORY; import static com.android.launcher3.LauncherState.FLAG_HAS_SYS_UI_SCRIM; import static com.android.launcher3.LauncherState.HINT_STATE; import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; @@ -64,8 +65,11 @@ import com.android.systemui.plugins.ResourceProvider; */ public class WorkspaceStateTransitionAnimation { - private static final FloatProperty WORKSPACE_STATE_SCALE_PROPERTY = - SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WORKSPACE_STATE); + private static final FloatProperty WORKSPACE_SCALE_PROPERTY = + WORKSPACE_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WORKSPACE_STATE); + + private static final FloatProperty HOTSEAT_SCALE_PROPERTY = + HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WORKSPACE_STATE); private final Launcher mLauncher; private final Workspace mWorkspace; @@ -120,9 +124,9 @@ public class WorkspaceStateTransitionAnimation { && fromState == HINT_STATE && state == NORMAL; if (shouldSpring) { ((PendingAnimation) propertySetter).add(getSpringScaleAnimator(mLauncher, - mWorkspace, mNewScale)); + mWorkspace, mNewScale, WORKSPACE_SCALE_PROPERTY)); } else { - propertySetter.setFloat(mWorkspace, WORKSPACE_STATE_SCALE_PROPERTY, mNewScale, + propertySetter.setFloat(mWorkspace, WORKSPACE_SCALE_PROPERTY, mNewScale, scaleInterpolator); } @@ -130,11 +134,12 @@ public class WorkspaceStateTransitionAnimation { float hotseatScale = hotseatScaleAndTranslation.scale; if (shouldSpring) { PendingAnimation pa = (PendingAnimation) propertySetter; - pa.add(getSpringScaleAnimator(mLauncher, hotseat, hotseatScale)); + pa.add(getSpringScaleAnimator(mLauncher, hotseat, hotseatScale, + HOTSEAT_SCALE_PROPERTY)); } else { Interpolator hotseatScaleInterpolator = config.getInterpolator(ANIM_HOTSEAT_SCALE, scaleInterpolator); - propertySetter.setFloat(hotseat, WORKSPACE_STATE_SCALE_PROPERTY, hotseatScale, + propertySetter.setFloat(hotseat, HOTSEAT_SCALE_PROPERTY, hotseatScale, hotseatScaleInterpolator); } @@ -197,10 +202,19 @@ public class WorkspaceStateTransitionAnimation { pageAlpha, fadeInterpolator); } + /** + * Returns a spring based animator for the scale property of {@param workspace}. + */ + public static ValueAnimator getWorkspaceSpringScaleAnimator(Launcher launcher, + Workspace workspace, float scale) { + return getSpringScaleAnimator(launcher, workspace, scale, WORKSPACE_SCALE_PROPERTY); + } + /** * Returns a spring based animator for the scale property of {@param v}. */ - public static ValueAnimator getSpringScaleAnimator(Launcher launcher, View v, float scale) { + public static ValueAnimator getSpringScaleAnimator(Launcher launcher, T v, + float scale, FloatProperty property) { ResourceProvider rp = DynamicResource.provider(launcher); float damping = rp.getFloat(R.dimen.hint_scale_damping_ratio); float stiffness = rp.getFloat(R.dimen.hint_scale_stiffness); @@ -211,9 +225,9 @@ public class WorkspaceStateTransitionAnimation { .setDampingRatio(damping) .setMinimumVisibleChange(MIN_VISIBLE_CHANGE_SCALE) .setEndValue(scale) - .setStartValue(WORKSPACE_STATE_SCALE_PROPERTY.get(v)) + .setStartValue(property.get(v)) .setStartVelocity(velocityPxPerS) - .build(v, WORKSPACE_STATE_SCALE_PROPERTY); + .build(v, property); } } \ No newline at end of file diff --git a/src/com/android/launcher3/util/MultiScalePropertyFactory.java b/src/com/android/launcher3/util/MultiScalePropertyFactory.java index f27d0f0d86..a7e6cc8679 100644 --- a/src/com/android/launcher3/util/MultiScalePropertyFactory.java +++ b/src/com/android/launcher3/util/MultiScalePropertyFactory.java @@ -18,6 +18,8 @@ package com.android.launcher3.util; import android.util.ArrayMap; import android.util.FloatProperty; +import android.util.Log; +import android.view.View; import com.android.launcher3.Utilities; @@ -33,8 +35,10 @@ import com.android.launcher3.Utilities; * * @param Type where to apply the property. */ -public abstract class MultiScalePropertyFactory { +public class MultiScalePropertyFactory { + private static final boolean DEBUG = false; + private static final String TAG = "MultiScaleProperty"; private final String mName; private final ArrayMap mProperties = new ArrayMap(); @@ -56,7 +60,6 @@ public abstract class MultiScalePropertyFactory { (k) -> new MultiScaleProperty(index, mName + "_" + index)); } - /** * Each [setValue] will be aggregated with the other properties values created by the * corresponding factory. @@ -91,11 +94,22 @@ public abstract class MultiScalePropertyFactory { mLastAggregatedValue = Utilities.boundToRange(multValue, minValue, maxValue); mValue = newValue; apply(obj, mLastAggregatedValue); + + if (DEBUG) { + Log.d(TAG, "name=" + mName + + " newValue=" + newValue + " mInx=" + mInx + + " aggregated=" + mLastAggregatedValue + " others= " + mProperties); + } } @Override - public Float get(T t) { - return mLastAggregatedValue; + public Float get(T view) { + // The scale of the view should match mLastAggregatedValue. Still, if it has been + // changed without using this property, it can differ. As this get method is usually + // used to set the starting point on an animation, this would result in some jumps + // when the view scale is different than the last aggregated value. To stay on the + // safe side, let's return the real view scale. + return view.getScaleX(); } @Override @@ -104,6 +118,8 @@ public abstract class MultiScalePropertyFactory { } } - /** Applies value to object after setValue method is called. */ - protected abstract void apply(T obj, float value); + protected void apply(View view, float value) { + view.setScaleX(value); + view.setScaleY(value); + } } diff --git a/tests/src/com/android/launcher3/util/MultiScalePropertyTest.kt b/tests/src/com/android/launcher3/util/MultiScalePropertyTest.kt index c4a8db6adf..6099987172 100644 --- a/tests/src/com/android/launcher3/util/MultiScalePropertyTest.kt +++ b/tests/src/com/android/launcher3/util/MultiScalePropertyTest.kt @@ -1,5 +1,6 @@ package com.android.launcher3.util +import android.view.View import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.google.common.truth.Truth.assertThat @@ -14,8 +15,8 @@ class MultiScalePropertyTest { private val received = mutableListOf() private val factory = - object : MultiScalePropertyFactory("Test") { - override fun apply(obj: Int?, value: Float) { + object : MultiScalePropertyFactory("Test") { + override fun apply(obj: View?, value: Float) { received.add(value) } } From 2763365eb67a9dbcec5ab6ace3c5bb2947615424 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Fri, 18 Feb 2022 15:12:27 -0800 Subject: [PATCH 3/9] Fix icon loading null pointer. Filtering out icon itemInfos with null component names when loading icons in bulk Test: manual Fixes: 220380324 Fixes: 220345439 Change-Id: I0e6f9ae0a363d17497207c92eadcac64ca42693f (cherry picked from commit 5597e4825dc357a122d29672c4682da2e3ce8aca) --- src/com/android/launcher3/icons/IconCache.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 3129e2af41..308a8f2e5d 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -41,9 +41,9 @@ import android.os.Trace; import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; -import android.util.Pair; import androidx.annotation.NonNull; +import androidx.core.util.Pair; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherFiles; @@ -339,6 +339,16 @@ public class IconCache extends BaseIconCache { List> iconRequestInfos) { Map, List>> iconLoadSubsectionsMap = iconRequestInfos.stream() + .filter(iconRequest -> { + if (iconRequest.itemInfo.getTargetComponent() != null) { + return true; + } + Log.i(TAG, + "Skipping Item info with null component name: " + + iconRequest.itemInfo); + iconRequest.itemInfo.bitmap = getDefaultIcon(iconRequest.itemInfo.user); + return false; + }) .collect(groupingBy(iconRequest -> Pair.create(iconRequest.itemInfo.user, iconRequest.useLowResIcon))); From 473b980bf97792f796ad8ef1f4019541e9dc89f1 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Mon, 7 Feb 2022 22:22:09 -0500 Subject: [PATCH 4/9] Put taskbar all apps in separate overlay window and stash taskbar. All apps should display below system UI components such as the notification tray and power menu, so an overlay window is more appropriate. As a result, all apps has a separate window activity context, but some properties are delegated to the taskbar activity context. Taskbar should also be stashed while all apps is open. Change-Id: I593457708779d84a0ab8b949a966d247d0a2e1b7 Test: Manual Bug: 216843189 Fix: 217383817 --- quickstep/res/layout/taskbar_all_apps.xml | 8 +- .../launcher3/taskbar/BaseTaskbarContext.java | 69 ++++++ .../taskbar/TaskbarActivityContext.java | 68 ++---- .../taskbar/TaskbarAllAppsViewController.java | 84 -------- .../launcher3/taskbar/TaskbarControllers.java | 9 +- .../taskbar/TaskbarDragController.java | 11 +- .../launcher3/taskbar/TaskbarDragView.java | 4 +- .../taskbar/TaskbarModelCallbacks.java | 4 +- .../taskbar/TaskbarPopupController.java | 20 +- .../taskbar/TaskbarStashController.java | 4 +- .../taskbar/TaskbarViewController.java | 2 +- .../TaskbarAllAppsContainerView.java | 14 +- .../allapps/TaskbarAllAppsContext.java | 164 +++++++++++++++ .../allapps/TaskbarAllAppsController.java | 199 ++++++++++++++++++ .../TaskbarAllAppsSlideInView.java | 27 ++- .../allapps/TaskbarAllAppsViewController.java | 91 ++++++++ 16 files changed, 596 insertions(+), 182 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java rename quickstep/src/com/android/launcher3/taskbar/{ => allapps}/TaskbarAllAppsContainerView.java (83%) create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContext.java create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java rename quickstep/src/com/android/launcher3/taskbar/{ => allapps}/TaskbarAllAppsSlideInView.java (76%) create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java diff --git a/quickstep/res/layout/taskbar_all_apps.xml b/quickstep/res/layout/taskbar_all_apps.xml index 11d75c7d9b..7dc0cbe1ab 100644 --- a/quickstep/res/layout/taskbar_all_apps.xml +++ b/quickstep/res/layout/taskbar_all_apps.xml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + + diff --git a/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java new file mode 100644 index 0000000000..17635df355 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java @@ -0,0 +1,69 @@ +/* + * 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.launcher3.taskbar; + +import android.content.Context; +import android.view.ContextThemeWrapper; +import android.view.LayoutInflater; + +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.DeviceProfile.DeviceProfileListenable; +import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; +import com.android.launcher3.util.Themes; +import com.android.launcher3.views.ActivityContext; + +import java.util.ArrayList; +import java.util.List; + +// TODO(b/218912746): Share more behavior to avoid all apps context depending directly on taskbar. +/** Base for common behavior between taskbar window contexts. */ +public abstract class BaseTaskbarContext extends ContextThemeWrapper implements ActivityContext, + DeviceProfileListenable { + + protected final LayoutInflater mLayoutInflater; + private final List mDPChangeListeners = new ArrayList<>(); + + protected DeviceProfile mDeviceProfile; + + public BaseTaskbarContext(Context windowContext) { + super(windowContext, Themes.getActivityThemeRes(windowContext)); + mLayoutInflater = LayoutInflater.from(this).cloneInContext(this); + } + + @Override + public final LayoutInflater getLayoutInflater() { + return mLayoutInflater; + } + + @Override + public final DeviceProfile getDeviceProfile() { + return mDeviceProfile; + } + + @Override + public final List getOnDeviceProfileChangeListeners() { + return mDPChangeListeners; + } + + /** Updates the {@link DeviceProfile} instance to the latest representation of the screen. */ + public abstract void updateDeviceProfile(DeviceProfile dp); + + /** Callback invoked when a drag is initiated within this context. */ + public abstract void onDragStart(); + + /** Callback invoked when a popup is shown or closed within this context. */ + public abstract void onPopupVisibilityChanged(boolean isVisible); +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index fe091efecd..8f0b9345d7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -42,10 +42,8 @@ import android.os.Process; import android.os.SystemProperties; import android.provider.Settings; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; -import android.view.LayoutInflater; import android.view.RoundedCorner; import android.view.View; import android.view.WindowManager; @@ -58,11 +56,8 @@ import androidx.annotation.Nullable; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.DeviceProfile.DeviceProfileListenable; -import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.dot.DotInfo; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; @@ -72,11 +67,10 @@ import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.PopupDataProvider; +import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.launcher3.touch.ItemClickHandler; -import com.android.launcher3.util.OnboardingPrefs; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.SettingsCache; -import com.android.launcher3.util.Themes; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.util.ViewCache; import com.android.launcher3.views.ActivityContext; @@ -89,16 +83,13 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; /** * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements * that are used by both Launcher and Taskbar (such as Folder) to reference a generic * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer. */ -public class TaskbarActivityContext extends ContextThemeWrapper implements ActivityContext, - DeviceProfileListenable { +public class TaskbarActivityContext extends BaseTaskbarContext { private static final boolean ENABLE_THREE_BUTTON_TASKBAR = SystemProperties.getBoolean("persist.debug.taskbar_three_button", false); @@ -106,13 +97,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ private static final String WINDOW_TITLE = "Taskbar"; - private final LayoutInflater mLayoutInflater; private final TaskbarDragLayer mDragLayer; - private final TaskbarAllAppsContainerView mAppsView; private final TaskbarControllers mControllers; - private final List mDPChangeListeners = new ArrayList<>(); - - private DeviceProfile mDeviceProfile; private final WindowManager mWindowManager; private final @Nullable RoundedCorner mLeftCorner, mRightCorner; @@ -135,14 +121,12 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ private boolean mBindingItems = false; private final TaskbarShortcutMenuAccessibilityDelegate mAccessibilityDelegate; - private final OnboardingPrefs mOnboardingPrefs; public TaskbarActivityContext(Context windowContext, DeviceProfile dp, TaskbarNavButtonController buttonController, ScopedUnfoldTransitionProgressProvider unfoldTransitionProgressProvider) { - super(windowContext, Themes.getActivityThemeRes(windowContext)); + super(windowContext); mDeviceProfile = dp; - mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this)); mNavMode = SysUINavigationMode.getMode(windowContext); mImeDrawsImeNavBar = SysUINavigationMode.getImeDrawsImeNavBar(windowContext); @@ -158,8 +142,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mTaskbarHeightForIme = resources.getDimensionPixelSize(R.dimen.taskbar_ime_size); - mLayoutInflater = LayoutInflater.from(this).cloneInContext(this); - // Inflate views. mDragLayer = (TaskbarDragLayer) mLayoutInflater.inflate( R.layout.taskbar, null, false); @@ -168,11 +150,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ FrameLayout navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view); StashedHandleView stashedHandleView = mDragLayer.findViewById(R.id.stashed_handle); - TaskbarAllAppsSlideInView appsSlideInView = - (TaskbarAllAppsSlideInView) mLayoutInflater.inflate(R.layout.taskbar_all_apps, - mDragLayer, false); - mAppsView = appsSlideInView.getAppsView(); - Display display = windowContext.getDisplay(); Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY ? windowContext.getApplicationContext() @@ -210,7 +187,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ new TaskbarAutohideSuspendController(this), new TaskbarPopupController(this), new TaskbarForceVisibleImmersiveController(this), - new TaskbarAllAppsViewController(this, appsSlideInView)); + new TaskbarAllAppsController(this)); } public void init(TaskbarSharedState sharedState) { @@ -236,7 +213,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mWindowManager.addView(mDragLayer, mWindowLayoutParams); } - /** Updates the Device profile instance to the latest representation of the screen. */ + @Override public void updateDeviceProfile(DeviceProfile dp) { mDeviceProfile = dp; updateIconSize(getResources()); @@ -296,31 +273,11 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ return mRightCorner == null ? 0 : mRightCorner.getRadius(); } - @Override - public LayoutInflater getLayoutInflater() { - return mLayoutInflater; - } - @Override public TaskbarDragLayer getDragLayer() { return mDragLayer; } - @Override - public TaskbarAllAppsContainerView getAppsView() { - return mAppsView; - } - - @Override - public DeviceProfile getDeviceProfile() { - return mDeviceProfile; - } - - @Override - public List getOnDeviceProfileChangeListeners() { - return mDPChangeListeners; - } - @Override public Rect getFolderBoundingBox() { return mControllers.taskbarDragLayerController.getFolderBoundingBox(); @@ -411,11 +368,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ return mAccessibilityDelegate; } - @Override - public OnboardingPrefs getOnboardingPrefs() { - return mOnboardingPrefs; - } - @Override public boolean isBindingItems() { return mBindingItems; @@ -425,6 +377,16 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mBindingItems = bindingItems; } + @Override + public void onDragStart() { + setTaskbarWindowFullscreen(true); + } + + @Override + public void onPopupVisibilityChanged(boolean isVisible) { + setTaskbarWindowFocusable(isVisible); + } + /** * Sets a new data-source for this taskbar instance */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java deleted file mode 100644 index 2670200342..0000000000 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.launcher3.taskbar; - -import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; - -import com.android.launcher3.appprediction.AppsDividerView; -import com.android.launcher3.appprediction.PredictionRowView; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.model.data.ItemInfo; - -import java.util.List; - -/** Handles the {@link TaskbarAllAppsContainerView} initialization and updates. */ -public final class TaskbarAllAppsViewController { - - private final TaskbarActivityContext mContext; - private final TaskbarAllAppsSlideInView mSlideInView; - private final TaskbarAllAppsContainerView mAppsView; - - public TaskbarAllAppsViewController( - TaskbarActivityContext context, TaskbarAllAppsSlideInView slideInView) { - mContext = context; - mSlideInView = slideInView; - mAppsView = mSlideInView.getAppsView(); - } - - /** Initialize the controller. */ - public void init(TaskbarControllers controllers) { - if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - return; - } - - mAppsView.setOnIconLongClickListener( - controllers.taskbarDragController::startDragOnLongClick); - mAppsView.getFloatingHeaderView().findFixedRowByType( - PredictionRowView.class).setOnIconLongClickListener( - controllers.taskbarDragController::startDragOnLongClick); - } - - /** Binds the current {@link AppInfo} instances to the {@link TaskbarAllAppsContainerView}. */ - public void setApps(AppInfo[] apps, int flags) { - if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - mAppsView.getAppsStore().setApps(apps, flags); - } - } - - /** Binds the current app predictions to all apps {@link PredictionRowView}. */ - public void setPredictedApps(List predictedApps) { - if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - PredictionRowView predictionRowView = - mAppsView.getFloatingHeaderView().findFixedRowByType(PredictionRowView.class); - predictionRowView.setPredictedApps(predictedApps); - } - } - - /** Opens the {@link TaskbarAllAppsContainerView}. */ - public void show() { - if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - return; - } - - mAppsView.getFloatingHeaderView().findFixedRowByType(AppsDividerView.class) - .setShowAllAppsLabel( - !mContext.getOnboardingPrefs().hasReachedMaxCount(ALL_APPS_VISITED_COUNT)); - mContext.getOnboardingPrefs().incrementEventCount(ALL_APPS_VISITED_COUNT); - mContext.setTaskbarWindowFullscreen(true); - mSlideInView.show(); - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index 21fbb3b2c8..d2e24e5bfa 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -20,6 +20,7 @@ import android.content.pm.ActivityInfo.Config; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.systemui.shared.rotation.RotationButtonController; import java.io.PrintWriter; @@ -48,7 +49,7 @@ public class TaskbarControllers { public final TaskbarAutohideSuspendController taskbarAutohideSuspendController; public final TaskbarPopupController taskbarPopupController; public final TaskbarForceVisibleImmersiveController taskbarForceVisibleImmersiveController; - public final TaskbarAllAppsViewController taskbarAllAppsViewController; + public final TaskbarAllAppsController taskbarAllAppsController; @Nullable private LoggableTaskbarController[] mControllersToLog = null; @@ -74,7 +75,7 @@ public class TaskbarControllers { TaskbarAutohideSuspendController taskbarAutoHideSuspendController, TaskbarPopupController taskbarPopupController, TaskbarForceVisibleImmersiveController taskbarForceVisibleImmersiveController, - TaskbarAllAppsViewController taskbarAllAppsViewController) { + TaskbarAllAppsController taskbarAllAppsController) { this.taskbarActivityContext = taskbarActivityContext; this.taskbarDragController = taskbarDragController; this.navButtonController = navButtonController; @@ -91,7 +92,7 @@ public class TaskbarControllers { this.taskbarAutohideSuspendController = taskbarAutoHideSuspendController; this.taskbarPopupController = taskbarPopupController; this.taskbarForceVisibleImmersiveController = taskbarForceVisibleImmersiveController; - this.taskbarAllAppsViewController = taskbarAllAppsViewController; + this.taskbarAllAppsController = taskbarAllAppsController; } /** @@ -115,7 +116,7 @@ public class TaskbarControllers { taskbarEduController.init(this); taskbarPopupController.init(this); taskbarForceVisibleImmersiveController.init(this); - taskbarAllAppsViewController.init(this); + taskbarAllAppsController.init(this); mControllersToLog = new LoggableTaskbarController[] { taskbarDragController, navButtonController, navbarButtonsViewController, diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index bffdf89d45..12b11959e8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -73,7 +73,7 @@ import java.util.Arrays; /** * Handles long click on Taskbar items to start a system drag and drop operation. */ -public class TaskbarDragController extends DragController implements +public class TaskbarDragController extends DragController implements TaskbarControllers.LoggableTaskbarController { private static boolean DEBUG_DRAG_SHADOW_SURFACE = false; @@ -93,7 +93,7 @@ public class TaskbarDragController extends DragController { DragView dragView = startInternalDrag(btv, dragPreviewProvider); if (iconShift != null) { @@ -183,7 +182,7 @@ public class TaskbarDragController extends DragController popupContainer = + PopupContainerWithArrow popupContainer = mControllers.taskbarPopupController.showForIcon(btv); if (popupContainer != null) { dragOptions.preDragCondition = popupContainer.createPreDragCondition(false); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java index cf28eff0c2..7a4243261c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java @@ -25,8 +25,8 @@ import com.android.launcher3.dragndrop.DragView; * while the pre-drag is still in progress (i.e. when the long press popup is still open). After * that ends, we switch to a system drag and drop view instead. */ -public class TaskbarDragView extends DragView { - public TaskbarDragView(TaskbarActivityContext launcher, Drawable drawable, int registrationX, +public class TaskbarDragView extends DragView { + public TaskbarDragView(BaseTaskbarContext launcher, Drawable drawable, int registrationX, int registrationY, float initialScale, float scaleOnDrop, float finalScaleDps) { super(launcher, drawable, registrationX, registrationY, initialScale, scaleOnDrop, finalScaleDps); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index 2e18a40b68..62392eea29 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -158,7 +158,7 @@ public class TaskbarModelCallbacks implements mPredictedItems = item.items; commitItemsToUI(); } else if (item.containerId == Favorites.CONTAINER_PREDICTION) { - mControllers.taskbarAllAppsViewController.setPredictedApps(item.items); + mControllers.taskbarAllAppsController.setPredictedApps(item.items); } } @@ -201,7 +201,7 @@ public class TaskbarModelCallbacks implements @Override public void bindAllApplications(AppInfo[] apps, int flags) { - mControllers.taskbarAllAppsViewController.setApps(apps, flags); + mControllers.taskbarAllAppsController.setApps(apps, flags); } protected void dumpLogs(String prefix, PrintWriter pw) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 68459ab4d7..ea4fe34fea 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -52,7 +52,7 @@ import java.util.stream.Stream; */ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskbarController { - private static final SystemShortcut.Factory + private static final SystemShortcut.Factory APP_INFO = SystemShortcut.AppInfo::new; private final TaskbarActivityContext mContext; @@ -121,8 +121,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba * Shows the notifications and deep shortcuts associated with a Taskbar {@param icon}. * @return the container if shown or null. */ - public PopupContainerWithArrow showForIcon(BubbleTextView icon) { - TaskbarActivityContext context = ActivityContext.lookupContext(icon.getContext()); + public PopupContainerWithArrow showForIcon(BubbleTextView icon) { + BaseTaskbarContext context = ActivityContext.lookupContext(icon.getContext()); if (PopupContainerWithArrow.getOpen(context) != null) { // There is already an items container open, so don't open this one. icon.clearFocus(); @@ -133,11 +133,11 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba return null; } - final PopupContainerWithArrow container = - (PopupContainerWithArrow) context.getLayoutInflater().inflate( + final PopupContainerWithArrow container = + (PopupContainerWithArrow) context.getLayoutInflater().inflate( R.layout.popup_container, context.getDragLayer(), false); container.addOnAttachStateChangeListener( - new PopupLiveUpdateHandler(mContext, container) { + new PopupLiveUpdateHandler(context, container) { @Override protected void showPopupContainerForIcon(BubbleTextView originalIcon) { showForIcon(originalIcon); @@ -157,10 +157,9 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba container.requestFocus(); // Make focusable to receive back events - mControllers.taskbarActivityContext.setTaskbarWindowFocusable(true); + context.onPopupVisibilityChanged(true); container.setOnCloseCallback(() -> { - mControllers.taskbarActivityContext.getDragLayer().post( - () -> mControllers.taskbarActivityContext.setTaskbarWindowFocusable(false)); + context.getDragLayer().post(() -> context.onPopupVisibilityChanged(false)); container.setOnCloseCallback(null); }); @@ -207,7 +206,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba iconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x; iconShift.y = mIconLastTouchPos.y - mContext.getDeviceProfile().iconSizePx; - mControllers.taskbarDragController.startDragOnLongClick(sv, iconShift); + ((TaskbarDragController) ActivityContext.lookupContext( + v.getContext()).getDragController()).startDragOnLongClick(sv, iconShift); return false; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 335b637d8a..1d5fa4d47b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -51,11 +51,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba public static final int FLAG_STASHED_IN_APP_SETUP = 1 << 4; // setup wizard and AllSetActivity public static final int FLAG_STASHED_IN_APP_IME = 1 << 5; // IME is visible public static final int FLAG_IN_STASHED_LAUNCHER_STATE = 1 << 6; + public static final int FLAG_STASHED_IN_APP_ALL_APPS = 1 << 7; // All apps is visible. // If we're in an app and any of these flags are enabled, taskbar should be stashed. private static final int FLAGS_STASHED_IN_APP = FLAG_STASHED_IN_APP_MANUAL | FLAG_STASHED_IN_APP_PINNED | FLAG_STASHED_IN_APP_EMPTY | FLAG_STASHED_IN_APP_SETUP - | FLAG_STASHED_IN_APP_IME; + | FLAG_STASHED_IN_APP_IME | FLAG_STASHED_IN_APP_ALL_APPS; // 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. @@ -585,6 +586,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba str.add((flags & FLAG_STASHED_IN_APP_IME) != 0 ? "FLAG_STASHED_IN_APP_IME" : ""); str.add((flags & FLAG_IN_STASHED_LAUNCHER_STATE) != 0 ? "FLAG_IN_STASHED_LAUNCHER_STATE" : ""); + str.add((flags & FLAG_STASHED_IN_APP_ALL_APPS) != 0 ? "FLAG_STASHED_IN_APP_ALL_APPS" : ""); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 8b6831b8d6..153ed140b4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -306,7 +306,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar } public View.OnClickListener getAllAppsButtonClickListener() { - return v -> mControllers.taskbarAllAppsViewController.show(); + return v -> mControllers.taskbarAllAppsController.show(); } public View.OnLongClickListener getIconOnLongClickListener() { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java similarity index 83% rename from quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java rename to quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java index d6eb71641c..b36b9f1ffd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.taskbar; +package com.android.launcher3.taskbar.allapps; import android.content.Context; import android.util.AttributeSet; @@ -29,10 +29,7 @@ import com.android.launcher3.allapps.BaseAllAppsContainerView; import com.android.launcher3.allapps.search.SearchAdapterProvider; /** All apps container accessible from taskbar. */ -public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView { - public TaskbarAllAppsContainerView(Context context) { - this(context, null); - } +public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView { public TaskbarAllAppsContainerView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -44,8 +41,8 @@ public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView createMainAdapterProvider() { - // Task bar all apps does not yet support search, so this implementation is minimal. - return new SearchAdapterProvider(mActivityContext) { + // Taskbar all apps does not yet support search, so this implementation is minimal. + return new SearchAdapterProvider(mActivityContext) { @Override public boolean launchHighlightedItem() { return false; @@ -79,8 +76,7 @@ public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView + * All apps has its own window and needs a window context. Some properties are delegated to the + * {@link TaskbarActivityContext} such as {@link DeviceProfile} and {@link PopupDataProvider}. + */ +class TaskbarAllAppsContext extends BaseTaskbarContext { + private final TaskbarActivityContext mTaskbarContext; + private final OnboardingPrefs mOnboardingPrefs; + + private final TaskbarAllAppsViewController mAllAppsViewController; + private final TaskbarDragController mDragController; + private final TaskbarAllAppsDragLayer mDragLayer; + private final TaskbarAllAppsContainerView mAppsView; + + TaskbarAllAppsContext( + TaskbarActivityContext taskbarContext, + TaskbarAllAppsController windowController, + TaskbarStashController taskbarStashController) { + super(taskbarContext.createWindowContext(TYPE_APPLICATION_OVERLAY, null)); + mTaskbarContext = taskbarContext; + mDeviceProfile = taskbarContext.getDeviceProfile(); + mDragController = new TaskbarDragController(this); + mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this)); + + mDragLayer = new TaskbarAllAppsDragLayer(this); + TaskbarAllAppsSlideInView slideInView = (TaskbarAllAppsSlideInView) mLayoutInflater.inflate( + R.layout.taskbar_all_apps, mDragLayer, false); + mAllAppsViewController = new TaskbarAllAppsViewController( + this, + slideInView, + windowController, + taskbarStashController); + mAppsView = slideInView.getAppsView(); + } + + TaskbarAllAppsViewController getAllAppsViewController() { + return mAllAppsViewController; + } + + @Override + public TaskbarDragController getDragController() { + return mDragController; + } + + @Override + public TaskbarAllAppsDragLayer getDragLayer() { + return mDragLayer; + } + + @Override + public TaskbarAllAppsContainerView getAppsView() { + return mAppsView; + } + + @Override + public OnboardingPrefs getOnboardingPrefs() { + return mOnboardingPrefs; + } + + @Override + public boolean isBindingItems() { + return mTaskbarContext.isBindingItems(); + } + + @Override + public View.OnClickListener getItemOnClickListener() { + return mTaskbarContext.getItemOnClickListener(); + } + + @Override + public PopupDataProvider getPopupDataProvider() { + return mTaskbarContext.getPopupDataProvider(); + } + + @Override + public DotInfo getDotInfoForItem(ItemInfo info) { + return mTaskbarContext.getDotInfoForItem(info); + } + + @Override + public void updateDeviceProfile(DeviceProfile dp) { + mDeviceProfile = dp; + dispatchDeviceProfileChanged(); + } + + @Override + public void onDragStart() {} + + @Override + public void onPopupVisibilityChanged(boolean isVisible) {} + + /** Root drag layer for this context. */ + private static class TaskbarAllAppsDragLayer extends BaseDragLayer { + + private TaskbarAllAppsDragLayer(Context context) { + super(context, null, 1); + setClipChildren(false); + recreateControllers(); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + mActivity.mAllAppsViewController.show(); + } + + @Override + public void recreateControllers() { + mControllers = new TouchController[]{mActivity.mDragController}; + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + if (event.getAction() == ACTION_UP && event.getKeyCode() == KEYCODE_BACK) { + AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity); + if (topView != null && topView.onBackPressed()) { + return true; + } + } + return super.dispatchKeyEvent(event); + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java new file mode 100644 index 0000000000..93024521d4 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java @@ -0,0 +1,199 @@ +/* + * 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.launcher3.taskbar.allapps; + +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; + +import android.content.Context; +import android.graphics.PixelFormat; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; + +import androidx.annotation.Nullable; + +import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; +import com.android.launcher3.appprediction.PredictionRowView; +import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.model.data.AppInfo; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarControllers; + +import java.util.List; +import java.util.Optional; + +/** + * Handles the all apps overlay window initialization, updates, and its data. + *

+ * All apps is in an application overlay window instead of taskbar's navigation bar panel window, + * because a navigation bar panel is higher than UI components that all apps should be below such as + * the notification tray. + *

+ * The all apps window is created and destroyed upon opening and closing all apps, respectively. + * Application data may be bound while the window does not exist, so this controller will store + * the models for the next all apps session. + */ +public final class TaskbarAllAppsController implements OnDeviceProfileChangeListener { + + private static final String WINDOW_TITLE = "Taskbar All Apps"; + + private final TaskbarActivityContext mTaskbarContext; + private final TaskbarAllAppsProxyView mProxyView; + private final LayoutParams mLayoutParams; + + private TaskbarControllers mControllers; + /** Window context for all apps if it is open. */ + private @Nullable TaskbarAllAppsContext mAllAppsContext; + + // Application data models. + private AppInfo[] mApps; + private int mAppsModelFlags; + private List mPredictedApps; + + public TaskbarAllAppsController(TaskbarActivityContext context) { + mTaskbarContext = context; + mProxyView = new TaskbarAllAppsProxyView(mTaskbarContext); + mLayoutParams = createLayoutParams(); + } + + /** Initialize the controller. */ + public void init(TaskbarControllers controllers) { + if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + mControllers = controllers; + } + } + + /** Updates the current {@link AppInfo} instances. */ + public void setApps(AppInfo[] apps, int flags) { + if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + return; + } + + mApps = apps; + mAppsModelFlags = flags; + if (mAllAppsContext != null) { + mAllAppsContext.getAppsView().getAppsStore().setApps(mApps, mAppsModelFlags); + } + } + + /** Updates the current predictions. */ + public void setPredictedApps(List predictedApps) { + if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + return; + } + + mPredictedApps = predictedApps; + if (mAllAppsContext != null) { + mAllAppsContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setPredictedApps(mPredictedApps); + } + } + + /** Opens the {@link TaskbarAllAppsContainerView} in a new window. */ + public void show() { + if (mProxyView.isOpen()) { + return; + } + mProxyView.show(); + + mAllAppsContext = new TaskbarAllAppsContext(mTaskbarContext, + this, + mControllers.taskbarStashController); + mAllAppsContext.getDragController().init(mControllers); + mTaskbarContext.addOnDeviceProfileChangeListener(this); + Optional.ofNullable(mAllAppsContext.getSystemService(WindowManager.class)) + .ifPresent(m -> m.addView(mAllAppsContext.getDragLayer(), mLayoutParams)); + + mAllAppsContext.getAppsView().getAppsStore().setApps(mApps, mAppsModelFlags); + mAllAppsContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setPredictedApps(mPredictedApps); + } + + /** + * Removes the all apps window from the hierarchy. + *

+ * This method should be called after an exit animation finishes, if applicable. + */ + void closeWindow() { + mProxyView.close(false); + mTaskbarContext.removeOnDeviceProfileChangeListener(this); + Optional.ofNullable(mAllAppsContext) + .map(c -> c.getSystemService(WindowManager.class)) + .ifPresent(m -> m.removeView(mAllAppsContext.getDragLayer())); + mAllAppsContext = null; + } + + private LayoutParams createLayoutParams() { + LayoutParams layoutParams = new LayoutParams( + TYPE_APPLICATION_OVERLAY, + 0, + PixelFormat.TRANSLUCENT); + layoutParams.setTitle(WINDOW_TITLE); + layoutParams.gravity = Gravity.BOTTOM; + layoutParams.packageName = mTaskbarContext.getPackageName(); + layoutParams.setFitInsetsTypes(0); // Handled by container view. + layoutParams.setSystemApplicationOverlay(true); + return layoutParams; + } + + @Override + public void onDeviceProfileChanged(DeviceProfile dp) { + Optional.ofNullable(mAllAppsContext).ifPresent(c -> c.updateDeviceProfile(dp)); + } + + /** + * Proxy view connecting taskbar drag layer to the all apps window. + *

+ * The all apps view is in a separate window and has its own drag layer, but this proxy lets it + * behave as though its in the taskbar drag layer. For instance, when the taskbar closes all + * {@link AbstractFloatingView} instances, the all apps window will also close. + */ + private class TaskbarAllAppsProxyView extends AbstractFloatingView { + + private TaskbarAllAppsProxyView(Context context) { + super(context, null); + } + + private void show() { + mIsOpen = true; + mTaskbarContext.getDragLayer().addView(this); + } + + @Override + protected void handleClose(boolean animate) { + mTaskbarContext.getDragLayer().removeView(this); + Optional.ofNullable(mAllAppsContext) + .map(TaskbarAllAppsContext::getAllAppsViewController) + .ifPresent(v -> v.close(animate)); + } + + @Override + protected boolean isOfType(int type) { + return (type & TYPE_TASKBAR_ALL_APPS) != 0; + } + + @Override + public boolean onControllerInterceptTouchEvent(MotionEvent ev) { + return false; + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java similarity index 76% rename from quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java rename to quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java index 63690c4847..7accfbb6a6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.taskbar; +package com.android.launcher3.taskbar.allapps; import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE; @@ -27,14 +27,17 @@ import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.views.AbstractSlideInView; +import java.util.Optional; + /** Wrapper for taskbar all apps with slide-in behavior. */ public class TaskbarAllAppsSlideInView extends - AbstractSlideInView implements Insettable { + AbstractSlideInView implements Insettable { - private static final int DEFAULT_OPEN_DURATION = 500; - private static final int DEFAULT_CLOSE_DURATION = 200; + static final int DEFAULT_OPEN_DURATION = 500; + static final int DEFAULT_CLOSE_DURATION = 200; private TaskbarAllAppsContainerView mAppsView; + private OnCloseListener mOnCloseBeginListener; public TaskbarAllAppsSlideInView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -46,7 +49,7 @@ public class TaskbarAllAppsSlideInView extends } /** Opens the all apps view. */ - public void show() { + void show() { if (mIsOpen || mOpenCloseAnimator.isRunning()) { return; } @@ -60,12 +63,18 @@ public class TaskbarAllAppsSlideInView extends } /** The apps container inside this view. */ - public TaskbarAllAppsContainerView getAppsView() { + TaskbarAllAppsContainerView getAppsView() { return mAppsView; } + /** Callback invoked when the view is beginning to close (e.g. close animation is started). */ + void setOnCloseBeginListener(OnCloseListener onCloseBeginListener) { + mOnCloseBeginListener = onCloseBeginListener; + } + @Override protected void handleClose(boolean animate) { + Optional.ofNullable(mOnCloseBeginListener).ifPresent(OnCloseListener::onSlideInViewClosed); handleClose(animate, DEFAULT_CLOSE_DURATION); } @@ -81,6 +90,12 @@ public class TaskbarAllAppsSlideInView extends mContent = mAppsView; } + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + setTranslationShift(mTranslationShift); + } + @Override protected int getScrimColor(Context context) { return context.getColor(R.color.widgets_picker_scrim); diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java new file mode 100644 index 0000000000..c1abaaca06 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java @@ -0,0 +1,91 @@ +/* + * 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.launcher3.taskbar.allapps; + +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IN_APP_ALL_APPS; +import static com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView.DEFAULT_CLOSE_DURATION; +import static com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView.DEFAULT_OPEN_DURATION; +import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; + +import com.android.launcher3.appprediction.AppsDividerView; +import com.android.launcher3.appprediction.PredictionRowView; +import com.android.launcher3.taskbar.TaskbarStashController; + +/** + * Handles the {@link TaskbarAllAppsContainerView} behavior and synchronizes its transitions with + * taskbar stashing. + */ +final class TaskbarAllAppsViewController { + + private final TaskbarAllAppsContext mContext; + private final TaskbarAllAppsSlideInView mSlideInView; + private final TaskbarAllAppsContainerView mAppsView; + private final TaskbarStashController mTaskbarStashController; + + TaskbarAllAppsViewController( + TaskbarAllAppsContext context, + TaskbarAllAppsSlideInView slideInView, + TaskbarAllAppsController windowController, + TaskbarStashController taskbarStashController) { + + mContext = context; + mSlideInView = slideInView; + mAppsView = mSlideInView.getAppsView(); + mTaskbarStashController = taskbarStashController; + + setUpIconLongClick(); + setUpAppDivider(); + setUpTaskbarStashing(); + mSlideInView.addOnCloseListener(windowController::closeWindow); + } + + /** Starts the {@link TaskbarAllAppsSlideInView} enter transition. */ + void show() { + mSlideInView.show(); + } + + /** Closes the {@link TaskbarAllAppsSlideInView}. */ + void close(boolean animate) { + mSlideInView.close(animate); + } + + private void setUpIconLongClick() { + mAppsView.setOnIconLongClickListener( + mContext.getDragController()::startDragOnLongClick); + mAppsView.getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setOnIconLongClickListener( + mContext.getDragController()::startDragOnLongClick); + } + + private void setUpAppDivider() { + mAppsView.getFloatingHeaderView() + .findFixedRowByType(AppsDividerView.class) + .setShowAllAppsLabel(!mContext.getOnboardingPrefs().hasReachedMaxCount( + ALL_APPS_VISITED_COUNT)); + mContext.getOnboardingPrefs().incrementEventCount(ALL_APPS_VISITED_COUNT); + } + + private void setUpTaskbarStashing() { + mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_APP_ALL_APPS, true); + mTaskbarStashController.applyState(DEFAULT_OPEN_DURATION); + mSlideInView.setOnCloseBeginListener(() -> { + mTaskbarStashController.updateStateForFlag( + FLAG_STASHED_IN_APP_ALL_APPS, false); + mTaskbarStashController.applyState(DEFAULT_CLOSE_DURATION); + }); + } +} From 4c2e3310e61169b7ee0b380f7f5652f657002d90 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 23 Feb 2022 06:44:55 +0000 Subject: [PATCH 5/9] Disable flakey fallback recents test - Seems to be an existing failure in the recents animation not finishing, should disable to unblock folks Bug: 218403080 Test: Presubmit Change-Id: Ia42009666c67c29c1a78a2fe197bdce53dcb2ec8 --- .../tests/src/com/android/quickstep/FallbackRecentsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index 4529217a21..6be2ce690a 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -61,6 +61,7 @@ import com.android.quickstep.views.RecentsView; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; @@ -205,6 +206,7 @@ public class FallbackRecentsTest { // b/143488140 //@NavigationModeSwitch + @Ignore("b/218403080") @Test public void testOverview() { startAppFast(getAppPackageName()); From a1370bfc5f5cacf88e7f0666f3400471f8be82a5 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Mon, 7 Feb 2022 22:22:09 -0500 Subject: [PATCH 6/9] Put taskbar all apps in separate overlay window and stash taskbar. All apps should display below system UI components such as the notification tray and power menu, so an overlay window is more appropriate. As a result, all apps has a separate window activity context, but some properties are delegated to the taskbar activity context. Taskbar should also be stashed while all apps is open. Change-Id: I593457708779d84a0ab8b949a966d247d0a2e1b7 Test: Manual Bug: 216843189 Fix: 217383817 (cherry picked from commit 473b980bf97792f796ad8ef1f4019541e9dc89f1) --- quickstep/res/layout/taskbar_all_apps.xml | 8 +- .../launcher3/taskbar/BaseTaskbarContext.java | 69 ++++++ .../taskbar/TaskbarActivityContext.java | 68 ++---- .../taskbar/TaskbarAllAppsViewController.java | 84 -------- .../launcher3/taskbar/TaskbarControllers.java | 9 +- .../taskbar/TaskbarDragController.java | 11 +- .../launcher3/taskbar/TaskbarDragView.java | 4 +- .../taskbar/TaskbarModelCallbacks.java | 4 +- .../taskbar/TaskbarPopupController.java | 20 +- .../taskbar/TaskbarStashController.java | 4 +- .../taskbar/TaskbarViewController.java | 2 +- .../TaskbarAllAppsContainerView.java | 14 +- .../allapps/TaskbarAllAppsContext.java | 164 +++++++++++++++ .../allapps/TaskbarAllAppsController.java | 199 ++++++++++++++++++ .../TaskbarAllAppsSlideInView.java | 27 ++- .../allapps/TaskbarAllAppsViewController.java | 91 ++++++++ 16 files changed, 596 insertions(+), 182 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java rename quickstep/src/com/android/launcher3/taskbar/{ => allapps}/TaskbarAllAppsContainerView.java (83%) create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContext.java create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java rename quickstep/src/com/android/launcher3/taskbar/{ => allapps}/TaskbarAllAppsSlideInView.java (76%) create mode 100644 quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java diff --git a/quickstep/res/layout/taskbar_all_apps.xml b/quickstep/res/layout/taskbar_all_apps.xml index 11d75c7d9b..7dc0cbe1ab 100644 --- a/quickstep/res/layout/taskbar_all_apps.xml +++ b/quickstep/res/layout/taskbar_all_apps.xml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + + diff --git a/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java new file mode 100644 index 0000000000..17635df355 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java @@ -0,0 +1,69 @@ +/* + * 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.launcher3.taskbar; + +import android.content.Context; +import android.view.ContextThemeWrapper; +import android.view.LayoutInflater; + +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.DeviceProfile.DeviceProfileListenable; +import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; +import com.android.launcher3.util.Themes; +import com.android.launcher3.views.ActivityContext; + +import java.util.ArrayList; +import java.util.List; + +// TODO(b/218912746): Share more behavior to avoid all apps context depending directly on taskbar. +/** Base for common behavior between taskbar window contexts. */ +public abstract class BaseTaskbarContext extends ContextThemeWrapper implements ActivityContext, + DeviceProfileListenable { + + protected final LayoutInflater mLayoutInflater; + private final List mDPChangeListeners = new ArrayList<>(); + + protected DeviceProfile mDeviceProfile; + + public BaseTaskbarContext(Context windowContext) { + super(windowContext, Themes.getActivityThemeRes(windowContext)); + mLayoutInflater = LayoutInflater.from(this).cloneInContext(this); + } + + @Override + public final LayoutInflater getLayoutInflater() { + return mLayoutInflater; + } + + @Override + public final DeviceProfile getDeviceProfile() { + return mDeviceProfile; + } + + @Override + public final List getOnDeviceProfileChangeListeners() { + return mDPChangeListeners; + } + + /** Updates the {@link DeviceProfile} instance to the latest representation of the screen. */ + public abstract void updateDeviceProfile(DeviceProfile dp); + + /** Callback invoked when a drag is initiated within this context. */ + public abstract void onDragStart(); + + /** Callback invoked when a popup is shown or closed within this context. */ + public abstract void onPopupVisibilityChanged(boolean isVisible); +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index fe091efecd..8f0b9345d7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -42,10 +42,8 @@ import android.os.Process; import android.os.SystemProperties; import android.provider.Settings; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; -import android.view.LayoutInflater; import android.view.RoundedCorner; import android.view.View; import android.view.WindowManager; @@ -58,11 +56,8 @@ import androidx.annotation.Nullable; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.DeviceProfile.DeviceProfileListenable; -import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; -import com.android.launcher3.Utilities; import com.android.launcher3.dot.DotInfo; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; @@ -72,11 +67,10 @@ import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.PopupDataProvider; +import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.launcher3.touch.ItemClickHandler; -import com.android.launcher3.util.OnboardingPrefs; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.SettingsCache; -import com.android.launcher3.util.Themes; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.util.ViewCache; import com.android.launcher3.views.ActivityContext; @@ -89,16 +83,13 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; /** * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements * that are used by both Launcher and Taskbar (such as Folder) to reference a generic * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer. */ -public class TaskbarActivityContext extends ContextThemeWrapper implements ActivityContext, - DeviceProfileListenable { +public class TaskbarActivityContext extends BaseTaskbarContext { private static final boolean ENABLE_THREE_BUTTON_TASKBAR = SystemProperties.getBoolean("persist.debug.taskbar_three_button", false); @@ -106,13 +97,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ private static final String WINDOW_TITLE = "Taskbar"; - private final LayoutInflater mLayoutInflater; private final TaskbarDragLayer mDragLayer; - private final TaskbarAllAppsContainerView mAppsView; private final TaskbarControllers mControllers; - private final List mDPChangeListeners = new ArrayList<>(); - - private DeviceProfile mDeviceProfile; private final WindowManager mWindowManager; private final @Nullable RoundedCorner mLeftCorner, mRightCorner; @@ -135,14 +121,12 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ private boolean mBindingItems = false; private final TaskbarShortcutMenuAccessibilityDelegate mAccessibilityDelegate; - private final OnboardingPrefs mOnboardingPrefs; public TaskbarActivityContext(Context windowContext, DeviceProfile dp, TaskbarNavButtonController buttonController, ScopedUnfoldTransitionProgressProvider unfoldTransitionProgressProvider) { - super(windowContext, Themes.getActivityThemeRes(windowContext)); + super(windowContext); mDeviceProfile = dp; - mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this)); mNavMode = SysUINavigationMode.getMode(windowContext); mImeDrawsImeNavBar = SysUINavigationMode.getImeDrawsImeNavBar(windowContext); @@ -158,8 +142,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mTaskbarHeightForIme = resources.getDimensionPixelSize(R.dimen.taskbar_ime_size); - mLayoutInflater = LayoutInflater.from(this).cloneInContext(this); - // Inflate views. mDragLayer = (TaskbarDragLayer) mLayoutInflater.inflate( R.layout.taskbar, null, false); @@ -168,11 +150,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ FrameLayout navButtonsView = mDragLayer.findViewById(R.id.navbuttons_view); StashedHandleView stashedHandleView = mDragLayer.findViewById(R.id.stashed_handle); - TaskbarAllAppsSlideInView appsSlideInView = - (TaskbarAllAppsSlideInView) mLayoutInflater.inflate(R.layout.taskbar_all_apps, - mDragLayer, false); - mAppsView = appsSlideInView.getAppsView(); - Display display = windowContext.getDisplay(); Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY ? windowContext.getApplicationContext() @@ -210,7 +187,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ new TaskbarAutohideSuspendController(this), new TaskbarPopupController(this), new TaskbarForceVisibleImmersiveController(this), - new TaskbarAllAppsViewController(this, appsSlideInView)); + new TaskbarAllAppsController(this)); } public void init(TaskbarSharedState sharedState) { @@ -236,7 +213,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mWindowManager.addView(mDragLayer, mWindowLayoutParams); } - /** Updates the Device profile instance to the latest representation of the screen. */ + @Override public void updateDeviceProfile(DeviceProfile dp) { mDeviceProfile = dp; updateIconSize(getResources()); @@ -296,31 +273,11 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ return mRightCorner == null ? 0 : mRightCorner.getRadius(); } - @Override - public LayoutInflater getLayoutInflater() { - return mLayoutInflater; - } - @Override public TaskbarDragLayer getDragLayer() { return mDragLayer; } - @Override - public TaskbarAllAppsContainerView getAppsView() { - return mAppsView; - } - - @Override - public DeviceProfile getDeviceProfile() { - return mDeviceProfile; - } - - @Override - public List getOnDeviceProfileChangeListeners() { - return mDPChangeListeners; - } - @Override public Rect getFolderBoundingBox() { return mControllers.taskbarDragLayerController.getFolderBoundingBox(); @@ -411,11 +368,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ return mAccessibilityDelegate; } - @Override - public OnboardingPrefs getOnboardingPrefs() { - return mOnboardingPrefs; - } - @Override public boolean isBindingItems() { return mBindingItems; @@ -425,6 +377,16 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mBindingItems = bindingItems; } + @Override + public void onDragStart() { + setTaskbarWindowFullscreen(true); + } + + @Override + public void onPopupVisibilityChanged(boolean isVisible) { + setTaskbarWindowFocusable(isVisible); + } + /** * Sets a new data-source for this taskbar instance */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java deleted file mode 100644 index 2670200342..0000000000 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.launcher3.taskbar; - -import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; - -import com.android.launcher3.appprediction.AppsDividerView; -import com.android.launcher3.appprediction.PredictionRowView; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.model.data.ItemInfo; - -import java.util.List; - -/** Handles the {@link TaskbarAllAppsContainerView} initialization and updates. */ -public final class TaskbarAllAppsViewController { - - private final TaskbarActivityContext mContext; - private final TaskbarAllAppsSlideInView mSlideInView; - private final TaskbarAllAppsContainerView mAppsView; - - public TaskbarAllAppsViewController( - TaskbarActivityContext context, TaskbarAllAppsSlideInView slideInView) { - mContext = context; - mSlideInView = slideInView; - mAppsView = mSlideInView.getAppsView(); - } - - /** Initialize the controller. */ - public void init(TaskbarControllers controllers) { - if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - return; - } - - mAppsView.setOnIconLongClickListener( - controllers.taskbarDragController::startDragOnLongClick); - mAppsView.getFloatingHeaderView().findFixedRowByType( - PredictionRowView.class).setOnIconLongClickListener( - controllers.taskbarDragController::startDragOnLongClick); - } - - /** Binds the current {@link AppInfo} instances to the {@link TaskbarAllAppsContainerView}. */ - public void setApps(AppInfo[] apps, int flags) { - if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - mAppsView.getAppsStore().setApps(apps, flags); - } - } - - /** Binds the current app predictions to all apps {@link PredictionRowView}. */ - public void setPredictedApps(List predictedApps) { - if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - PredictionRowView predictionRowView = - mAppsView.getFloatingHeaderView().findFixedRowByType(PredictionRowView.class); - predictionRowView.setPredictedApps(predictedApps); - } - } - - /** Opens the {@link TaskbarAllAppsContainerView}. */ - public void show() { - if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { - return; - } - - mAppsView.getFloatingHeaderView().findFixedRowByType(AppsDividerView.class) - .setShowAllAppsLabel( - !mContext.getOnboardingPrefs().hasReachedMaxCount(ALL_APPS_VISITED_COUNT)); - mContext.getOnboardingPrefs().incrementEventCount(ALL_APPS_VISITED_COUNT); - mContext.setTaskbarWindowFullscreen(true); - mSlideInView.show(); - } -} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index 21fbb3b2c8..d2e24e5bfa 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -20,6 +20,7 @@ import android.content.pm.ActivityInfo.Config; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController; import com.android.systemui.shared.rotation.RotationButtonController; import java.io.PrintWriter; @@ -48,7 +49,7 @@ public class TaskbarControllers { public final TaskbarAutohideSuspendController taskbarAutohideSuspendController; public final TaskbarPopupController taskbarPopupController; public final TaskbarForceVisibleImmersiveController taskbarForceVisibleImmersiveController; - public final TaskbarAllAppsViewController taskbarAllAppsViewController; + public final TaskbarAllAppsController taskbarAllAppsController; @Nullable private LoggableTaskbarController[] mControllersToLog = null; @@ -74,7 +75,7 @@ public class TaskbarControllers { TaskbarAutohideSuspendController taskbarAutoHideSuspendController, TaskbarPopupController taskbarPopupController, TaskbarForceVisibleImmersiveController taskbarForceVisibleImmersiveController, - TaskbarAllAppsViewController taskbarAllAppsViewController) { + TaskbarAllAppsController taskbarAllAppsController) { this.taskbarActivityContext = taskbarActivityContext; this.taskbarDragController = taskbarDragController; this.navButtonController = navButtonController; @@ -91,7 +92,7 @@ public class TaskbarControllers { this.taskbarAutohideSuspendController = taskbarAutoHideSuspendController; this.taskbarPopupController = taskbarPopupController; this.taskbarForceVisibleImmersiveController = taskbarForceVisibleImmersiveController; - this.taskbarAllAppsViewController = taskbarAllAppsViewController; + this.taskbarAllAppsController = taskbarAllAppsController; } /** @@ -115,7 +116,7 @@ public class TaskbarControllers { taskbarEduController.init(this); taskbarPopupController.init(this); taskbarForceVisibleImmersiveController.init(this); - taskbarAllAppsViewController.init(this); + taskbarAllAppsController.init(this); mControllersToLog = new LoggableTaskbarController[] { taskbarDragController, navButtonController, navbarButtonsViewController, diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index 6a2f62256b..c9f7f7e528 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -75,7 +75,7 @@ import java.util.Arrays; /** * Handles long click on Taskbar items to start a system drag and drop operation. */ -public class TaskbarDragController extends DragController implements +public class TaskbarDragController extends DragController implements TaskbarControllers.LoggableTaskbarController { private static boolean DEBUG_DRAG_SHADOW_SURFACE = false; @@ -95,7 +95,7 @@ public class TaskbarDragController extends DragController { DragView dragView = startInternalDrag(btv, dragPreviewProvider); if (iconShift != null) { @@ -185,7 +184,7 @@ public class TaskbarDragController extends DragController popupContainer = + PopupContainerWithArrow popupContainer = mControllers.taskbarPopupController.showForIcon(btv); if (popupContainer != null) { dragOptions.preDragCondition = popupContainer.createPreDragCondition(false); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java index cf28eff0c2..7a4243261c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragView.java @@ -25,8 +25,8 @@ import com.android.launcher3.dragndrop.DragView; * while the pre-drag is still in progress (i.e. when the long press popup is still open). After * that ends, we switch to a system drag and drop view instead. */ -public class TaskbarDragView extends DragView { - public TaskbarDragView(TaskbarActivityContext launcher, Drawable drawable, int registrationX, +public class TaskbarDragView extends DragView { + public TaskbarDragView(BaseTaskbarContext launcher, Drawable drawable, int registrationX, int registrationY, float initialScale, float scaleOnDrop, float finalScaleDps) { super(launcher, drawable, registrationX, registrationY, initialScale, scaleOnDrop, finalScaleDps); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index 2e18a40b68..62392eea29 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -158,7 +158,7 @@ public class TaskbarModelCallbacks implements mPredictedItems = item.items; commitItemsToUI(); } else if (item.containerId == Favorites.CONTAINER_PREDICTION) { - mControllers.taskbarAllAppsViewController.setPredictedApps(item.items); + mControllers.taskbarAllAppsController.setPredictedApps(item.items); } } @@ -201,7 +201,7 @@ public class TaskbarModelCallbacks implements @Override public void bindAllApplications(AppInfo[] apps, int flags) { - mControllers.taskbarAllAppsViewController.setApps(apps, flags); + mControllers.taskbarAllAppsController.setApps(apps, flags); } protected void dumpLogs(String prefix, PrintWriter pw) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 68459ab4d7..ea4fe34fea 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -52,7 +52,7 @@ import java.util.stream.Stream; */ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskbarController { - private static final SystemShortcut.Factory + private static final SystemShortcut.Factory APP_INFO = SystemShortcut.AppInfo::new; private final TaskbarActivityContext mContext; @@ -121,8 +121,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba * Shows the notifications and deep shortcuts associated with a Taskbar {@param icon}. * @return the container if shown or null. */ - public PopupContainerWithArrow showForIcon(BubbleTextView icon) { - TaskbarActivityContext context = ActivityContext.lookupContext(icon.getContext()); + public PopupContainerWithArrow showForIcon(BubbleTextView icon) { + BaseTaskbarContext context = ActivityContext.lookupContext(icon.getContext()); if (PopupContainerWithArrow.getOpen(context) != null) { // There is already an items container open, so don't open this one. icon.clearFocus(); @@ -133,11 +133,11 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba return null; } - final PopupContainerWithArrow container = - (PopupContainerWithArrow) context.getLayoutInflater().inflate( + final PopupContainerWithArrow container = + (PopupContainerWithArrow) context.getLayoutInflater().inflate( R.layout.popup_container, context.getDragLayer(), false); container.addOnAttachStateChangeListener( - new PopupLiveUpdateHandler(mContext, container) { + new PopupLiveUpdateHandler(context, container) { @Override protected void showPopupContainerForIcon(BubbleTextView originalIcon) { showForIcon(originalIcon); @@ -157,10 +157,9 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba container.requestFocus(); // Make focusable to receive back events - mControllers.taskbarActivityContext.setTaskbarWindowFocusable(true); + context.onPopupVisibilityChanged(true); container.setOnCloseCallback(() -> { - mControllers.taskbarActivityContext.getDragLayer().post( - () -> mControllers.taskbarActivityContext.setTaskbarWindowFocusable(false)); + context.getDragLayer().post(() -> context.onPopupVisibilityChanged(false)); container.setOnCloseCallback(null); }); @@ -207,7 +206,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba iconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x; iconShift.y = mIconLastTouchPos.y - mContext.getDeviceProfile().iconSizePx; - mControllers.taskbarDragController.startDragOnLongClick(sv, iconShift); + ((TaskbarDragController) ActivityContext.lookupContext( + v.getContext()).getDragController()).startDragOnLongClick(sv, iconShift); return false; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 335b637d8a..1d5fa4d47b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -51,11 +51,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba public static final int FLAG_STASHED_IN_APP_SETUP = 1 << 4; // setup wizard and AllSetActivity public static final int FLAG_STASHED_IN_APP_IME = 1 << 5; // IME is visible public static final int FLAG_IN_STASHED_LAUNCHER_STATE = 1 << 6; + public static final int FLAG_STASHED_IN_APP_ALL_APPS = 1 << 7; // All apps is visible. // If we're in an app and any of these flags are enabled, taskbar should be stashed. private static final int FLAGS_STASHED_IN_APP = FLAG_STASHED_IN_APP_MANUAL | FLAG_STASHED_IN_APP_PINNED | FLAG_STASHED_IN_APP_EMPTY | FLAG_STASHED_IN_APP_SETUP - | FLAG_STASHED_IN_APP_IME; + | FLAG_STASHED_IN_APP_IME | FLAG_STASHED_IN_APP_ALL_APPS; // 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. @@ -585,6 +586,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba str.add((flags & FLAG_STASHED_IN_APP_IME) != 0 ? "FLAG_STASHED_IN_APP_IME" : ""); str.add((flags & FLAG_IN_STASHED_LAUNCHER_STATE) != 0 ? "FLAG_IN_STASHED_LAUNCHER_STATE" : ""); + str.add((flags & FLAG_STASHED_IN_APP_ALL_APPS) != 0 ? "FLAG_STASHED_IN_APP_ALL_APPS" : ""); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 8b6831b8d6..153ed140b4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -306,7 +306,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar } public View.OnClickListener getAllAppsButtonClickListener() { - return v -> mControllers.taskbarAllAppsViewController.show(); + return v -> mControllers.taskbarAllAppsController.show(); } public View.OnLongClickListener getIconOnLongClickListener() { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java similarity index 83% rename from quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java rename to quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java index d6eb71641c..b36b9f1ffd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsContainerView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.taskbar; +package com.android.launcher3.taskbar.allapps; import android.content.Context; import android.util.AttributeSet; @@ -29,10 +29,7 @@ import com.android.launcher3.allapps.BaseAllAppsContainerView; import com.android.launcher3.allapps.search.SearchAdapterProvider; /** All apps container accessible from taskbar. */ -public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView { - public TaskbarAllAppsContainerView(Context context) { - this(context, null); - } +public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView { public TaskbarAllAppsContainerView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -44,8 +41,8 @@ public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView createMainAdapterProvider() { - // Task bar all apps does not yet support search, so this implementation is minimal. - return new SearchAdapterProvider(mActivityContext) { + // Taskbar all apps does not yet support search, so this implementation is minimal. + return new SearchAdapterProvider(mActivityContext) { @Override public boolean launchHighlightedItem() { return false; @@ -79,8 +76,7 @@ public class TaskbarAllAppsContainerView extends BaseAllAppsContainerView + * All apps has its own window and needs a window context. Some properties are delegated to the + * {@link TaskbarActivityContext} such as {@link DeviceProfile} and {@link PopupDataProvider}. + */ +class TaskbarAllAppsContext extends BaseTaskbarContext { + private final TaskbarActivityContext mTaskbarContext; + private final OnboardingPrefs mOnboardingPrefs; + + private final TaskbarAllAppsViewController mAllAppsViewController; + private final TaskbarDragController mDragController; + private final TaskbarAllAppsDragLayer mDragLayer; + private final TaskbarAllAppsContainerView mAppsView; + + TaskbarAllAppsContext( + TaskbarActivityContext taskbarContext, + TaskbarAllAppsController windowController, + TaskbarStashController taskbarStashController) { + super(taskbarContext.createWindowContext(TYPE_APPLICATION_OVERLAY, null)); + mTaskbarContext = taskbarContext; + mDeviceProfile = taskbarContext.getDeviceProfile(); + mDragController = new TaskbarDragController(this); + mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this)); + + mDragLayer = new TaskbarAllAppsDragLayer(this); + TaskbarAllAppsSlideInView slideInView = (TaskbarAllAppsSlideInView) mLayoutInflater.inflate( + R.layout.taskbar_all_apps, mDragLayer, false); + mAllAppsViewController = new TaskbarAllAppsViewController( + this, + slideInView, + windowController, + taskbarStashController); + mAppsView = slideInView.getAppsView(); + } + + TaskbarAllAppsViewController getAllAppsViewController() { + return mAllAppsViewController; + } + + @Override + public TaskbarDragController getDragController() { + return mDragController; + } + + @Override + public TaskbarAllAppsDragLayer getDragLayer() { + return mDragLayer; + } + + @Override + public TaskbarAllAppsContainerView getAppsView() { + return mAppsView; + } + + @Override + public OnboardingPrefs getOnboardingPrefs() { + return mOnboardingPrefs; + } + + @Override + public boolean isBindingItems() { + return mTaskbarContext.isBindingItems(); + } + + @Override + public View.OnClickListener getItemOnClickListener() { + return mTaskbarContext.getItemOnClickListener(); + } + + @Override + public PopupDataProvider getPopupDataProvider() { + return mTaskbarContext.getPopupDataProvider(); + } + + @Override + public DotInfo getDotInfoForItem(ItemInfo info) { + return mTaskbarContext.getDotInfoForItem(info); + } + + @Override + public void updateDeviceProfile(DeviceProfile dp) { + mDeviceProfile = dp; + dispatchDeviceProfileChanged(); + } + + @Override + public void onDragStart() {} + + @Override + public void onPopupVisibilityChanged(boolean isVisible) {} + + /** Root drag layer for this context. */ + private static class TaskbarAllAppsDragLayer extends BaseDragLayer { + + private TaskbarAllAppsDragLayer(Context context) { + super(context, null, 1); + setClipChildren(false); + recreateControllers(); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + mActivity.mAllAppsViewController.show(); + } + + @Override + public void recreateControllers() { + mControllers = new TouchController[]{mActivity.mDragController}; + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + if (event.getAction() == ACTION_UP && event.getKeyCode() == KEYCODE_BACK) { + AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity); + if (topView != null && topView.onBackPressed()) { + return true; + } + } + return super.dispatchKeyEvent(event); + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java new file mode 100644 index 0000000000..93024521d4 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java @@ -0,0 +1,199 @@ +/* + * 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.launcher3.taskbar.allapps; + +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; + +import android.content.Context; +import android.graphics.PixelFormat; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; + +import androidx.annotation.Nullable; + +import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; +import com.android.launcher3.appprediction.PredictionRowView; +import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.model.data.AppInfo; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.taskbar.TaskbarActivityContext; +import com.android.launcher3.taskbar.TaskbarControllers; + +import java.util.List; +import java.util.Optional; + +/** + * Handles the all apps overlay window initialization, updates, and its data. + *

+ * All apps is in an application overlay window instead of taskbar's navigation bar panel window, + * because a navigation bar panel is higher than UI components that all apps should be below such as + * the notification tray. + *

+ * The all apps window is created and destroyed upon opening and closing all apps, respectively. + * Application data may be bound while the window does not exist, so this controller will store + * the models for the next all apps session. + */ +public final class TaskbarAllAppsController implements OnDeviceProfileChangeListener { + + private static final String WINDOW_TITLE = "Taskbar All Apps"; + + private final TaskbarActivityContext mTaskbarContext; + private final TaskbarAllAppsProxyView mProxyView; + private final LayoutParams mLayoutParams; + + private TaskbarControllers mControllers; + /** Window context for all apps if it is open. */ + private @Nullable TaskbarAllAppsContext mAllAppsContext; + + // Application data models. + private AppInfo[] mApps; + private int mAppsModelFlags; + private List mPredictedApps; + + public TaskbarAllAppsController(TaskbarActivityContext context) { + mTaskbarContext = context; + mProxyView = new TaskbarAllAppsProxyView(mTaskbarContext); + mLayoutParams = createLayoutParams(); + } + + /** Initialize the controller. */ + public void init(TaskbarControllers controllers) { + if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + mControllers = controllers; + } + } + + /** Updates the current {@link AppInfo} instances. */ + public void setApps(AppInfo[] apps, int flags) { + if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + return; + } + + mApps = apps; + mAppsModelFlags = flags; + if (mAllAppsContext != null) { + mAllAppsContext.getAppsView().getAppsStore().setApps(mApps, mAppsModelFlags); + } + } + + /** Updates the current predictions. */ + public void setPredictedApps(List predictedApps) { + if (!FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + return; + } + + mPredictedApps = predictedApps; + if (mAllAppsContext != null) { + mAllAppsContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setPredictedApps(mPredictedApps); + } + } + + /** Opens the {@link TaskbarAllAppsContainerView} in a new window. */ + public void show() { + if (mProxyView.isOpen()) { + return; + } + mProxyView.show(); + + mAllAppsContext = new TaskbarAllAppsContext(mTaskbarContext, + this, + mControllers.taskbarStashController); + mAllAppsContext.getDragController().init(mControllers); + mTaskbarContext.addOnDeviceProfileChangeListener(this); + Optional.ofNullable(mAllAppsContext.getSystemService(WindowManager.class)) + .ifPresent(m -> m.addView(mAllAppsContext.getDragLayer(), mLayoutParams)); + + mAllAppsContext.getAppsView().getAppsStore().setApps(mApps, mAppsModelFlags); + mAllAppsContext.getAppsView().getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setPredictedApps(mPredictedApps); + } + + /** + * Removes the all apps window from the hierarchy. + *

+ * This method should be called after an exit animation finishes, if applicable. + */ + void closeWindow() { + mProxyView.close(false); + mTaskbarContext.removeOnDeviceProfileChangeListener(this); + Optional.ofNullable(mAllAppsContext) + .map(c -> c.getSystemService(WindowManager.class)) + .ifPresent(m -> m.removeView(mAllAppsContext.getDragLayer())); + mAllAppsContext = null; + } + + private LayoutParams createLayoutParams() { + LayoutParams layoutParams = new LayoutParams( + TYPE_APPLICATION_OVERLAY, + 0, + PixelFormat.TRANSLUCENT); + layoutParams.setTitle(WINDOW_TITLE); + layoutParams.gravity = Gravity.BOTTOM; + layoutParams.packageName = mTaskbarContext.getPackageName(); + layoutParams.setFitInsetsTypes(0); // Handled by container view. + layoutParams.setSystemApplicationOverlay(true); + return layoutParams; + } + + @Override + public void onDeviceProfileChanged(DeviceProfile dp) { + Optional.ofNullable(mAllAppsContext).ifPresent(c -> c.updateDeviceProfile(dp)); + } + + /** + * Proxy view connecting taskbar drag layer to the all apps window. + *

+ * The all apps view is in a separate window and has its own drag layer, but this proxy lets it + * behave as though its in the taskbar drag layer. For instance, when the taskbar closes all + * {@link AbstractFloatingView} instances, the all apps window will also close. + */ + private class TaskbarAllAppsProxyView extends AbstractFloatingView { + + private TaskbarAllAppsProxyView(Context context) { + super(context, null); + } + + private void show() { + mIsOpen = true; + mTaskbarContext.getDragLayer().addView(this); + } + + @Override + protected void handleClose(boolean animate) { + mTaskbarContext.getDragLayer().removeView(this); + Optional.ofNullable(mAllAppsContext) + .map(TaskbarAllAppsContext::getAllAppsViewController) + .ifPresent(v -> v.close(animate)); + } + + @Override + protected boolean isOfType(int type) { + return (type & TYPE_TASKBAR_ALL_APPS) != 0; + } + + @Override + public boolean onControllerInterceptTouchEvent(MotionEvent ev) { + return false; + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java similarity index 76% rename from quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java rename to quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java index 63690c4847..7accfbb6a6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsSlideInView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.taskbar; +package com.android.launcher3.taskbar.allapps; import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE; @@ -27,14 +27,17 @@ import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.views.AbstractSlideInView; +import java.util.Optional; + /** Wrapper for taskbar all apps with slide-in behavior. */ public class TaskbarAllAppsSlideInView extends - AbstractSlideInView implements Insettable { + AbstractSlideInView implements Insettable { - private static final int DEFAULT_OPEN_DURATION = 500; - private static final int DEFAULT_CLOSE_DURATION = 200; + static final int DEFAULT_OPEN_DURATION = 500; + static final int DEFAULT_CLOSE_DURATION = 200; private TaskbarAllAppsContainerView mAppsView; + private OnCloseListener mOnCloseBeginListener; public TaskbarAllAppsSlideInView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -46,7 +49,7 @@ public class TaskbarAllAppsSlideInView extends } /** Opens the all apps view. */ - public void show() { + void show() { if (mIsOpen || mOpenCloseAnimator.isRunning()) { return; } @@ -60,12 +63,18 @@ public class TaskbarAllAppsSlideInView extends } /** The apps container inside this view. */ - public TaskbarAllAppsContainerView getAppsView() { + TaskbarAllAppsContainerView getAppsView() { return mAppsView; } + /** Callback invoked when the view is beginning to close (e.g. close animation is started). */ + void setOnCloseBeginListener(OnCloseListener onCloseBeginListener) { + mOnCloseBeginListener = onCloseBeginListener; + } + @Override protected void handleClose(boolean animate) { + Optional.ofNullable(mOnCloseBeginListener).ifPresent(OnCloseListener::onSlideInViewClosed); handleClose(animate, DEFAULT_CLOSE_DURATION); } @@ -81,6 +90,12 @@ public class TaskbarAllAppsSlideInView extends mContent = mAppsView; } + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + setTranslationShift(mTranslationShift); + } + @Override protected int getScrimColor(Context context) { return context.getColor(R.color.widgets_picker_scrim); diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java new file mode 100644 index 0000000000..c1abaaca06 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java @@ -0,0 +1,91 @@ +/* + * 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.launcher3.taskbar.allapps; + +import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_STASHED_IN_APP_ALL_APPS; +import static com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView.DEFAULT_CLOSE_DURATION; +import static com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView.DEFAULT_OPEN_DURATION; +import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; + +import com.android.launcher3.appprediction.AppsDividerView; +import com.android.launcher3.appprediction.PredictionRowView; +import com.android.launcher3.taskbar.TaskbarStashController; + +/** + * Handles the {@link TaskbarAllAppsContainerView} behavior and synchronizes its transitions with + * taskbar stashing. + */ +final class TaskbarAllAppsViewController { + + private final TaskbarAllAppsContext mContext; + private final TaskbarAllAppsSlideInView mSlideInView; + private final TaskbarAllAppsContainerView mAppsView; + private final TaskbarStashController mTaskbarStashController; + + TaskbarAllAppsViewController( + TaskbarAllAppsContext context, + TaskbarAllAppsSlideInView slideInView, + TaskbarAllAppsController windowController, + TaskbarStashController taskbarStashController) { + + mContext = context; + mSlideInView = slideInView; + mAppsView = mSlideInView.getAppsView(); + mTaskbarStashController = taskbarStashController; + + setUpIconLongClick(); + setUpAppDivider(); + setUpTaskbarStashing(); + mSlideInView.addOnCloseListener(windowController::closeWindow); + } + + /** Starts the {@link TaskbarAllAppsSlideInView} enter transition. */ + void show() { + mSlideInView.show(); + } + + /** Closes the {@link TaskbarAllAppsSlideInView}. */ + void close(boolean animate) { + mSlideInView.close(animate); + } + + private void setUpIconLongClick() { + mAppsView.setOnIconLongClickListener( + mContext.getDragController()::startDragOnLongClick); + mAppsView.getFloatingHeaderView() + .findFixedRowByType(PredictionRowView.class) + .setOnIconLongClickListener( + mContext.getDragController()::startDragOnLongClick); + } + + private void setUpAppDivider() { + mAppsView.getFloatingHeaderView() + .findFixedRowByType(AppsDividerView.class) + .setShowAllAppsLabel(!mContext.getOnboardingPrefs().hasReachedMaxCount( + ALL_APPS_VISITED_COUNT)); + mContext.getOnboardingPrefs().incrementEventCount(ALL_APPS_VISITED_COUNT); + } + + private void setUpTaskbarStashing() { + mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_APP_ALL_APPS, true); + mTaskbarStashController.applyState(DEFAULT_OPEN_DURATION); + mSlideInView.setOnCloseBeginListener(() -> { + mTaskbarStashController.updateStateForFlag( + FLAG_STASHED_IN_APP_ALL_APPS, false); + mTaskbarStashController.applyState(DEFAULT_CLOSE_DURATION); + }); + } +} From 0a7ff8780fe315c805cfc5ccfa44c5bc230aa165 Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Thu, 10 Feb 2022 13:45:02 +0000 Subject: [PATCH 7/9] Create new logic for grid migration Fixes 217564863 Test: manual, changing grids from Wallpaper & Style and checking against spec Change-Id: I94cf77111b37810282527f1a212b6e4126d3eba1 --- .../launcher3/config/FeatureFlags.java | 4 + .../launcher3/model/DeviceGridState.java | 31 +- .../model/GridSizeMigrationTaskV2.java | 32 +- .../model/GridSizeMigrationTaskV2Test.java | 278 ---------- .../model/GridSizeMigrationTaskV2Test.kt | 500 ++++++++++++++++++ 5 files changed, 552 insertions(+), 293 deletions(-) delete mode 100644 tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java create mode 100644 tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.kt diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index a949e11155..6116c66fe9 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -256,6 +256,10 @@ public final class FeatureFlags { "ENABLE_SPLIT_FROM_WORKSPACE", true, "Enable initiating split screen from workspace."); + public static final BooleanFlag ENABLE_NEW_MIGRATION_LOGIC = getDebugFlag( + "ENABLE_NEW_MIGRATION_LOGIC", true, + "Enable the new grid migration logic, keeping pages when src < dest"); + public static void initialize(Context context) { synchronized (sDebugFlags) { for (DebugFlag flag : sDebugFlags) { diff --git a/src/com/android/launcher3/model/DeviceGridState.java b/src/com/android/launcher3/model/DeviceGridState.java index 08c3149c2d..3e49d79138 100644 --- a/src/com/android/launcher3/model/DeviceGridState.java +++ b/src/com/android/launcher3/model/DeviceGridState.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * Utility class representing persisted grid properties. */ -public class DeviceGridState { +public class DeviceGridState implements Comparable { public static final String KEY_WORKSPACE_SIZE = "migration_src_workspace_size"; public static final String KEY_HOTSEAT_COUNT = "migration_src_hotseat_count"; @@ -84,16 +84,16 @@ public class DeviceGridState { */ public LauncherEvent getWorkspaceSizeEvent() { if (!TextUtils.isEmpty(mGridSizeString)) { - switch (mGridSizeString.charAt(0)) { - case '6': + switch (getColumns()) { + case 6: return LAUNCHER_GRID_SIZE_6; - case '5': + case 5: return LAUNCHER_GRID_SIZE_5; - case '4': + case 4: return LAUNCHER_GRID_SIZE_4; - case '3': + case 3: return LAUNCHER_GRID_SIZE_3; - case '2': + case 2: return LAUNCHER_GRID_SIZE_2; } } @@ -119,4 +119,21 @@ public class DeviceGridState { return mNumHotseat == other.mNumHotseat && Objects.equals(mGridSizeString, other.mGridSizeString); } + + public Integer getColumns() { + return Integer.parseInt(String.valueOf(mGridSizeString.charAt(0))); + } + + public Integer getRows() { + return Integer.parseInt(String.valueOf(mGridSizeString.charAt(2))); + } + + @Override + public int compareTo(DeviceGridState other) { + Integer size = getColumns() * getRows(); + Integer otherSize = other.getColumns() * other.getRows(); + + return size.compareTo(otherSize); + } + } diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java index ca680b72c6..74b0a6fd40 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java @@ -38,6 +38,7 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings; import com.android.launcher3.Utilities; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.LauncherPreviewRenderer; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.pm.InstallSessionHelper; @@ -225,13 +226,21 @@ public class GridSizeMigrationTaskV2 { screens.add(screenId); } + boolean preservePages = false; + if (screens.isEmpty() && FeatureFlags.ENABLE_NEW_MIGRATION_LOGIC.get()) { + DeviceGridState srcDeviceState = new DeviceGridState(mContext); + DeviceGridState destDeviceState = new DeviceGridState(idp); + preservePages = destDeviceState.compareTo(srcDeviceState) >= 0 + && destDeviceState.getColumns() - srcDeviceState.getColumns() <= 2; + } + // Then we place the items on the screens for (int screenId : screens) { if (DEBUG) { Log.d(TAG, "Migrating " + screenId); } GridPlacementSolution workspaceSolution = new GridPlacementSolution(mDb, mSrcReader, - mDestReader, mContext, screenId, mTrgX, mTrgY, mWorkspaceDiff); + mDestReader, mContext, screenId, mTrgX, mTrgY, mWorkspaceDiff, false); workspaceSolution.find(); if (mWorkspaceDiff.isEmpty()) { break; @@ -243,10 +252,12 @@ public class GridSizeMigrationTaskV2 { int screenId = mDestReader.mLastScreenId + 1; while (!mWorkspaceDiff.isEmpty()) { GridPlacementSolution workspaceSolution = new GridPlacementSolution(mDb, mSrcReader, - mDestReader, mContext, screenId, mTrgX, mTrgY, mWorkspaceDiff); + mDestReader, mContext, screenId, mTrgX, mTrgY, mWorkspaceDiff, + preservePages); workspaceSolution.find(); screenId++; } + return true; } @@ -363,13 +374,15 @@ public class GridSizeMigrationTaskV2 { private final int mScreenId; private final int mTrgX; private final int mTrgY; - private final List mItemsToPlace; + private final List mSortedItemsToPlace; + private final boolean mMatchingScreenIdOnly; private int mNextStartX; private int mNextStartY; GridPlacementSolution(SQLiteDatabase db, DbReader srcReader, DbReader destReader, - Context context, int screenId, int trgX, int trgY, List itemsToPlace) { + Context context, int screenId, int trgX, int trgY, List sortedItemsToPlace, + boolean matchingScreenIdOnly) { mDb = db; mSrcReader = srcReader; mDestReader = destReader; @@ -386,13 +399,16 @@ public class GridSizeMigrationTaskV2 { mOccupied.markCells(entry, true); } } - mItemsToPlace = itemsToPlace; + mSortedItemsToPlace = sortedItemsToPlace; + mMatchingScreenIdOnly = matchingScreenIdOnly; } public void find() { - Iterator iterator = mItemsToPlace.iterator(); + Iterator iterator = mSortedItemsToPlace.iterator(); while (iterator.hasNext()) { final DbEntry entry = iterator.next(); + if (mMatchingScreenIdOnly && entry.screenId < mScreenId) continue; + if (mMatchingScreenIdOnly && entry.screenId > mScreenId) break; if (entry.minSpanX > mTrgX || entry.minSpanY > mTrgY) { iterator.remove(); continue; @@ -494,7 +510,7 @@ public class GridSizeMigrationTaskV2 { private final SQLiteDatabase mDb; private final String mTableName; private final Context mContext; - private final HashSet mValidPackages; + private final Set mValidPackages; private int mLastScreenId = -1; private final ArrayList mHotseatEntries = new ArrayList<>(); @@ -503,7 +519,7 @@ public class GridSizeMigrationTaskV2 { new ArrayMap<>(); DbReader(SQLiteDatabase db, String tableName, Context context, - HashSet validPackages) { + Set validPackages) { mDb = db; mTableName = tableName; mContext = context; diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java deleted file mode 100644 index 005389e5bb..0000000000 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java +++ /dev/null @@ -1,278 +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.launcher3.model; - -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; -import static com.android.launcher3.LauncherSettings.Favorites.TMP_CONTENT_URI; -import static com.android.launcher3.provider.LauncherDbUtils.dropTable; -import static com.android.launcher3.util.LauncherModelHelper.APP_ICON; -import static com.android.launcher3.util.LauncherModelHelper.DESKTOP; -import static com.android.launcher3.util.LauncherModelHelper.HOTSEAT; -import static com.android.launcher3.util.LauncherModelHelper.SHORTCUT; -import static com.android.launcher3.util.LauncherModelHelper.TEST_PACKAGE; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.graphics.Point; -import android.os.Process; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.filters.SmallTest; - -import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.pm.UserCache; -import com.android.launcher3.util.LauncherModelHelper; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.HashMap; -import java.util.HashSet; - -/** Unit tests for {@link GridSizeMigrationTaskV2} */ -@SmallTest -@RunWith(AndroidJUnit4.class) -public class GridSizeMigrationTaskV2Test { - - private LauncherModelHelper mModelHelper; - private Context mContext; - private SQLiteDatabase mDb; - - private HashSet mValidPackages; - private InvariantDeviceProfile mIdp; - - private final String testPackage1 = "com.android.launcher3.validpackage1"; - private final String testPackage2 = "com.android.launcher3.validpackage2"; - private final String testPackage3 = "com.android.launcher3.validpackage3"; - private final String testPackage4 = "com.android.launcher3.validpackage4"; - private final String testPackage5 = "com.android.launcher3.validpackage5"; - private final String testPackage6 = "com.android.launcher3.validpackage6"; - private final String testPackage7 = "com.android.launcher3.validpackage7"; - private final String testPackage8 = "com.android.launcher3.validpackage8"; - private final String testPackage9 = "com.android.launcher3.validpackage9"; - private final String testPackage10 = "com.android.launcher3.validpackage10"; - - @Before - public void setUp() { - mModelHelper = new LauncherModelHelper(); - mContext = mModelHelper.sandboxContext; - mDb = mModelHelper.provider.getDb(); - - mValidPackages = new HashSet<>(); - mValidPackages.add(TEST_PACKAGE); - mValidPackages.add(testPackage1); - mValidPackages.add(testPackage2); - mValidPackages.add(testPackage3); - mValidPackages.add(testPackage4); - mValidPackages.add(testPackage5); - mValidPackages.add(testPackage6); - mValidPackages.add(testPackage7); - mValidPackages.add(testPackage8); - mValidPackages.add(testPackage9); - mValidPackages.add(testPackage10); - - mIdp = InvariantDeviceProfile.INSTANCE.get(mContext); - - long userSerial = UserCache.INSTANCE.get(mContext).getSerialNumberForUser( - Process.myUserHandle()); - dropTable(mDb, LauncherSettings.Favorites.TMP_TABLE); - LauncherSettings.Favorites.addTableToDb(mDb, userSerial, false, - LauncherSettings.Favorites.TMP_TABLE); - } - - @After - public void tearDown() { - mModelHelper.destroy(); - } - - @Test - public void testMigration() throws Exception { - int[] srcHotseatItems = { - mModelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI), - mModelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI), - -1, - mModelHelper.addItem(SHORTCUT, 3, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI), - mModelHelper.addItem(APP_ICON, 4, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI), - }; - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage5, 5, TMP_CONTENT_URI); - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 3, testPackage6, 6, TMP_CONTENT_URI); - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 1, testPackage8, 8, TMP_CONTENT_URI); - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 2, testPackage9, 9, TMP_CONTENT_URI); - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 3, testPackage10, 10, TMP_CONTENT_URI); - - int[] destHotseatItems = { - -1, - mModelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2), - -1, - }; - mModelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage7); - - mIdp.numDatabaseHotseatIcons = 4; - mIdp.numColumns = 4; - mIdp.numRows = 4; - GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TMP_TABLE, mContext, mValidPackages); - GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages); - GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader, - destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows)); - task.migrate(mIdp); - - // Check hotseat items - Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI, - new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT}, - "container=" + CONTAINER_HOTSEAT, null, LauncherSettings.Favorites.SCREEN, null); - assertEquals(c.getCount(), mIdp.numDatabaseHotseatIcons); - int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN); - int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 0); - assertTrue(c.getString(intentIndex).contains(testPackage1)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 1); - assertTrue(c.getString(intentIndex).contains(testPackage2)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 2); - assertTrue(c.getString(intentIndex).contains(testPackage3)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 3); - assertTrue(c.getString(intentIndex).contains(testPackage4)); - c.close(); - - // Check workspace items - c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI, - new String[]{LauncherSettings.Favorites.CELLX, LauncherSettings.Favorites.CELLY, - LauncherSettings.Favorites.INTENT}, - "container=" + CONTAINER_DESKTOP, null, null, null); - intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT); - int cellXIndex = c.getColumnIndex(LauncherSettings.Favorites.CELLX); - int cellYIndex = c.getColumnIndex(LauncherSettings.Favorites.CELLY); - - HashMap locMap = new HashMap<>(); - while (c.moveToNext()) { - locMap.put( - Intent.parseUri(c.getString(intentIndex), 0).getPackage(), - new Point(c.getInt(cellXIndex), c.getInt(cellYIndex))); - } - c.close(); - - assertEquals(locMap.size(), 6); - assertEquals(new Point(0, 2), locMap.get(testPackage8)); - assertEquals(new Point(0, 3), locMap.get(testPackage6)); - assertEquals(new Point(1, 3), locMap.get(testPackage10)); - assertEquals(new Point(2, 3), locMap.get(testPackage5)); - assertEquals(new Point(3, 3), locMap.get(testPackage9)); - } - - @Test - public void migrateToLargerHotseat() { - int[] srcHotseatItems = { - mModelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI), - mModelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI), - mModelHelper.addItem(APP_ICON, 2, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI), - mModelHelper.addItem(SHORTCUT, 3, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI), - }; - - int numSrcDatabaseHotseatIcons = srcHotseatItems.length; - mIdp.numDatabaseHotseatIcons = 6; - mIdp.numColumns = 4; - mIdp.numRows = 4; - GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TMP_TABLE, mContext, mValidPackages); - GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages); - GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader, - destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows)); - task.migrate(mIdp); - - // Check hotseat items - Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI, - new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT}, - "container=" + CONTAINER_HOTSEAT, null, LauncherSettings.Favorites.SCREEN, null); - assertEquals(c.getCount(), numSrcDatabaseHotseatIcons); - int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN); - int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 0); - assertTrue(c.getString(intentIndex).contains(testPackage1)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 1); - assertTrue(c.getString(intentIndex).contains(testPackage2)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 2); - assertTrue(c.getString(intentIndex).contains(testPackage3)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 3); - assertTrue(c.getString(intentIndex).contains(testPackage4)); - - c.close(); - } - - @Test - public void migrateFromLargerHotseat() { - int[] srcHotseatItems = { - mModelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI), - -1, - mModelHelper.addItem(SHORTCUT, 2, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI), - mModelHelper.addItem(APP_ICON, 3, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI), - mModelHelper.addItem(SHORTCUT, 4, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI), - mModelHelper.addItem(APP_ICON, 5, HOTSEAT, 0, 0, testPackage5, 5, TMP_CONTENT_URI), - }; - - mIdp.numDatabaseHotseatIcons = 4; - mIdp.numColumns = 4; - mIdp.numRows = 4; - GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TMP_TABLE, mContext, mValidPackages); - GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb, - LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages); - GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader, - destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows)); - task.migrate(mIdp); - - // Check hotseat items - Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI, - new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT}, - "container=" + CONTAINER_HOTSEAT, null, LauncherSettings.Favorites.SCREEN, null); - assertEquals(c.getCount(), mIdp.numDatabaseHotseatIcons); - int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN); - int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 0); - assertTrue(c.getString(intentIndex).contains(testPackage1)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 1); - assertTrue(c.getString(intentIndex).contains(testPackage2)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 2); - assertTrue(c.getString(intentIndex).contains(testPackage3)); - c.moveToNext(); - assertEquals(c.getInt(screenIndex), 3); - assertTrue(c.getString(intentIndex).contains(testPackage4)); - - c.close(); - } -} diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.kt b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.kt new file mode 100644 index 0000000000..239e092a01 --- /dev/null +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.kt @@ -0,0 +1,500 @@ +/* + * 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.launcher3.model + +import android.content.Context +import android.content.Intent +import android.database.sqlite.SQLiteDatabase +import android.graphics.Point +import android.os.Process +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.LauncherFiles +import com.android.launcher3.LauncherSettings.Favorites.* +import com.android.launcher3.config.FeatureFlags +import com.android.launcher3.model.GridSizeMigrationTaskV2.DbReader +import com.android.launcher3.pm.UserCache +import com.android.launcher3.provider.LauncherDbUtils +import com.android.launcher3.util.LauncherModelHelper +import com.android.launcher3.util.LauncherModelHelper.* +import com.google.common.truth.Truth.assertThat +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +/** Unit tests for [GridSizeMigrationTaskV2] */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class GridSizeMigrationTaskV2Test { + private lateinit var modelHelper: LauncherModelHelper + private lateinit var context: Context + private lateinit var db: SQLiteDatabase + private lateinit var validPackages: Set + private lateinit var idp: InvariantDeviceProfile + private val testPackage1 = "com.android.launcher3.validpackage1" + private val testPackage2 = "com.android.launcher3.validpackage2" + private val testPackage3 = "com.android.launcher3.validpackage3" + private val testPackage4 = "com.android.launcher3.validpackage4" + private val testPackage5 = "com.android.launcher3.validpackage5" + private val testPackage6 = "com.android.launcher3.validpackage6" + private val testPackage7 = "com.android.launcher3.validpackage7" + private val testPackage8 = "com.android.launcher3.validpackage8" + private val testPackage9 = "com.android.launcher3.validpackage9" + private val testPackage10 = "com.android.launcher3.validpackage10" + + @Before + fun setUp() { + modelHelper = LauncherModelHelper() + context = modelHelper.sandboxContext + db = modelHelper.provider.db + + validPackages = setOf( + TEST_PACKAGE, + testPackage1, + testPackage2, + testPackage3, + testPackage4, + testPackage5, + testPackage6, + testPackage7, + testPackage8, + testPackage9, + testPackage10 + ) + + idp = InvariantDeviceProfile.INSTANCE[context] + val userSerial = UserCache.INSTANCE[context].getSerialNumberForUser(Process.myUserHandle()) + LauncherDbUtils.dropTable(db, TMP_TABLE) + addTableToDb(db, userSerial, false, TMP_TABLE) + } + + @After + fun tearDown() { + modelHelper.destroy() + } + + /** + * Old migration logic, should be modified once [FeatureFlags.ENABLE_NEW_MIGRATION_LOGIC] is + * not needed anymore + */ + @Test + @Throws(Exception::class) + fun testMigration() { + // Src Hotseat icons + modelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI) + modelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI) + modelHelper.addItem(SHORTCUT, 3, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 4, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI) + // Src grid icons + modelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage5, 5, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 3, testPackage6, 6, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 1, testPackage8, 8, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 2, testPackage9, 9, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 4, 3, testPackage10, 10, TMP_CONTENT_URI) + + // Dest hotseat icons + modelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2) + // Dest grid icons + modelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage7) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 4 + idp.numRows = 4 + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Check hotseat items + var c = context.contentResolver.query( + CONTENT_URI, + arrayOf(SCREEN, INTENT), + "container=$CONTAINER_HOTSEAT", + null, + SCREEN, + null + ) ?: throw IllegalStateException() + + assertThat(c.count).isEqualTo(idp.numDatabaseHotseatIcons) + + val screenIndex = c.getColumnIndex(SCREEN) + var intentIndex = c.getColumnIndex(INTENT) + c.moveToNext() + assertThat(c.getInt(screenIndex).toLong()).isEqualTo(0) + assertThat(c.getString(intentIndex)).contains(testPackage1) + c.moveToNext() + assertThat(c.getInt(screenIndex).toLong()).isEqualTo(1) + assertThat(c.getString(intentIndex)).contains(testPackage2) + c.moveToNext() + assertThat(c.getInt(screenIndex).toLong()).isEqualTo(2) + assertThat(c.getString(intentIndex)).contains(testPackage3) + c.moveToNext() + assertThat(c.getInt(screenIndex).toLong()).isEqualTo(3) + assertThat(c.getString(intentIndex)).contains(testPackage4) + c.close() + + // Check workspace items + c = context.contentResolver.query( + CONTENT_URI, + arrayOf(CELLX, CELLY, INTENT), + "container=$CONTAINER_DESKTOP", + null, + null, + null + ) ?: throw IllegalStateException() + + intentIndex = c.getColumnIndex(INTENT) + val cellXIndex = c.getColumnIndex(CELLX) + val cellYIndex = c.getColumnIndex(CELLY) + val locMap = HashMap() + while (c.moveToNext()) { + locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = + Point(c.getInt(cellXIndex), c.getInt(cellYIndex)) + } + c.close() + assertThat(locMap.size.toLong()).isEqualTo(6) + assertThat(locMap[testPackage8]).isEqualTo(Point(0, 2)) + assertThat(locMap[testPackage6]).isEqualTo(Point(0, 3)) + assertThat(locMap[testPackage10]).isEqualTo(Point(1, 3)) + assertThat(locMap[testPackage7]).isEqualTo(Point(2, 2)) + assertThat(locMap[testPackage5]).isEqualTo(Point(2, 3)) + assertThat(locMap[testPackage9]).isEqualTo(Point(3, 3)) + } + + @Test + fun migrateToLargerHotseat() { + val srcHotseatItems = intArrayOf( + modelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI), + modelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI), + modelHelper.addItem(APP_ICON, 2, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI), + modelHelper.addItem(SHORTCUT, 3, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI) + ) + val numSrcDatabaseHotseatIcons = srcHotseatItems.size + idp.numDatabaseHotseatIcons = 6 + idp.numColumns = 4 + idp.numRows = 4 + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Check hotseat items + val c = context.contentResolver.query( + CONTENT_URI, + arrayOf(SCREEN, INTENT), + "container=$CONTAINER_HOTSEAT", + null, + SCREEN, + null + ) ?: throw IllegalStateException() + + assertThat(c.count.toLong()).isEqualTo(numSrcDatabaseHotseatIcons.toLong()) + val screenIndex = c.getColumnIndex(SCREEN) + val intentIndex = c.getColumnIndex(INTENT) + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(0) + assertThat(c.getString(intentIndex)).contains(testPackage1) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(1) + assertThat(c.getString(intentIndex)).contains(testPackage2) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(2) + assertThat(c.getString(intentIndex)).contains(testPackage3) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(3) + assertThat(c.getString(intentIndex)).contains(testPackage4) + + c.close() + } + + @Test + fun migrateFromLargerHotseat() { + modelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI) + modelHelper.addItem(SHORTCUT, 2, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 3, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI) + modelHelper.addItem(SHORTCUT, 4, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 5, HOTSEAT, 0, 0, testPackage5, 5, TMP_CONTENT_URI) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 4 + idp.numRows = 4 + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Check hotseat items + val c = context.contentResolver.query( + CONTENT_URI, + arrayOf(SCREEN, INTENT), + "container=$CONTAINER_HOTSEAT", + null, + SCREEN, + null + ) ?: throw IllegalStateException() + + assertThat(c.count.toLong()).isEqualTo(idp.numDatabaseHotseatIcons.toLong()) + val screenIndex = c.getColumnIndex(SCREEN) + val intentIndex = c.getColumnIndex(INTENT) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(0) + assertThat(c.getString(intentIndex)).contains(testPackage1) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(1) + assertThat(c.getString(intentIndex)).contains(testPackage2) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(2) + assertThat(c.getString(intentIndex)).contains(testPackage3) + + c.moveToNext() + assertThat(c.getInt(screenIndex)).isEqualTo(3) + assertThat(c.getString(intentIndex)).contains(testPackage4) + + c.close() + } + + /** + * Migrating from a smaller grid to a large one should keep the pages + * if the column difference is less than 2 + */ + @Test + @Throws(Exception::class) + fun migrateFromSmallerGridSmallDifference() { + enableNewMigrationLogic("4,4") + + // Setup src grid + modelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage1, 5, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 3, testPackage2, 6, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 3, 1, testPackage3, 7, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 3, 2, testPackage4, 8, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 2, DESKTOP, 3, 3, testPackage5, 9, TMP_CONTENT_URI) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 6 + idp.numRows = 5 + + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Get workspace items + val c = context.contentResolver.query( + CONTENT_URI, + arrayOf(INTENT, SCREEN), + "container=$CONTAINER_DESKTOP", + null, + null, + null + ) ?: throw IllegalStateException() + val intentIndex = c.getColumnIndex(INTENT) + val screenIndex = c.getColumnIndex(SCREEN) + + // Get in which screen the icon is + val locMap = HashMap() + while (c.moveToNext()) { + locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = + c.getInt(screenIndex) + } + c.close() + assertThat(locMap.size).isEqualTo(5) + assertThat(locMap[testPackage1]).isEqualTo(0) + assertThat(locMap[testPackage2]).isEqualTo(0) + assertThat(locMap[testPackage3]).isEqualTo(1) + assertThat(locMap[testPackage4]).isEqualTo(1) + assertThat(locMap[testPackage5]).isEqualTo(2) + + disableNewMigrationLogic() + } + + /** + * Migrating from a smaller grid to a large one should reflow the pages + * if the column difference is more than 2 + */ + @Test + @Throws(Exception::class) + fun migrateFromSmallerGridBigDifference() { + enableNewMigrationLogic("2,2") + + // Setup src grid + modelHelper.addItem(APP_ICON, 0, DESKTOP, 0, 1, testPackage1, 5, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 1, 1, testPackage2, 6, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 0, 0, testPackage3, 7, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 1, 0, testPackage4, 8, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 2, DESKTOP, 0, 0, testPackage5, 9, TMP_CONTENT_URI) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 5 + idp.numRows = 5 + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Get workspace items + val c = context.contentResolver.query( + CONTENT_URI, + arrayOf(INTENT, SCREEN), + "container=$CONTAINER_DESKTOP", + null, + null, + null + ) ?: throw IllegalStateException() + + val intentIndex = c.getColumnIndex(INTENT) + val screenIndex = c.getColumnIndex(SCREEN) + + // Get in which screen the icon is + val locMap = HashMap() + while (c.moveToNext()) { + locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = + c.getInt(screenIndex) + } + c.close() + + // All icons fit the first screen + assertThat(locMap.size).isEqualTo(5) + assertThat(locMap[testPackage1]).isEqualTo(0) + assertThat(locMap[testPackage2]).isEqualTo(0) + assertThat(locMap[testPackage3]).isEqualTo(0) + assertThat(locMap[testPackage4]).isEqualTo(0) + assertThat(locMap[testPackage5]).isEqualTo(0) + disableNewMigrationLogic() + } + + /** + * Migrating from a larger grid to a smaller, we reflow from page 0 + */ + @Test + @Throws(Exception::class) + fun migrateFromLargerGrid() { + enableNewMigrationLogic("5,5") + + // Setup src grid + modelHelper.addItem(APP_ICON, 0, DESKTOP, 0, 1, testPackage1, 5, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 0, DESKTOP, 1, 1, testPackage2, 6, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 0, 0, testPackage3, 7, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 1, DESKTOP, 1, 0, testPackage4, 8, TMP_CONTENT_URI) + modelHelper.addItem(APP_ICON, 2, DESKTOP, 0, 0, testPackage5, 9, TMP_CONTENT_URI) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 4 + idp.numRows = 4 + val srcReader = DbReader(db, TMP_TABLE, context, validPackages) + val destReader = DbReader(db, TABLE_NAME, context, validPackages) + val task = GridSizeMigrationTaskV2( + context, + db, + srcReader, + destReader, + idp.numDatabaseHotseatIcons, + Point(idp.numColumns, idp.numRows) + ) + task.migrate(idp) + + // Get workspace items + val c = context.contentResolver.query( + CONTENT_URI, + arrayOf(INTENT, SCREEN), + "container=$CONTAINER_DESKTOP", + null, + null, + null + ) ?: throw IllegalStateException() + val intentIndex = c.getColumnIndex(INTENT) + val screenIndex = c.getColumnIndex(SCREEN) + + // Get in which screen the icon is + val locMap = HashMap() + while (c.moveToNext()) { + locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = + c.getInt(screenIndex) + } + c.close() + + // All icons fit the first screen + assertThat(locMap.size).isEqualTo(5) + assertThat(locMap[testPackage1]).isEqualTo(0) + assertThat(locMap[testPackage2]).isEqualTo(0) + assertThat(locMap[testPackage3]).isEqualTo(0) + assertThat(locMap[testPackage4]).isEqualTo(0) + assertThat(locMap[testPackage5]).isEqualTo(0) + + disableNewMigrationLogic() + } + + private fun enableNewMigrationLogic(srcGridSize: String) { + context.getSharedPreferences(FeatureFlags.FLAGS_PREF_NAME, Context.MODE_PRIVATE) + .edit() + .putBoolean(FeatureFlags.ENABLE_NEW_MIGRATION_LOGIC.key, true) + .commit() + context.getSharedPreferences(LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE) + .edit() + .putString(DeviceGridState.KEY_WORKSPACE_SIZE, srcGridSize) + .commit() + FeatureFlags.initialize(context) + } + + private fun disableNewMigrationLogic() { + context.getSharedPreferences(FeatureFlags.FLAGS_PREF_NAME, Context.MODE_PRIVATE) + .edit() + .putBoolean(FeatureFlags.ENABLE_NEW_MIGRATION_LOGIC.key, false) + .commit() + } +} \ No newline at end of file From b8c22e1155650d6f01e736bd3cf1a5ba46836e07 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 14 Feb 2022 18:35:58 +0000 Subject: [PATCH 8/9] Tune AllApps bottom sheet VisD and motion - Make AllApps bottom sheet solid and appears from bottom - Teleport AllApps bottom sheet as user drag to reduce drag range - Consider teleport interpolation for state transition sdetection - Tuned workspace motions for AllApps bottom sheet (no translate, shrink) - Add portrait vertical translate for tablet portrait including taskbar AllApps - Updated bottom sheet handle and created common variables for other bottom sheets Bug: 208599118 Test: manual on tablet AllApps, taskbar Allapps and handheld AllApps Change-Id: I69dba5f155914cd012cc8ef3be1ef71fb2be5a40 --- .../allapps/TaskbarAllAppsSlideInView.java | 32 +++++++++++++++++-- .../uioverrides/states/AllAppsState.java | 13 ++++++-- .../PortraitStatesTouchController.java | 25 +++++++++++---- .../bg_rounded_corner_bottom_sheet.xml | 2 +- ...bg_rounded_corner_bottom_sheet_handle.xml} | 23 +++++-------- .../all_apps_bottom_sheet_background.xml | 14 ++++---- res/layout/widgets_bottom_sheet_content.xml | 10 +++--- res/layout/widgets_full_sheet.xml | 8 ++--- res/values-sw600dp/dimens.xml | 3 +- res/values-sw720dp-land/dimens.xml | 20 ++++++++++++ res/values-sw720dp/dimens.xml | 3 +- res/values/dimens.xml | 10 +++++- src/com/android/launcher3/DeviceProfile.java | 10 ++++-- .../allapps/AllAppsTransitionController.java | 21 ++++++------ .../allapps/BaseAllAppsContainerView.java | 9 +++++- .../allapps/LauncherAllAppsContainerView.java | 9 ------ .../search/AppsSearchContainerLayout.java | 2 +- .../android/launcher3/anim/Interpolators.java | 17 ++++++++++ .../launcher3/anim/PendingAnimation.java | 7 ++++ .../touch/AllAppsSwipeController.java | 23 +++++++++---- .../launcher3/views/AbstractSlideInView.java | 26 ++++++++++++--- .../uioverrides/states/AllAppsState.java | 11 +++++-- 22 files changed, 214 insertions(+), 84 deletions(-) rename res/drawable/{bg_all_apps_bottom_sheet.xml => bg_rounded_corner_bottom_sheet_handle.xml} (55%) create mode 100644 res/values-sw720dp-land/dimens.xml diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java index 7accfbb6a6..02aa3f208b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java @@ -23,6 +23,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.MotionEvent; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.views.AbstractSlideInView; @@ -30,14 +31,14 @@ import com.android.launcher3.views.AbstractSlideInView; import java.util.Optional; /** Wrapper for taskbar all apps with slide-in behavior. */ -public class TaskbarAllAppsSlideInView extends - AbstractSlideInView implements Insettable { - +public class TaskbarAllAppsSlideInView extends AbstractSlideInView + implements Insettable, DeviceProfile.OnDeviceProfileChangeListener { static final int DEFAULT_OPEN_DURATION = 500; static final int DEFAULT_CLOSE_DURATION = 200; private TaskbarAllAppsContainerView mAppsView; private OnCloseListener mOnCloseBeginListener; + private float mShiftRange; public TaskbarAllAppsSlideInView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -88,6 +89,11 @@ public class TaskbarAllAppsSlideInView extends super.onFinishInflate(); mAppsView = findViewById(R.id.apps_view); mContent = mAppsView; + + DeviceProfile dp = mActivityContext.getDeviceProfile(); + setShiftRange(dp.allAppsShiftRange); + + mActivityContext.addOnDeviceProfileChangeListener(this); } @Override @@ -113,4 +119,24 @@ public class TaskbarAllAppsSlideInView extends public void setInsets(Rect insets) { mAppsView.setInsets(insets); } + + @Override + public void onDeviceProfileChanged(DeviceProfile dp) { + setShiftRange(dp.allAppsShiftRange); + setTranslationShift(TRANSLATION_SHIFT_OPENED); + } + + private void setShiftRange(float shiftRange) { + mShiftRange = shiftRange; + } + + @Override + protected float getShiftRange() { + return mShiftRange; + } + + @Override + protected boolean isEventOverContent(MotionEvent ev) { + return getPopupContainer().isEventOverView(mAppsView.getVisibleContainerView(), ev); + } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java index 26d8f303e8..fec591b653 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -53,9 +53,16 @@ public class AllAppsState extends LauncherState { @Override public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { - ScaleAndTranslation scaleAndTranslation = LauncherState.OVERVIEW - .getWorkspaceScaleAndTranslation(launcher); - scaleAndTranslation.scale = 1; + ScaleAndTranslation scaleAndTranslation = + new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET); + if (launcher.getDeviceProfile().isTablet) { + scaleAndTranslation.scale = 0.97f; + } else { + ScaleAndTranslation overviewScaleAndTranslation = LauncherState.OVERVIEW + .getWorkspaceScaleAndTranslation(launcher); + scaleAndTranslation.translationX = overviewScaleAndTranslation.translationX; + scaleAndTranslation.translationY = overviewScaleAndTranslation.translationY; + } return scaleAndTranslation; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index 099915a281..f93917f1f5 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -23,8 +23,13 @@ import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; +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.anim.Interpolators.LINEAR_TELEPORT; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS; import android.view.MotionEvent; @@ -126,23 +131,31 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr private StateAnimationConfig getNormalToAllAppsAnimation() { StateAnimationConfig builder = new StateAnimationConfig(); - builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL, - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD, - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD)); + boolean isTablet = mLauncher.getDeviceProfile().isTablet; + builder.setInterpolator(ANIM_ALL_APPS_FADE, isTablet + ? INSTANT + : Interpolators.clampToProgress(ACCEL, + ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD, + ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD)); builder.setInterpolator(ANIM_SCRIM_FADE, Interpolators.clampToProgress(ACCEL, ALL_APPS_SCRIM_VISIBLE_THRESHOLD, ALL_APPS_SCRIM_OPAQUE_THRESHOLD)); + builder.setInterpolator(ANIM_VERTICAL_PROGRESS, isTablet ? LINEAR_TELEPORT : LINEAR); return builder; } private StateAnimationConfig getAllAppsToNormalAnimation() { StateAnimationConfig builder = new StateAnimationConfig(); - builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL, - 1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD, - 1 - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD)); + boolean isTablet = mLauncher.getDeviceProfile().isTablet; + builder.setInterpolator(ANIM_ALL_APPS_FADE, isTablet + ? FINAL_FRAME + : Interpolators.clampToProgress(DEACCEL, + 1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD, + 1 - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD)); builder.setInterpolator(ANIM_SCRIM_FADE, Interpolators.clampToProgress(DEACCEL, 1 - ALL_APPS_SCRIM_OPAQUE_THRESHOLD, 1 - ALL_APPS_SCRIM_VISIBLE_THRESHOLD)); + builder.setInterpolator(ANIM_VERTICAL_PROGRESS, isTablet ? LINEAR_TELEPORT : LINEAR); return builder; } diff --git a/res/drawable/bg_rounded_corner_bottom_sheet.xml b/res/drawable/bg_rounded_corner_bottom_sheet.xml index aa49bced7a..dfcd354ce7 100644 --- a/res/drawable/bg_rounded_corner_bottom_sheet.xml +++ b/res/drawable/bg_rounded_corner_bottom_sheet.xml @@ -16,7 +16,7 @@ - + diff --git a/res/drawable/bg_all_apps_bottom_sheet.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml similarity index 55% rename from res/drawable/bg_all_apps_bottom_sheet.xml rename to res/drawable/bg_rounded_corner_bottom_sheet_handle.xml index dba2fee7e9..c5021787c5 100644 --- a/res/drawable/bg_all_apps_bottom_sheet.xml +++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml @@ -1,6 +1,5 @@ - - - - - - - - - \ No newline at end of file + + + + + diff --git a/res/layout/all_apps_bottom_sheet_background.xml b/res/layout/all_apps_bottom_sheet_background.xml index ad10d6801b..12b6b7bb55 100644 --- a/res/layout/all_apps_bottom_sheet_background.xml +++ b/res/layout/all_apps_bottom_sheet_background.xml @@ -17,19 +17,19 @@ android:id="@+id/bottom_sheet_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_all_apps_bottom_sheet"> + android:background="@drawable/bg_rounded_corner_bottom_sheet"> + android:layout_height="36dp" /> + android:layout_marginTop="@dimen/bottom_sheet_handle_margin" + android:layout_marginBottom="@dimen/bottom_sheet_handle_margin" + android:background="@drawable/bg_rounded_corner_bottom_sheet_handle" /> diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml index 1a2cfc6f93..a5f72ef30a 100644 --- a/res/layout/widgets_bottom_sheet_content.xml +++ b/res/layout/widgets_bottom_sheet_content.xml @@ -19,16 +19,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_rounded_corner_bottom_sheet" - android:paddingTop="16dp" + android:paddingTop="@dimen/bottom_sheet_handle_margin" android:orientation="vertical"> + android:background="@drawable/bg_rounded_corner_bottom_sheet_handle"/> + android:background="@drawable/bg_rounded_corner_bottom_sheet_handle"/> 32dp - 32dp + 0dp + 46dp 75dp diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml new file mode 100644 index 0000000000..a9e0fb8a34 --- /dev/null +++ b/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,20 @@ + + + + + + 0dp + diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 9d7941f5e3..5c314d598e 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,5 +16,6 @@ - 41dp + 300dp + 65dp diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ddc7d10994..3e666fcf2e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -93,8 +93,11 @@ -26dp - 320dp + 320dp + 0dp 48dp + + 24dp 30dp 40dp 144dp @@ -363,4 +366,9 @@ 32dp 8dp + + 32dp + 4dp + 16dp + 2dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 62703ad2e0..7189ef70ca 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -171,7 +171,8 @@ public class DeviceProfile { // All apps public Point allAppsBorderSpacePx; - public int allAppsOpenVerticalTranslate; + public int allAppsShiftRange; + public int allAppsTopPadding; public int allAppsCellHeightPx; public int allAppsCellWidthPx; public int allAppsIconSizePx; @@ -288,8 +289,11 @@ public class DeviceProfile { desiredWorkspaceHorizontalMarginPx = getHorizontalMarginPx(inv, res); desiredWorkspaceHorizontalMarginOriginalPx = desiredWorkspaceHorizontalMarginPx; - allAppsOpenVerticalTranslate = res.getDimensionPixelSize( - R.dimen.all_apps_open_vertical_translate); + allAppsTopPadding = res.getDimensionPixelSize(R.dimen.all_apps_top_padding) + + (isTablet ? heightPx - availableHeightPx : 0); + allAppsShiftRange = isTablet + ? heightPx - allAppsTopPadding + : res.getDimensionPixelSize(R.dimen.all_apps_starting_vertical_translate); folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale); folderContentPaddingLeftRight = diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index b6a2459c2c..cdc313f351 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -89,15 +89,15 @@ public class AllAppsTransitionController private float mShiftRange; // changes depending on the orientation private float mProgress; // [0, 1], mShiftRange * mProgress = shiftCurrent - private float mScrollRangeDelta = 0; private ScrimView mScrimView; public AllAppsTransitionController(Launcher l) { mLauncher = l; - mShiftRange = mLauncher.getDeviceProfile().heightPx; + DeviceProfile dp = mLauncher.getDeviceProfile(); + setShiftRange(dp.allAppsShiftRange); mProgress = 1f; - mIsVerticalLayout = mLauncher.getDeviceProfile().isVerticalBarLayout(); + mIsVerticalLayout = dp.isVerticalBarLayout(); mLauncher.addOnDeviceProfileChangeListener(this); } @@ -108,7 +108,7 @@ public class AllAppsTransitionController @Override public void onDeviceProfileChanged(DeviceProfile dp) { mIsVerticalLayout = dp.isVerticalBarLayout(); - setScrollRangeDelta(mScrollRangeDelta); + setShiftRange(dp.allAppsShiftRange); if (mIsVerticalLayout) { mLauncher.getHotseat().setTranslationY(0); @@ -160,12 +160,14 @@ public class AllAppsTransitionController } // need to decide depending on the release velocity - Interpolator interpolator = (config.userControlled ? LINEAR : DEACCEL_1_7); - + Interpolator verticalProgressInterpolator = config.getInterpolator(ANIM_VERTICAL_PROGRESS, + config.userControlled ? LINEAR : DEACCEL_1_7); Animator anim = createSpringAnimation(mProgress, targetProgress); - anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator)); + anim.setInterpolator(verticalProgressInterpolator); anim.addListener(getProgressAnimatorListener()); builder.add(anim); + // Use ANIM_VERTICAL_PROGRESS's interpolator to determine state transition threshold. + builder.setInterpolator(verticalProgressInterpolator); setAlphas(toState, config, builder); @@ -215,9 +217,8 @@ public class AllAppsTransitionController /** * Updates the total scroll range but does not update the UI. */ - public void setScrollRangeDelta(float delta) { - mScrollRangeDelta = delta; - mShiftRange = mLauncher.getDeviceProfile().heightPx - mScrollRangeDelta; + public void setShiftRange(float shiftRange) { + mShiftRange = shiftRange; } /** diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java index 59e21c099c..bfc75153a5 100644 --- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java @@ -408,7 +408,7 @@ public abstract class BaseAllAppsContainerView { + float startTeleport = 0.2f; + float endTeleport = 0.4f; + float teleportProgress = 0.5f; + float v; + if (t < startTeleport) { + v = LINEAR.getInterpolation(t); + } else if (t < endTeleport) { + v = Utilities.mapToRange(t, startTeleport, endTeleport, startTeleport, + endTeleport + teleportProgress, ACCEL_DEACCEL); + } else { + v = LINEAR.getInterpolation(t) + teleportProgress; + } + v = Utilities.boundToRange(v, 0f, 1f); + return v; + }; + private static final float FAST_FLING_PX_MS = 10; public static Interpolator scrollInterpolatorForVelocity(float velocity) { diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java index 3ab893b0a1..1300ce7f9c 100644 --- a/src/com/android/launcher3/anim/PendingAnimation.java +++ b/src/com/android/launcher3/anim/PendingAnimation.java @@ -77,6 +77,13 @@ public class PendingAnimation implements PropertySetter { addAnimationHoldersRecur(a, mDuration, springProperty, mAnimHolders); } + /** + * Configures interpolator of the underlying AnimatorSet. + */ + public void setInterpolator(TimeInterpolator interpolator) { + mAnim.setInterpolator(interpolator); + } + @Override public void setViewAlpha(View view, float alpha, TimeInterpolator interpolator) { if (view == null || view.getAlpha() == alpha) { diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index 989a9e4c24..f7d34921d3 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -17,9 +17,13 @@ package com.android.launcher3.touch; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; +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.anim.Interpolators.LINEAR_TELEPORT; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS; import android.view.MotionEvent; import android.view.animation.Interpolator; @@ -94,9 +98,9 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { LauncherState toState) { StateAnimationConfig config = super.getConfigForStates(fromState, toState); if (fromState == NORMAL && toState == ALL_APPS) { - applyNormalToAllAppsAnimConfig(config); + applyNormalToAllAppsAnimConfig(mLauncher, config); } else if (fromState == ALL_APPS && toState == NORMAL) { - applyAllAppsToNormalConfig(config); + applyAllAppsToNormalConfig(mLauncher, config); } return config; } @@ -104,17 +108,24 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { /** * Applies Animation config values for transition from all apps to home */ - public static void applyAllAppsToNormalConfig(StateAnimationConfig config) { + public static void applyAllAppsToNormalConfig(Launcher launcher, StateAnimationConfig config) { + boolean isTablet = launcher.getDeviceProfile().isTablet; config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); - config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, isTablet + ? FINAL_FRAME : ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + config.setInterpolator(ANIM_VERTICAL_PROGRESS, isTablet ? LINEAR_TELEPORT : LINEAR); } /** * Applies Animation config values for transition from home to all apps */ - public static void applyNormalToAllAppsAnimConfig(StateAnimationConfig config) { + public static void applyNormalToAllAppsAnimConfig(Launcher launcher, + StateAnimationConfig config) { + boolean isTablet = launcher.getDeviceProfile().isTablet; config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); - config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, isTablet + ? INSTANT : ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + config.setInterpolator(ANIM_VERTICAL_PROGRESS, isTablet ? LINEAR_TELEPORT : LINEAR); } diff --git a/src/com/android/launcher3/views/AbstractSlideInView.java b/src/com/android/launcher3/views/AbstractSlideInView.java index c22d60d0a9..5d888846a8 100644 --- a/src/com/android/launcher3/views/AbstractSlideInView.java +++ b/src/com/android/launcher3/views/AbstractSlideInView.java @@ -113,9 +113,16 @@ public abstract class AbstractSlideInView return -1; } + /** + * Returns the range in height that the slide in view can be dragged. + */ + protected float getShiftRange() { + return mContent.getHeight(); + } + protected void setTranslationShift(float translationShift) { mTranslationShift = translationShift; - mContent.setTranslationY(mTranslationShift * mContent.getHeight()); + mContent.setTranslationY(mTranslationShift * getShiftRange()); if (mColorScrim != null) { mColorScrim.setAlpha(1 - mTranslationShift); } @@ -132,8 +139,7 @@ public abstract class AbstractSlideInView mSwipeDetector.setDetectableScrollConditions( directionsToDetectScroll, false); mSwipeDetector.onTouchEvent(ev); - return mSwipeDetector.isDraggingOrSettling() - || !getPopupContainer().isEventOverView(mContent, ev); + return mSwipeDetector.isDraggingOrSettling() || !isEventOverContent(ev); } @Override @@ -142,13 +148,23 @@ public abstract class AbstractSlideInView if (ev.getAction() == MotionEvent.ACTION_UP && mSwipeDetector.isIdleState() && !isOpeningAnimationRunning()) { // If we got ACTION_UP without ever starting swipe, close the panel. - if (!getPopupContainer().isEventOverView(mContent, ev)) { + if (!isEventOverContent(ev)) { close(true); } } return true; } + /** + * Returns {@code true} if the touch event is over the visible area of the bottom sheet. + * + * By default will check if the touch event is over {@code mContent}, subclasses should override + * this method if the visible area of the bottom sheet is different from {@code mContent}. + */ + protected boolean isEventOverContent(MotionEvent ev) { + return getPopupContainer().isEventOverView(mContent, ev); + } + private boolean isOpeningAnimationRunning() { return mIsOpen && mOpenCloseAnimator.isRunning(); } @@ -160,7 +176,7 @@ public abstract class AbstractSlideInView @Override public boolean onDrag(float displacement) { - float range = mContent.getHeight(); + float range = getShiftRange(); displacement = Utilities.boundToRange(displacement, 0, range); setTranslationShift(displacement / range); return true; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java index 5543cc2696..8a435c9647 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -55,8 +55,15 @@ public class AllAppsState extends LauncherState { @Override public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { - return new ScaleAndTranslation(1f, 0, - -launcher.getAllAppsController().getShiftRange() * PARALLAX_COEFFICIENT); + ScaleAndTranslation scaleAndTranslation = + new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET); + if (launcher.getDeviceProfile().isTablet) { + scaleAndTranslation.scale = 0.97f; + } else { + scaleAndTranslation.translationY = + -launcher.getAllAppsController().getShiftRange() * PARALLAX_COEFFICIENT; + } + return scaleAndTranslation; } @Override From 58c27cce73adc8f2f191351ffc66999f0ec6997f Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 16 Feb 2022 17:42:21 -0800 Subject: [PATCH 9/9] Remove Taskbar and Taskbar EDU flags. Bug: 219035565 Change-Id: I643b5d006b5759723418901ffeb463fa04a82cbc (cherry picked from commit ec4adc1d5abedef149f6c4682464f7f4b1a6b313) --- .../launcher3/taskbar/LauncherTaskbarUIController.java | 7 +------ .../src/com/android/launcher3/taskbar/TaskbarManager.java | 3 +-- src/com/android/launcher3/DeviceProfile.java | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 6 ------ 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 0f91aa2822..af53ae22d2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -228,8 +228,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { * Whether the taskbar education should be shown. */ public boolean shouldShowEdu() { - return FeatureFlags.ENABLE_TASKBAR_EDU.get() - && !Utilities.IS_RUNNING_IN_TEST_HARNESS + return !Utilities.IS_RUNNING_IN_TEST_HARNESS && !mLauncher.getOnboardingPrefs().getBoolean(OnboardingPrefs.TASKBAR_EDU_SEEN); } @@ -237,10 +236,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController { * Manually ends the taskbar education flow. */ public void hideEdu() { - if (!FeatureFlags.ENABLE_TASKBAR_EDU.get()) { - return; - } - mControllers.taskbarEduController.hideEdu(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 50be430d93..0f7abda714 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -236,8 +236,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen DeviceProfile dp = mUserUnlocked ? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null; - boolean isTaskBarEnabled = - FeatureFlags.ENABLE_TASKBAR.get() && dp != null && dp.isTaskbarPresent; + boolean isTaskBarEnabled = dp != null && dp.isTaskbarPresent; if (!isTaskBarEnabled) { SystemUiProxy.INSTANCE.get(mContext) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 62703ad2e0..caa9da7732 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -244,8 +244,7 @@ public class DeviceProfile { isTablet = info.isTablet(windowBounds); isPhone = !isTablet; isTwoPanels = isTablet && useTwoPanels; - isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS - && FeatureFlags.ENABLE_TASKBAR.get(); + isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS; // Some more constants. context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 6116c66fe9..8b2184d8fe 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -197,12 +197,6 @@ public final class FeatureFlags { "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app " + "predictions to be updated while they are visible to the user."); - public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag( - "ENABLE_TASKBAR", true, "Allows a system Taskbar to be shown on larger devices."); - - public static final BooleanFlag ENABLE_TASKBAR_EDU = getDebugFlag("ENABLE_TASKBAR_EDU", true, - "Enables showing taskbar education the first time an app is opened."); - public static final BooleanFlag ENABLE_TASKBAR_POPUP_MENU = getDebugFlag( "ENABLE_TASKBAR_POPUP_MENU", true, "Enables long pressing taskbar icons to show the" + " popup menu.");