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

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

Merge "Add strings for gesture navigation tutorial." into sc-dev

parents fe158fab 6062b851

quickstep/res/values/strings.xml

+57 −40
Original line number Diff line number Diff line
@@ -99,62 +99,61 @@ 


    <!-- Dismiss button string for search education view -->

    <string name="search_edu_dismiss">Got it.</string>



    <!-- Title shown during interactive part of Back gesture tutorial for right edge. [CHAR LIMIT=30] -->

    <string name="back_gesture_tutorial_playground_title_swipe_inward_right_edge" translatable="false">Try the back gesture</string>

    <!-- Subtitle shown during interactive parts of Back gesture tutorial for right edge. [CHAR LIMIT=60] -->

    <string name="back_gesture_tutorial_engaged_subtitle_swipe_inward_right_edge" translatable="false">Start at the right edge and swipe toward the middle</string>

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

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

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

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

    <!-- Feedback shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->

    <string name="back_gesture_feedback_complete_left_edge">That\'s it! Now try swiping from the right edge.</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_right_edge" translatable="false">Make sure you swipe from the far right edge</string>

    <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right 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_right_edge" translatable="false">Make sure you swipe straight to the left and let go</string>



    <!-- Title shown during interactive part of Back gesture tutorial for left edge. [CHAR LIMIT=30] -->

    <string name="back_gesture_tutorial_playground_title_swipe_inward_left_edge" translatable="false">Try the other side</string>

    <!-- Subtitle shown during interactive parts of Back gesture tutorial for left edge. [CHAR LIMIT=60] -->

    <string name="back_gesture_tutorial_engaged_subtitle_swipe_inward_left_edge" translatable="false">That\'s it! Now try swiping from the left edge.</string>

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

    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" translatable="false">Make sure you swipe from the far left edge</string>

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

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

    <string name="back_gesture_feedback_cancelled_left_edge" translatable="false">Make sure you swipe straight to the right and let go</string>



    <string name="back_gesture_feedback_complete">You completed the go back gesture. Next up, learn how to go Home.</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" translatable="false">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" translatable="false">To change the sensitivity of the back gesture, go to Settings</string>



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

    <string name="home_gesture_tutorial_playground_title" translatable="false">Tutorial: Go Home</string>

    <!-- Subtitle shown during interactive parts of Home gesture tutorial. [CHAR LIMIT=60] -->

    <string name="home_gesture_tutorial_playground_subtitle" translatable="false">Try swiping upward from the bottom edge of the screen</string>

    <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] -->

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

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

    <string name="back_gesture_intro_title">Swipe to go back</string>

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

    <string name="back_gesture_intro_subtitle">To go back to the last screen, 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>

    <!-- 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" translatable="false">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" translatable="false">Make sure you swipe straight up</string>

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

    <string name="home_gesture_feedback_complete">You completed the go Home gesture. Next up, learn how to switch apps.</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] -->

    <string name="home_gesture_intro_subtitle">Swipe up from the bottom of your screen. This gesture always takes you to the Home screen.</string>



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

    <string name="overview_gesture_tutorial_playground_title" translatable="false">Tutorial: Switch Apps</string>

    <!-- Subtitle shown during interactive parts of Overview gesture tutorial. [CHAR LIMIT=60] -->

    <string name="overview_gesture_tutorial_playground_subtitle" translatable="false">Swipe up from the bottom of the screen and hold</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" translatable="false">Make sure you swipe 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. [CHAR LIMIT=100] -->

    <string name="overview_gesture_feedback_home_detected" translatable="false">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" translatable="false">Make sure you swipe straight up and pause</string>

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

    <string name="overview_gesture_feedback_complete">You completed the switch apps gesture. You\'re ready to use your phone!</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] -->

    <string name="overview_gesture_intro_subtitle">Swipe up from the bottom of your screen, hold, then release.</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>

    <!-- Subtitle shown during interactive parts of Assistant gesture tutorial. [CHAR LIMIT=60] -->

    <string name="assistant_gesture_tutorial_playground_subtitle" translatable="false">Try swiping diagonally from a bottom corner of the screen</string>

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

    <string name="assistant_gesture_feedback_swipe_too_far_from_corner" translatable="false">Make sure you swipe from a bottom corner of the screen</string>

    <string name="assistant_gesture_feedback_swipe_too_far_from_corner" translatable="false">Make sure you swipe from a bottom corner of the screen.</string>

    <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go diagonally enough. [CHAR LIMIT=100] -->

    <string name="assistant_gesture_feedback_swipe_not_diagonal" translatable="false">Make sure you swipe diagonally</string>

    <string name="assistant_gesture_feedback_swipe_not_diagonal" translatable="false">Make sure you swipe diagonally.</string>

    <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go far enough. [CHAR LIMIT=100] -->

    <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further</string>

    <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further.</string>



    <!-- Title shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=30] -->

    <string name="sandbox_mode_title" translatable="false">Sandbox Mode</string>
