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

Commit f9ff45f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adding touchpad home gesture tutorial" into main

parents 5dd4d207 10d8e393

packages/SystemUI/res/raw/trackpad_home_edu.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/raw/trackpad_home_success.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/values/strings.xml

+12 −4
Original line number Diff line number Diff line
@@ -3682,17 +3682,25 @@ 
    <string name="touchpad_tutorial_action_key_button">Action key</string>

    <!-- Label for button finishing touchpad tutorial [CHAR LIMIT=NONE] -->

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

    <!-- Screen title after gesture was done successfully [CHAR LIMIT=NONE] -->

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

    <!-- BACK GESTURE -->

    <!-- Touchpad back gesture action name in tutorial [CHAR LIMIT=NONE] -->

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

    <!-- Touchpad back gesture guidance in gestures tutorial [CHAR LIMIT=NONE] -->

    <string name="touchpad_back_gesture_guidance">To go back, swipe left or right using three fingers anywhere on the touchpad.\n\nYou can also use the keyboard shortcut

Action + ESC for this.</string>

    <!-- Screen title after gesture was done successfully [CHAR LIMIT=NONE] -->

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

    <!-- Text shown to the user after they complete back gesture tutorial [CHAR LIMIT=NONE] -->

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

    <string name="touchpad_back_gesture_animation_content_description">Touchpad showing three fingers moving right and left</string>

    <string name="touchpad_back_gesture_screen_animation_content_description">Device screen showing animation for back gesture</string>

    <!-- HOME GESTURE -->

    <!-- Touchpad home gesture action name in tutorial [CHAR LIMIT=NONE] -->

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

    <!-- Touchpad home gesture guidance in gestures tutorial [CHAR LIMIT=NONE] -->

    <string name="touchpad_home_gesture_guidance">To go to your home screen at any time, swipe up with three fingers from the bottom of your screen.</string>

    <!-- Screen title after home gesture was done successfully [CHAR LIMIT=NONE] -->

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

    <!-- Text shown to the user after they complete home gesture tutorial [CHAR LIMIT=NONE] -->

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



    <!-- Content description for keyboard backlight brightness dialog [CHAR LIMIT=NONE] -->

    <string name="keyboard_backlight_dialog_title">Keyboard backlight</string>

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/HomeGestureTutorialScreen.kt

0 → 100644
+84 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TouchpadTutorialActivity.kt

+6 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.lifecycle.Lifecycle.State.STARTED 
import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.theme.PlatformTheme

import com.android.systemui.touchpad.tutorial.ui.composable.BackGestureTutorialScreen

import com.android.systemui.touchpad.tutorial.ui.composable.HomeGestureTutorialScreen

import com.android.systemui.touchpad.tutorial.ui.composable.TutorialSelectionScreen

import com.android.systemui.touchpad.tutorial.ui.viewmodel.Screen.BACK_GESTURE

import com.android.systemui.touchpad.tutorial.ui.viewmodel.Screen.HOME_GESTURE
@@ -78,6 +79,10 @@ fun TouchpadTutorialScreen(vm: TouchpadTutorialViewModel, closeTutorial: () -> U 
                onDoneButtonClicked = { vm.goTo(TUTORIAL_SELECTION) },

                onBack = { vm.goTo(TUTORIAL_SELECTION) },

            )

        HOME_GESTURE -> {}

        HOME_GESTURE ->

            HomeGestureTutorialScreen(

                onDoneButtonClicked = { vm.goTo(TUTORIAL_SELECTION) },

                onBack = { vm.goTo(TUTORIAL_SELECTION) },

            )

    }

}