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

Commit f0760895 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 am: 4ebc61e7

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



Change-Id: Ied4008303bbd0e5f726cb6dd49cfe58159af933c
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0bb9e48 4ebc61e7

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



            }

        }

    }

}