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

Commit 9e4abd80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Provide more accurate feedback on nav bar region gestures during the... 

Merge "Provide more accurate feedback on nav bar region gestures during the back gesture tutorial." into tm-dev am: 1582aafb am: 9c3bd94b

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



Change-Id: I8cb85fbb29fb431d826b35d5b54d2763a30c10c5
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcb554c3 9c3bd94b

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

+16 −1
Original line number Diff line number Diff line
@@ -117,7 +117,22 @@ final class BackGestureTutorialController extends TutorialController { 
                mTutorialFragment.closeTutorial();

            }

        } else if (mTutorialType == BACK_NAVIGATION) {

            switch (result) {

                case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:

                case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:

                case HOME_OR_OVERVIEW_CANCELLED:

                    showFeedback(R.string.back_gesture_feedback_swipe_too_far_from_edge);

                    break;

                case HOME_GESTURE_COMPLETED:

                case OVERVIEW_GESTURE_COMPLETED:

                case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:

                case ASSISTANT_COMPLETED:

                case ASSISTANT_NOT_STARTED_BAD_ANGLE:

                case ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT:

                default:

                    showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);



            }

        }

    }

}