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

Commit b9330af7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10314561 from c70e41a4 to udc-release 

Change-Id: I7ff27530c6a00bb47086e50db409cb849906ae1a
parents e3b40056 c70e41a4

quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            android:scaleType="centerCrop"

            android:scaleType="matrix"

            app:lottie_loop="true" />



    </RelativeLayout>

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/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+4 −0
Original line number Diff line number Diff line
@@ -94,8 +94,12 @@ public class QuickstepAtomicAnimationFactory extends 
    @Override

    public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,

            StateAnimationConfig config) {



        RecentsView overview = mActivity.getOverviewPanel();

        if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) {

            overview.switchToScreenshot(() ->

                    overview.finishRecentsAnimation(true /* toRecents */, null));



            if (fromState == OVERVIEW_SPLIT_SELECT) {

                config.setInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN,

                        clampToProgress(EMPHASIZED_ACCELERATE, 0, 0.4f));

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java

+9 −12
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import android.view.ViewConfiguration; 
import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.VisibleForTesting;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;
@@ -52,13 +50,12 @@ public class StatusBarTouchController implements TouchController { 


    private final Launcher mLauncher;

    private final SystemUiProxy mSystemUiProxy;

    @VisibleForTesting final float mTouchSlop;

    private final float mTouchSlop;

    private int mLastAction;

    private final SparseArray<PointF> mDownEvents;



    /* If {@code false}, this controller should not handle the input {@link MotionEvent}.*/

    @VisibleForTesting

    boolean mCanIntercept;

    private boolean mCanIntercept;



    public StatusBarTouchController(Launcher l) {

        mLauncher = l;
@@ -85,9 +82,9 @@ public class StatusBarTouchController implements TouchController { 


    @Override

    public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {

        final int action = ev.getActionMasked();

        final int idx = ev.getActionIndex();

        final int pid = ev.getPointerId(idx);

        int action = ev.getActionMasked();

        int idx = ev.getActionIndex();

        int pid = ev.getPointerId(idx);

        if (action == ACTION_DOWN) {

            mCanIntercept = canInterceptTouch(ev);

            if (!mCanIntercept) {
@@ -95,14 +92,14 @@ public class StatusBarTouchController implements TouchController { 
            }

            mDownEvents.clear();

            mDownEvents.put(pid, new PointF(ev.getX(), ev.getY()));

        } else if (action == MotionEvent.ACTION_POINTER_DOWN) {

        } else if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) {

            // Check!! should only set it only when threshold is not entered.

            mDownEvents.put(pid, new PointF(ev.getX(idx), ev.getY(idx)));

        }

        if (!mCanIntercept) {

            return false;

        }

        if (action == ACTION_MOVE && mDownEvents.contains(pid)) {

        if (action == ACTION_MOVE) {

            float dy = ev.getY(idx) - mDownEvents.get(pid).y;

            float dx = ev.getX(idx) - mDownEvents.get(pid).x;

            // Currently input dispatcher will not do touch transfer if there are more than
@@ -129,6 +126,7 @@ public class StatusBarTouchController implements TouchController { 
            mLauncher.getStatsLogManager().logger()

                    .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);

            setWindowSlippery(false);

            return true;

        }

        return true;

    }
@@ -142,8 +140,7 @@ public class StatusBarTouchController implements TouchController { 
     * Touches can slide out of the window but they cannot necessarily slide

     * back in (unless the other window with touch focus permits it).

     */

    @VisibleForTesting

    void setWindowSlippery(boolean enable) {

    private void setWindowSlippery(boolean enable) {

        Window w = mLauncher.getWindow();

        WindowManager.LayoutParams wlp = w.getAttributes();

        if (enable) {

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()