Fix metrics didn't log ONE_HANDED_TRIGGER_GESTURE_OUT logs when

NavigationBar type is Gesture Navi

Write metrics gesture out event in stopOneHanded() callback.

Bug: 178445384

Test: manual
Test: Westworld metrics logger
Change-Id: Ifd358d2aeda1a518f184216674a304511e251100

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

@@ -262,7 +262,6 @@ public class OneHandedController {
             final int yOffSet = Math.round(getDisplaySize().y * mOffSetFraction);
             mDisplayAreaOrganizer.scheduleOffset(0, yOffSet);
             mTimeoutHandler.resetTimer();
-
             mOneHandedUiEventLogger.writeEvent(
                     OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_GESTURE_IN);
         }
@@ -273,6 +272,9 @@ public class OneHandedController {
         if (mDisplayAreaOrganizer.isInOneHanded()) {
             mDisplayAreaOrganizer.scheduleOffset(0, 0);
             mTimeoutHandler.removeTimer();
+            //  Log metrics for Gesture navigation mode.
+            mOneHandedUiEventLogger.writeEvent(
+                    OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_GESTURE_OUT);
         }
     }
 

packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java

@@ -252,6 +252,7 @@ public final class WMShell extends SystemUI
             public void onStop() {
                 mSysUiMainExecutor.execute(() -> {
                     if (oneHanded.isOneHandedEnabled()) {
+                        // Log metrics for 3-button navigation mode.
                         oneHanded.stopOneHanded(
                                 OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_GESTURE_OUT);
                     } else if (oneHanded.isSwipeToNotificationEnabled()) {