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

Commit 6cb7c951 authored by Jason Chang's avatar Jason Chang
Browse files

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
Merged-In: Ifd358d2aeda1a518f184216674a304511e251100
(cherry picked from commit 688e89c6)
parent c22aff4e

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

+1 −7
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
                    mOneHandedAccessibilityUtil.getOneHandedStartDescription());

            mDisplayAreaOrganizer.scheduleOffset(0, yOffSet);

            mTimeoutHandler.resetTimer();



            mOneHandedUiEventLogger.writeEvent(

                    OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_GESTURE_IN);

        }
@@ -351,12 +350,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 


    @VisibleForTesting

    void stopOneHanded() {

        if (mDisplayAreaOrganizer.isInOneHanded()) {

            mOneHandedAccessibilityUtil.announcementForScreenReader(

                    mOneHandedAccessibilityUtil.getOneHandedStopDescription());

            mDisplayAreaOrganizer.scheduleOffset(0, 0);

            mTimeoutHandler.removeTimer();

        }

        stopOneHanded(OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_GESTURE_OUT);

    }



    private void stopOneHanded(int uiEvent) {

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

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,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()) {