commit f07608957b7abbf895f0b8d8ea22bda392ca5a35
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 23 04:17:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 23 04:17:49 2022 +0000
tree 5d78cceacb712935b40af0d2f46127bb8cb1fc4b
parent f0bb9e483de940e5750665256c814b9b772d75ca
parent 4ebc61e76a82c7ee5a9b92ac3d55ead280e09817

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

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: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index b686505..9ba5577 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -117,7 +117,22 @@
                 mTutorialFragment.closeTutorial();
             }
         } else if (mTutorialType == BACK_NAVIGATION) {
-            showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
+            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);
+
+            }
         }
     }
 }