Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6873cb82 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge "Update TutorialFragments to work without hand gesture animations." into ub-launcher3-master

parents 87636e40 2517dfd1

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType; 
/** Shows the Home gesture interactive tutorial. */

public class AssistantGestureTutorialFragment extends TutorialFragment {

    @Override

    int getHandAnimationResId() {

    Integer getHandAnimationResId() {

        return R.drawable.assistant_gesture;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType; 
/** Shows the Back gesture interactive tutorial. */

public class BackGestureTutorialFragment extends TutorialFragment {

    @Override

    int getHandAnimationResId() {

    Integer getHandAnimationResId() {

        return R.drawable.back_gesture;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType; 
/** Shows the Home gesture interactive tutorial. */

public class HomeGestureTutorialFragment extends TutorialFragment {

    @Override

    int getHandAnimationResId() {

    Integer getHandAnimationResId() {

        return R.drawable.home_gesture;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType; 
/** Shows the Overview gesture interactive tutorial. */

public class OverviewGestureTutorialFragment extends TutorialFragment {

    @Override

    int getHandAnimationResId() {

    Integer getHandAnimationResId() {

        return R.drawable.overview_gesture;

    }

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

+5 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ abstract class TutorialController implements BackGestureAttemptCallback, 
    final View mFakeTaskView;

    final View mRippleView;

    final RippleDrawable mRippleDrawable;

    final TutorialHandAnimation mHandCoachingAnimation;

    @Nullable final TutorialHandAnimation mHandCoachingAnimation;

    final ImageView mHandCoachingView;

    final Button mActionTextButton;

    final Button mActionButton;
@@ -145,13 +145,16 @@ abstract class TutorialController implements BackGestureAttemptCallback, 
    void onActionTextButtonClicked(View button) {}



    void showHandCoachingAnimation() {

        if (isComplete()) {

        if (isComplete() || mHandCoachingAnimation == null) {

            return;

        }

        mHandCoachingAnimation.startLoopedAnimation(mTutorialType);

    }



    void hideHandCoachingAnimation() {

        if (mHandCoachingAnimation == null) {

            return;

        }

        mHandCoachingAnimation.stop();

        mHandCoachingView.setVisibility(View.INVISIBLE);

    }