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

Commit 5ed3fbe6 authored by Yalan Yiue's avatar Yalan Yiue Committed by Android (Google) Code Review
Browse files

Merge "[Quickswitch] animations and gesture recognizer" into main

parents a0d70008 6782b595

packages/SystemUI/res/raw/trackpad_switch_apps_edu.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/raw/trackpad_switch_apps_success.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -4000,13 +4000,13 @@ 
    <!-- Touchpad switch apps gesture action name in tutorial [CHAR LIMIT=NONE] -->

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

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

    <string name="touchpad_switch_apps_gesture_guidance">Swipe left or right using four fingers on your touchpad</string>

    <string name="touchpad_switch_apps_gesture_guidance">Swipe left using four fingers on your touchpad</string>

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

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

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

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

    <!-- Text shown to the user after switch gesture was not done correctly [CHAR LIMIT=NONE] -->

    <string name="touchpad_switch_gesture_error_body">Swipe left or right using four fingers on your touchpad to switch apps</string>

    <string name="touchpad_switch_gesture_error_body">Swipe left using four fingers on your touchpad to switch apps</string>



    <!-- KEYBOARD TUTORIAL-->

    <!-- Action key tutorial title [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ fun ActionTutorialContent( 
        val buttonAlpha by animateFloatAsState(if (actionState is Finished) 1f else 0f)

        DoneButton(

            onDoneButtonClicked = onDoneButtonClicked,

            modifier = Modifier.graphicsLayer { alpha = buttonAlpha },

            modifier = Modifier.padding(horizontal = 60.dp).graphicsLayer { alpha = buttonAlpha },

            enabled = actionState is Finished,

        )

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ fun SwitchAppsGestureTutorialScreen( 
                    titleErrorResId = R.string.gesture_error_title,

                    bodyErrorResId = R.string.touchpad_switch_gesture_error_body,

                ),

            // TODO: replace animation

            animations = TutorialScreenConfig.Animations(educationResId = R.raw.trackpad_back_edu),

            animations =

                TutorialScreenConfig.Animations(educationResId = R.raw.trackpad_switch_apps_edu),

        )

    GestureTutorialScreen(

        screenConfig = screenConfig,