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

Commit e69de4ab authored by Saumya Prakash's avatar Saumya Prakash Committed by Automerger Merge Worker
Browse files

Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c476 

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



Change-Id: Idc65c2ae4c5c0b378b0cdcc2295d864951f7d026
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a18734f 0d87c476

quickstep/res/values/strings.xml

+24 −14
Original line number Diff line number Diff line
@@ -98,16 +98,17 @@ 
    <string name="gesture_tutorial_rotation_prompt_title">Rotate your device</string>

    <!-- Prompt shown before the gesture navigation tutorial to users who need to rotate their screen to begin. [CHAR LIMIT=100] -->

    <string name="gesture_tutorial_rotation_prompt">Please rotate your device to complete the gesture navigation tutorial</string>



    <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe from the far-right or far-left edge.</string>

    <string name="back_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe from the far-right or far-left edge</string>

    <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_cancelled">Make sure you swipe from the right or left edge to the middle of the screen and let go.</string>

    <string name="back_gesture_feedback_cancelled">Make sure you swipe from the right or left edge to the middle of the screen and let go</string>

    <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_complete_with_overview_follow_up">You learned how to swipe from the right to go back. Next up, learn how to switch apps.</string>

    <!-- Feedback shown after completing the back gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture.</string>

    <string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture</string>

    <!-- Feedback shown during interactive parts of Back gesture tutorial when the gesture is within the nav bar region. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen.</string>

    <string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen</string>

    <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->

    <string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>

    <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
@@ -119,16 +120,18 @@ 
    <string name="back_gesture_spoken_intro_subtitle">To go back to the last screen, swipe with 2 fingers from the left or right edge to the middle of the screen.</string>

    <!-- Title of the gesture tutorial section educating users on how to go back to the previous screen. [CHAR LIMIT=100] -->

    <string name="back_gesture_tutorial_title">Go back</string>

    <!-- Subtitle of the gesture tutorial section educating users on how to go to back to the previous screen [CHAR LIMIT=100] -->

    <string name="back_gesture_tutorial_subtitle">Swipe from the left or right edge to the middle of the screen</string>



    <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>

    <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen</string>

    <!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->

    <string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go.</string>

    <string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go</string>

    <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->

    <string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up.</string>

    <string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up</string>

    <!-- Feedback shown after completing the home gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->

    <string name="home_gesture_feedback_complete_with_follow_up">You completed the go Home gesture. Next up, learn how to go back.</string>

    <string name="home_gesture_feedback_complete_with_follow_up">You completed the go home gesture. Next up, learn how to go back.</string>

    <!-- Feedback shown after completing the home gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->

    <string name="home_gesture_feedback_complete_without_follow_up">You completed the go Home gesture.</string>

    <string name="home_gesture_feedback_complete_without_follow_up">You completed the go home gesture</string>

    <!-- Introduction title for the Home gesture tutorial. [CHAR LIMIT=100] -->

    <string name="home_gesture_intro_title">Swipe to go home</string>

    <!-- Introduction subtitle for the Home gesture tutorial. [CHAR LIMIT=100] -->
@@ -138,18 +141,20 @@ 
    <!-- Title of the gesture tutorial section educating users on how to go to the home screen. [CHAR LIMIT=100] -->

    <string name="home_gesture_tutorial_title">Go home</string>

    <!-- Subtitle of the gesture tutorial section educating users on how to go to the home screen [CHAR LIMIT=100] -->

    <string name="home_gesture_tutorial_subtitle">To go to your home screen at any time, swipe up from the bottom of your screen</string>

    <string name="home_gesture_tutorial_subtitle">Swipe up from the bottom of your screen</string>

    <!-- Title message when users successfully learn to go to the home screen [CHAR LIMIT=100] -->

    <string name="home_gesture_tutorial_success">Great job!</string>



    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>

    <string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen</string>

    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. The window refers to the current app's window during the gesture. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing.</string>

    <string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing</string>

    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause.</string>

    <string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause</string>

    <!-- Feedback shown after completing the overview gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_complete_with_follow_up">You learned how to use gestures. To turn off gestures, go to Settings.</string>

    <!-- Feedback shown after completing the overview gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_complete_without_follow_up">You completed the switch apps gesture.</string>

    <string name="overview_gesture_feedback_complete_without_follow_up">You completed the switch apps gesture</string>

    <!-- Introduction title for the Overview gesture tutorial. [CHAR LIMIT=100] -->

    <string name="overview_gesture_intro_title">Swipe to switch apps</string>

    <!-- Introduction subtitle for the Overview gesture tutorial. [CHAR LIMIT=100] -->
