diff --git a/quickstep/res/drawable/mock_app_icon.xml b/quickstep/res/drawable/mock_app_icon.xml new file mode 100644 index 0000000000..92cdea3044 --- /dev/null +++ b/quickstep/res/drawable/mock_app_icon.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/mock_taskbar_background.xml b/quickstep/res/drawable/mock_taskbar_background.xml new file mode 100644 index 0000000000..8ac9080f2f --- /dev/null +++ b/quickstep/res/drawable/mock_taskbar_background.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml b/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml index 20d2ecc59f..1e2e014111 100644 --- a/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml +++ b/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml @@ -31,7 +31,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_1" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintVertical_chainStyle="spread_inside" app:layout_constraintTop_toTopOf="parent" @@ -45,7 +45,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_2" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_icon_1" app:layout_constraintBottom_toTopOf="@id/hotseat_icon_3" @@ -58,7 +58,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_3" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_icon_2" app:layout_constraintBottom_toTopOf="@id/hotseat_icon_4" @@ -71,7 +71,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_4" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_icon_3" app:layout_constraintBottom_toBottomOf="parent" diff --git a/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml b/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml index 6877b89716..f04fbb660d 100644 --- a/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml +++ b/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml @@ -43,7 +43,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_1" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -57,7 +57,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_2" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -71,7 +71,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_3" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -85,7 +85,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_1" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -99,25 +99,11 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_4" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/hotseat_icon_4" - app:layout_constraintEnd_toStartOf="@id/hotseat_icon_6"/> - - \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml b/quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml index 027e4a05b0..363f14e481 100644 --- a/quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml +++ b/quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml @@ -42,7 +42,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_1" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar" @@ -57,7 +57,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_2" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar" app:layout_constraintStart_toEndOf="@id/hotseat_icon_1" @@ -71,7 +71,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_3" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar" app:layout_constraintStart_toEndOf="@id/hotseat_icon_2" @@ -85,7 +85,7 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_1" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar" app:layout_constraintStart_toEndOf="@id/hotseat_icon_3" @@ -99,24 +99,10 @@ app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" - app:cardBackgroundColor="@color/mock_app_icon_4" + app:cardBackgroundColor="@color/mock_app_icon" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar" app:layout_constraintStart_toEndOf="@id/hotseat_icon_4" - app:layout_constraintEnd_toStartOf="@id/hotseat_icon_6"/> - - \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml index b3ca297888..8eeef67146 100644 --- a/quickstep/res/layout/gesture_tutorial_fragment.xml +++ b/quickstep/res/layout/gesture_tutorial_fragment.xml @@ -102,11 +102,11 @@ + android:layout_centerHorizontal="true" + android:layout_marginBottom="@dimen/gesture_tutorial_taskbar_margin_bottom"/> - - \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml b/quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml index ddfeeecf04..bc68928070 100644 --- a/quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml +++ b/quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml @@ -2,115 +2,240 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clipChildren="false"> + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 262e418835..86244b9ad8 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -40,13 +40,10 @@ #6DA1FF #3C4043 - #202124 + #E8EAED - #8AB4F8 - #F28B82 - #FDD663 - #81C995 + #BDC1C6 #3C4043 diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index d97e4350b9..d339d28eb3 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -196,9 +196,13 @@ 0 - 44dp + 52dp + 7dp 100dp - 52dp + 100dp + 12dp + 24dp + 24dp 40dp diff --git a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskbarView.java b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskbarView.java index e8cc45b97b..d70671115d 100644 --- a/quickstep/src/com/android/quickstep/interaction/AnimatedTaskbarView.java +++ b/quickstep/src/com/android/quickstep/interaction/AnimatedTaskbarView.java @@ -43,12 +43,12 @@ public class AnimatedTaskbarView extends ConstraintLayout { private View mBackground; private View mIconContainer; + private View mAllAppsButton; private View mIcon1; private View mIcon2; private View mIcon3; private View mIcon4; private View mIcon5; - private View mIcon6; @Nullable private Animator mRunningAnimator; @@ -78,12 +78,12 @@ public class AnimatedTaskbarView extends ConstraintLayout { mBackground = findViewById(R.id.taskbar_background); mIconContainer = findViewById(R.id.icon_container); + mAllAppsButton = findViewById(R.id.taskbar_all_apps); mIcon1 = findViewById(R.id.taskbar_icon_1); mIcon2 = findViewById(R.id.taskbar_icon_2); mIcon3 = findViewById(R.id.taskbar_icon_3); mIcon4 = findViewById(R.id.taskbar_icon_4); mIcon5 = findViewById(R.id.taskbar_icon_5); - mIcon6 = findViewById(R.id.taskbar_icon_6); } /** @@ -92,22 +92,20 @@ public class AnimatedTaskbarView extends ConstraintLayout { public void animateDisappearanceToHotseat(ViewGroup hotseat) { ArrayList animators = new ArrayList<>(); int hotseatTop = hotseat.getTop(); + int hotseatLeft = hotseat.getLeft(); - animators.add(ObjectAnimator.ofFloat( - mBackground, View.TRANSLATION_Y, 0, mBackground.getHeight())); animators.add(ObjectAnimator.ofFloat(mBackground, View.ALPHA, 1f, 0f)); + animators.add(ObjectAnimator.ofFloat(mAllAppsButton, View.ALPHA, 1f, 0f)); animators.add(createIconDisappearanceToHotseatAnimator( - mIcon1, hotseat.findViewById(R.id.hotseat_icon_1), hotseatTop)); + mIcon1, hotseat.findViewById(R.id.hotseat_icon_1), hotseatTop, hotseatLeft)); animators.add(createIconDisappearanceToHotseatAnimator( - mIcon2, hotseat.findViewById(R.id.hotseat_icon_2), hotseatTop)); + mIcon2, hotseat.findViewById(R.id.hotseat_icon_2), hotseatTop, hotseatLeft)); animators.add(createIconDisappearanceToHotseatAnimator( - mIcon3, hotseat.findViewById(R.id.hotseat_icon_3), hotseatTop)); + mIcon3, hotseat.findViewById(R.id.hotseat_icon_3), hotseatTop, hotseatLeft)); animators.add(createIconDisappearanceToHotseatAnimator( - mIcon4, hotseat.findViewById(R.id.hotseat_icon_4), hotseatTop)); + mIcon4, hotseat.findViewById(R.id.hotseat_icon_4), hotseatTop, hotseatLeft)); animators.add(createIconDisappearanceToHotseatAnimator( - mIcon5, hotseat.findViewById(R.id.hotseat_icon_5), hotseatTop)); - animators.add(createIconDisappearanceToHotseatAnimator( - mIcon6, hotseat.findViewById(R.id.hotseat_icon_6), hotseatTop)); + mIcon5, hotseat.findViewById(R.id.hotseat_icon_5), hotseatTop, hotseatLeft)); AnimatorSet animatorSet = new AnimatorSet(); @@ -135,22 +133,20 @@ public class AnimatedTaskbarView extends ConstraintLayout { public void animateAppearanceFromHotseat(ViewGroup hotseat) { ArrayList animators = new ArrayList<>(); int hotseatTop = hotseat.getTop(); + int hotseatLeft = hotseat.getLeft(); - animators.add(ObjectAnimator.ofFloat( - mBackground, View.TRANSLATION_Y, mBackground.getHeight(), 0)); animators.add(ObjectAnimator.ofFloat(mBackground, View.ALPHA, 0f, 1f)); + animators.add(ObjectAnimator.ofFloat(mAllAppsButton, View.ALPHA, 0f, 1f)); animators.add(createIconAppearanceFromHotseatAnimator( - mIcon1, hotseat.findViewById(R.id.hotseat_icon_1), hotseatTop)); + mIcon1, hotseat.findViewById(R.id.hotseat_icon_1), hotseatTop, hotseatLeft)); animators.add(createIconAppearanceFromHotseatAnimator( - mIcon2, hotseat.findViewById(R.id.hotseat_icon_2), hotseatTop)); + mIcon2, hotseat.findViewById(R.id.hotseat_icon_2), hotseatTop, hotseatLeft)); animators.add(createIconAppearanceFromHotseatAnimator( - mIcon3, hotseat.findViewById(R.id.hotseat_icon_3), hotseatTop)); + mIcon3, hotseat.findViewById(R.id.hotseat_icon_3), hotseatTop, hotseatLeft)); animators.add(createIconAppearanceFromHotseatAnimator( - mIcon4, hotseat.findViewById(R.id.hotseat_icon_4), hotseatTop)); + mIcon4, hotseat.findViewById(R.id.hotseat_icon_4), hotseatTop, hotseatLeft)); animators.add(createIconAppearanceFromHotseatAnimator( - mIcon5, hotseat.findViewById(R.id.hotseat_icon_5), hotseatTop)); - animators.add(createIconAppearanceFromHotseatAnimator( - mIcon6, hotseat.findViewById(R.id.hotseat_icon_6), hotseatTop)); + mIcon5, hotseat.findViewById(R.id.hotseat_icon_5), hotseatTop, hotseatLeft)); AnimatorSet animatorSet = new AnimatorSet(); @@ -166,98 +162,6 @@ public class AnimatedTaskbarView extends ConstraintLayout { start(animatorSet); } - /** - * Animates this fake taskbar's disappearance to the bottom of the screen. - */ - public void animateDisappearanceToBottom() { - ArrayList animators = new ArrayList<>(); - - animators.add(ObjectAnimator.ofFloat( - mBackground, View.TRANSLATION_Y, 0, mBackground.getHeight())); - animators.add(ObjectAnimator.ofFloat(mBackground, View.ALPHA, 1f, 0f)); - animators.add(ObjectAnimator.ofFloat(mIconContainer, View.SCALE_X, 1f, 0f)); - animators.add(ObjectAnimator.ofFloat(mIconContainer, View.SCALE_Y, 1f, 0f)); - - initializeIconContainerPivot(); - - AnimatorSet animatorSet = new AnimatorSet(); - - animatorSet.playTogether(animators); - animatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - setVisibility(INVISIBLE); - resetIconContainerPivot(); - } - - @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); - resetIconContainerPivot(); - } - - @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); - setVisibility(VISIBLE); - } - }); - - start(animatorSet); - } - - /** - * Animates this fake taskbar's appearance from the bottom of the screen. - */ - public void animateAppearanceFromBottom() { - ArrayList animators = new ArrayList<>(); - - animators.add(ObjectAnimator.ofFloat( - mBackground, View.TRANSLATION_Y, mBackground.getHeight(), 0)); - animators.add(ObjectAnimator.ofFloat(mBackground, View.ALPHA, 0f, 1f)); - animators.add(ObjectAnimator.ofFloat(mIconContainer, View.SCALE_X, 0f, 1f)); - animators.add(ObjectAnimator.ofFloat(mIconContainer, View.SCALE_Y, 0f, 1f)); - - initializeIconContainerPivot(); - - AnimatorSet animatorSet = new AnimatorSet(); - - animatorSet.playTogether(animators); - animatorSet.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - super.onAnimationStart(animation); - setVisibility(VISIBLE); - } - - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - resetIconContainerPivot(); - } - - @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); - resetIconContainerPivot(); - } - }); - - start(animatorSet); - } - - private void initializeIconContainerPivot() { - mIconContainer.setPivotX(getWidth() / 2f); - mIconContainer.setPivotY(getHeight() * 0.8f); - } - - private void resetIconContainerPivot() { - mIconContainer.resetPivot(); - mIconContainer.setScaleX(1f); - mIconContainer.setScaleY(1f); - } - private void start(Animator animator) { if (mRunningAnimator != null) { mRunningAnimator.cancel(); @@ -287,7 +191,7 @@ public class AnimatedTaskbarView extends ConstraintLayout { } private Animator createIconDisappearanceToHotseatAnimator( - View taskbarIcon, View hotseatIcon, int hotseatTop) { + View taskbarIcon, View hotseatIcon, int hotseatTop, int hotseatLeft) { ArrayList animators = new ArrayList<>(); animators.add(ObjectAnimator.ofFloat( @@ -296,7 +200,10 @@ public class AnimatedTaskbarView extends ConstraintLayout { 0, (hotseatTop + hotseatIcon.getTop()) - (getTop() + taskbarIcon.getTop()))); animators.add(ObjectAnimator.ofFloat( - taskbarIcon, View.TRANSLATION_X, 0, hotseatIcon.getLeft() - taskbarIcon.getLeft())); + taskbarIcon, + View.TRANSLATION_X, + 0, + (hotseatLeft + hotseatIcon.getLeft()) - (getLeft() + taskbarIcon.getLeft()))); animators.add(ObjectAnimator.ofFloat( taskbarIcon, View.SCALE_X, @@ -330,7 +237,7 @@ public class AnimatedTaskbarView extends ConstraintLayout { } private Animator createIconAppearanceFromHotseatAnimator( - View taskbarIcon, View hotseatIcon, int hotseatTop) { + View taskbarIcon, View hotseatIcon, int hotseatTop, int hotseatLeft) { ArrayList animators = new ArrayList<>(); animators.add(ObjectAnimator.ofFloat( @@ -339,7 +246,10 @@ public class AnimatedTaskbarView extends ConstraintLayout { (hotseatTop + hotseatIcon.getTop()) - (getTop() + taskbarIcon.getTop()), 0)); animators.add(ObjectAnimator.ofFloat( - taskbarIcon, View.TRANSLATION_X, hotseatIcon.getLeft() - taskbarIcon.getLeft(), 0)); + taskbarIcon, + View.TRANSLATION_X, + (hotseatLeft + hotseatIcon.getLeft()) - (getLeft() + taskbarIcon.getLeft()), + 0)); animators.add(ObjectAnimator.ofFloat( taskbarIcon, View.SCALE_X, diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java index 05b246b906..b00dc479bd 100644 --- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java @@ -154,7 +154,6 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont AnimatorSet animset = new AnimatorSet(); animset.playTogether(animators); - hideFakeTaskbar(/* animateToHotseat= */ false); animset.start(); mRunningWindowAnim = SwipeUpAnimationLogic.RunningWindowAnim.wrap(animset); } diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java index 4e1521f161..1e8b48d0c3 100644 --- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java +++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java @@ -76,7 +76,7 @@ public class OverviewGestureTutorialFragment extends TutorialFragment { @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); - controller.resetFakeTaskView(false); + controller.resetFakeTaskViewFromOverview(); } }); ArrayList animators = new ArrayList<>(); diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java index 670ee9b333..de9381833e 100644 --- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java @@ -203,7 +203,15 @@ abstract class SwipeUpGestureTutorialController extends TutorialController { mRunningWindowAnim = RunningWindowAnim.wrap(animset); } + void resetFakeTaskViewFromOverview() { + resetFakeTaskView(false, false); + } + void resetFakeTaskView(boolean animateFromHome) { + resetFakeTaskView(animateFromHome, true); + } + + void resetFakeTaskView(boolean animateFromHome, boolean animateTaskbar) { mFakeTaskView.setVisibility(View.VISIBLE); PendingAnimation anim = new PendingAnimation(300); anim.setFloat(mTaskViewSwipeUpAnimation @@ -211,7 +219,9 @@ abstract class SwipeUpGestureTutorialController extends TutorialController { anim.setViewAlpha(mFakeTaskView, 1, ACCEL); anim.addListener(mResetTaskView); AnimatorSet animset = anim.buildAnim(); - showFakeTaskbar(animateFromHome); + if (animateTaskbar) { + showFakeTaskbar(animateFromHome); + } animset.start(); mRunningWindowAnim = RunningWindowAnim.wrap(animset); } diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java index fa7d848a7c..e775ce3e3f 100644 --- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java @@ -478,8 +478,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, if (animateToHotseat) { mFakeTaskbarViewCallback = () -> mFakeTaskbarView.animateDisappearanceToHotseat(mFakeHotseatView); - } else { - mFakeTaskbarViewCallback = mFakeTaskbarView::animateDisappearanceToBottom; } mFakeTaskbarView.post(mFakeTaskbarViewCallback); } @@ -494,8 +492,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, if (animateFromHotseat) { mFakeTaskbarViewCallback = () -> mFakeTaskbarView.animateAppearanceFromHotseat(mFakeHotseatView); - } else { - mFakeTaskbarViewCallback = mFakeTaskbarView::animateAppearanceFromBottom; } mFakeTaskbarView.post(mFakeTaskbarViewCallback); }