@@ -172,11 +171,19 @@ 
    <string name="sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the left/right edge of the screen</string>



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

    <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>

    <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_done" translatable="false">Done</string>

    <string name="gesture_tutorial_confirm_title">All set</string>

    <!-- Button text shown on a button on the feedback popup to proceed to the next tutorial step. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_next">Next</string>

    <!-- Button text shown on a button on the feedback popup to complete the tutorial. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_done">Done</string>

    <!-- Button text shown on a button to go to Settings. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_settings" translatable="false">Settings</string>

    <string name="gesture_tutorial_action_button_label_settings">Settings</string>

    <!-- Feedback title to try again. [CHAR LIMIT=30] -->

    <string name="gesture_tutorial_try_again">Try again</string>

    <!-- Feedback title for a successful gesture. [CHAR LIMIT=30] -->

    <string name="gesture_tutorial_nice">Nice!</string>

    <!-- Feedback subtext displaying the current step and the total number of steps for the tutorial. [CHAR LIMIT=30] -->

    <string name="gesture_tutorial_step">Tutorial <xliff:g id="current">%1$d</xliff:g>/<xliff:g id="total">%2$d</xliff:g></string>



    <!-- ******* Overview ******* -->

    <!-- Label for a button that causes the current overview app to be shared. [CHAR_LIMIT=40] -->
@@ -185,4 +192,14 @@ 
    <string name="action_screenshot">Screenshot</string>

    <!-- Message shown when an action is blocked by a policy enforced by the app or the organization managing the device. [CHAR_LIMIT=NONE] -->

    <string name="blocked_by_policy">This action isn\'t allowed by the app or your organization</string>



    <!-- ******* Skip tutorial dialog ******* -->

    <!-- Title for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->

    <string name="skip_tutorial_dialog_title">Skip navigation tutorial?</string>

    <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->

    <string name="skip_tutorial_dialog_subtitle">You can find this later in the Tips app</string>

    <!-- Button text shown on a button on the tutorial skip dialog to return to the tutorial. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_cancel">Cancel</string>

    <!-- Button text shown on a button on the tutorial skip dialog to exit the tutorial. [CHAR LIMIT=14] -->

    <string name="gesture_tutorial_action_button_label_skip">Skip</string>

</resources>

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

+2 −4
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ final class BackGestureTutorialController extends TutorialController { 
    Integer getTitleStringId() {

        switch (mTutorialType) {

            case RIGHT_EDGE_BACK_NAVIGATION:

                return R.string.back_gesture_tutorial_playground_title_swipe_inward_right_edge;

            case LEFT_EDGE_BACK_NAVIGATION:

                return R.string.back_gesture_tutorial_playground_title_swipe_inward_left_edge;

                return R.string.back_gesture_intro_title;

            case BACK_NAVIGATION_COMPLETE:

                return R.string.gesture_tutorial_confirm_title;

        }
@@ -49,9 +48,8 @@ final class BackGestureTutorialController extends TutorialController { 
    Integer getSubtitleStringId() {

        switch (mTutorialType) {

            case RIGHT_EDGE_BACK_NAVIGATION:

                return R.string.back_gesture_tutorial_engaged_subtitle_swipe_inward_right_edge;

            case LEFT_EDGE_BACK_NAVIGATION:

                return R.string.back_gesture_tutorial_engaged_subtitle_swipe_inward_left_edge;

                return R.string.back_gesture_intro_subtitle;

            case BACK_NAVIGATION_COMPLETE:

                return R.string.back_gesture_tutorial_confirm_subtitle;

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll 
    Integer getTitleStringId() {

        switch (mTutorialType) {

            case HOME_NAVIGATION:

                return R.string.home_gesture_tutorial_playground_title;

                return R.string.home_gesture_intro_title;

            case HOME_NAVIGATION_COMPLETE:

                return R.string.gesture_tutorial_confirm_title;

        }
@@ -48,7 +48,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll 
    @Override

    Integer getSubtitleStringId() {

        if (mTutorialType == TutorialType.HOME_NAVIGATION) {

            return R.string.home_gesture_tutorial_playground_subtitle;

            return R.string.home_gesture_intro_subtitle;

        }

        return null;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont 
    Integer getTitleStringId() {

        switch (mTutorialType) {

            case OVERVIEW_NAVIGATION:

                return R.string.overview_gesture_tutorial_playground_title;

                return R.string.overview_gesture_intro_title;

            case OVERVIEW_NAVIGATION_COMPLETE:

                return R.string.gesture_tutorial_confirm_title;

        }
@@ -49,7 +49,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont 
    @Override

    Integer getSubtitleStringId() {

        if (mTutorialType == TutorialType.OVERVIEW_NAVIGATION) {

            return R.string.overview_gesture_tutorial_playground_subtitle;

            return R.string.overview_gesture_intro_subtitle;

        }

        return null;

    }