@@ -158,6 +163,11 @@ 
    <string name="overview_gesture_spoken_intro_subtitle">To switch between apps, swipe up with 2 fingers from the bottom of your screen, hold, then release.</string>

    <!-- Title of the gesture tutorial section educating users on how to switch between apps. [CHAR LIMIT=100] -->

    <string name="overview_gesture_tutorial_title">Switch apps</string>

    <!-- Subtitle of the gesture tutorial section educating users on how to switch between apps [CHAR LIMIT=100] -->

    <string name="overview_gesture_tutorial_subtitle">Swipe up from the bottom of your screen, hold, then release</string>

    <!-- Title message when users successfully learn to switch between apps [CHAR LIMIT=100] -->

    <string name="overview_gesture_tutorial_success">Well done!</string>





    <!-- Title shown during interactive part of Assistant gesture tutorial. [CHAR LIMIT=30] -->

    <string name="assistant_gesture_tutorial_playground_title" translatable="false">Tutorial: Assistant</string>

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

+8 −1
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ final class BackGestureTutorialController extends TutorialController { 


    @Override

    public int getIntroductionSubtitle() {

        return R.string.back_gesture_intro_subtitle;

        return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()

                ? R.string.back_gesture_tutorial_subtitle

                : R.string.back_gesture_intro_subtitle;

    }



    @Override
@@ -74,6 +76,11 @@ final class BackGestureTutorialController extends TutorialController { 
        return R.string.back_gesture_spoken_intro_subtitle;

    }



    @Override

    public int getSuccessFeedbackTitle() {

        return R.string.gesture_tutorial_nice;

    }



    @Override

    public int getSuccessFeedbackSubtitle() {

        return mTutorialFragment.isAtFinalStep()

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

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll 
        return R.string.home_gesture_spoken_intro_subtitle;

    }



    @Override

    public int getSuccessFeedbackTitle() {

        return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()

                ? R.string.home_gesture_tutorial_success

                : R.string.gesture_tutorial_nice;

    }



    @Override

    public int getSuccessFeedbackSubtitle() {

        return mTutorialFragment.isAtFinalStep()

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

+10 −1
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont 


    @Override

    public int getIntroductionSubtitle() {

        return R.string.overview_gesture_intro_subtitle;

        return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()

                ? R.string.overview_gesture_tutorial_subtitle

                : R.string.overview_gesture_intro_subtitle;

    }



    @Override
@@ -85,6 +87,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont 
        return R.string.overview_gesture_spoken_intro_subtitle;

    }



    @Override

    public int getSuccessFeedbackTitle() {

        return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()

                ? R.string.overview_gesture_tutorial_success

                : R.string.gesture_tutorial_nice;

    }



    @Override

    public int getSuccessFeedbackSubtitle() {

        return mTutorialFragment.getNumSteps() > 1 && mTutorialFragment.isAtFinalStep()

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

+6 −1
Original line number Diff line number Diff line
@@ -321,6 +321,11 @@ abstract class TutorialController implements BackGestureAttemptCallback, 
        return NO_ID;

    }



    @StringRes

    public int getSuccessFeedbackTitle() {

        return NO_ID;

    }



    @StyleRes

    public int getTitleTextAppearance() {

        return NO_ID;
@@ -392,7 +397,7 @@ abstract class TutorialController implements BackGestureAttemptCallback, 
    void showFeedback(int subtitleResId, boolean isGestureSuccessful) {

        showFeedback(

                isGestureSuccessful

                        ? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,

                        ? getSuccessFeedbackTitle() : R.string.gesture_tutorial_try_again,

                subtitleResId,

                NO_ID,

                isGestureSuccessful,