commit a84672965e964de445286a2fa77601646d8c77d8
author Schneider Victor-tulias <victortulias@google.com> Fri Oct 01 13:53:41 2021 -0700
committer Schneider Victor-tulias <victortulias@google.com> Fri Oct 01 17:32:45 2021 -0700
tree f5055b1104f50df4eeb76ea73a5130f3fdc271a6
parent 3fca6717ed001d3f407f68239f8d15f46c725f9e

Make gesture nav tutorial skip button always visible.

Bug: 198285152
Test: started, completed and tried failing gesture nav tutorial.
Change-Id: Ic30a54e6592783abafcf1efe61ecedb9514d094d

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

diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 94fb556..ae3fe67 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -258,7 +258,6 @@
                 mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
         subtitle.setText(subtitleResId);
         if (isGestureSuccessful) {
-            hideCloseButton();
             if (mTutorialFragment.isAtFinalStep()) {
                 showActionButton();
             }
@@ -382,6 +381,7 @@
     void transitToController() {
         hideFeedback();
         hideActionButton();
+        updateCloseButton();
         updateSubtext();
         updateDrawables();
 
@@ -391,26 +391,21 @@
         }
     }
 
-    void hideCloseButton() {
-        mCloseButton.setVisibility(GONE);
-    }
-
-    void showCloseButton() {
-        mCloseButton.setVisibility(View.VISIBLE);
+    void updateCloseButton() {
         mCloseButton.setTextAppearance(Utilities.isDarkTheme(mContext)
                 ? R.style.TextAppearance_GestureTutorial_Feedback_Subtext
                 : R.style.TextAppearance_GestureTutorial_Feedback_Subtext_Dark);
     }
 
     void hideActionButton() {
-        showCloseButton();
+        mCloseButton.setVisibility(View.VISIBLE);
         // Invisible to maintain the layout.
         mActionButton.setVisibility(View.INVISIBLE);
         mActionButton.setOnClickListener(null);
     }
 
     void showActionButton() {
-        hideCloseButton();
+        mCloseButton.setVisibility(GONE);
         mActionButton.setVisibility(View.VISIBLE);
         mActionButton.setOnClickListener(this::onActionButtonClicked);
     }