Merge "Migrate from using CardViews to Views in gesture nav tutorial layouts." into tm-qpr-dev am: a184e0def7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21325752

Change-Id: Id5681c5c5eccfea4f24c13e48dafcd3b605c6386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/interaction/AnimatedTaskView.java

@@ -30,7 +30,6 @@ import android.view.ViewOutlineProvider;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.android.launcher3.R;
@@ -46,8 +45,8 @@ import java.util.ArrayList;
 public class AnimatedTaskView extends ConstraintLayout {
 
     private View mFullTaskView;
-    private CardView mTopTaskView;
-    private CardView mBottomTaskView;
+    private View mTopTaskView;
+    private View mBottomTaskView;
 
     private ViewOutlineProvider mTaskViewOutlineProvider = null;
     private final Rect mTaskViewAnimatedRect = new Rect();
@@ -185,8 +184,6 @@ public class AnimatedTaskView extends ConstraintLayout {
 
     void setFakeTaskViewFillColor(@ColorInt int colorResId) {
         mFullTaskView.setBackgroundColor(colorResId);
-        mTopTaskView.setCardBackgroundColor(colorResId);
-        mBottomTaskView.setCardBackgroundColor(colorResId);
     }
 
     @Override

quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java

@@ -61,10 +61,10 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
 
     @Override
     protected int getMockAppTaskLayoutResId() {
-        return mTutorialFragment.isLargeScreen()
-                ? R.layout.gesture_tutorial_tablet_mock_webpage
-                : ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
-                    ? R.layout.swipe_up_gesture_tutorial_shape
+        return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+                ? R.layout.swipe_up_gesture_tutorial_shape
+                : mTutorialFragment.isLargeScreen()
+                    ? R.layout.gesture_tutorial_tablet_mock_webpage
                     : R.layout.gesture_tutorial_mock_webpage;
     }
 

quickstep/src/com/android/quickstep/interaction/TutorialController.java

@@ -154,7 +154,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
             mFeedbackTitleView.setText(getIntroductionTitle());
             mFeedbackSubtitleView.setText(getIntroductionSubtitle());
-            mSkipButton.setVisibility(GONE);
         }
 
         mTitleViewCallback = () -> mFeedbackTitleView.sendAccessibilityEvent(