From af031b69a280e10b204bbcbc111278db6ddf0186 Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Wed, 20 Jul 2022 15:02:54 +0800 Subject: [PATCH] Only count EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT in STATE_ACTIVE The design philosophy of EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT is - When device in STATE_ACTIVE - Rotate will automatically exit OHM We only count when CUJ: User trigger OHM -> Rotate -> Exit OHM But bypass the CUJ: No trigger OHM -> Rotate -> no action Test: atest SystemUITests Bug: 239654147 Change-Id: I2e73f29f4edd77998e015db960430f2b3a768349 --- .../android/wm/shell/onehanded/OneHandedController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java index 1d8ac2b576e95..42de32ce3bce6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java @@ -675,9 +675,12 @@ public class OneHandedController implements RemoteCallable, return; } + if (mState.getState() == STATE_ACTIVE) { + mOneHandedUiEventLogger.writeEvent( + OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT); + } + mDisplayAreaOrganizer.onRotateDisplay(mContext, toRotation, wct); - mOneHandedUiEventLogger.writeEvent( - OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT); } /**