commit 397efdbcfbda4e1712a2b47e5c450556f5c506a7
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 23 03:23:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 23 03:23:24 2022 +0000
tree 6e2ab9f956fa3d7d5163da61c6e3e0da8aa8d1e2
parent 54291ec724c50f8555d130372be1fe9fdb192ba7
parent 1582aafbc0616352686cb0a73326ffe44d6873d6

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

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

Change-Id: I13aaec9cd8d8b09e2c6bdf9c1bb8816f87f9e512
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);
+
+            }
         }
     }
 }