From 1d17d4b91d1cccc5adfc2c5d97a06ad26873b62f Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Mon, 21 Jun 2021 15:49:05 +0800 Subject: [PATCH] Migrate metrics logs to reflect new One-handed UI changes in Settings 1. Add metrics logs for EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT. 2. Add metrics logs for Show notification toggle settings changes. Bug: 191730790 Test: manual Test: atest WMShellUnitTests Change-Id: I04ba806af1e427756b61f36279be4fff78dca900 --- .../shell/onehanded/OneHandedController.java | 8 ++++++- .../onehanded/OneHandedUiEventLogger.java | 22 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 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 b43daa0da2c09..ab92faa2e53d0 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 @@ -94,7 +94,6 @@ public class OneHandedController implements RemoteCallable private final OneHandedTouchHandler mTouchHandler; private final OneHandedState mState; private final OneHandedTutorialHandler mTutorialHandler; - private final OneHandedUiEventLogger mOneHandedUiEventLogger; private final TaskStackListenerImpl mTaskStackListener; private final IOverlayManager mOverlayManager; private final ShellExecutor mMainExecutor; @@ -104,6 +103,7 @@ public class OneHandedController implements RemoteCallable private OneHandedEventCallback mEventCallback; private OneHandedDisplayAreaOrganizer mDisplayAreaOrganizer; private OneHandedBackgroundPanelOrganizer mBackgroundPanelOrganizer; + private OneHandedUiEventLogger mOneHandedUiEventLogger; /** * Handle rotation based on OnDisplayChangingListener callback @@ -114,6 +114,8 @@ public class OneHandedController implements RemoteCallable return; } mDisplayAreaOrganizer.onRotateDisplay(mContext, toRotation, wct); + mOneHandedUiEventLogger.writeEvent( + OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT); }; private final DisplayController.OnDisplaysChangedListener mDisplaysChangedListener = @@ -583,6 +585,10 @@ public class OneHandedController implements RemoteCallable mContext.getContentResolver(), mUserId); setSwipeToNotificationEnabled(enabled); + mOneHandedUiEventLogger.writeEvent(enabled + ? OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON + : OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF); + // Also checks one handed mode settings since they all need gesture overlay. setEnabledGesturalOverlay( enabled || mOneHandedSettingsUtil.getSettingsOneHandedModeEnabled( diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedUiEventLogger.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedUiEventLogger.java index 38ffb07aa5a4d..4e610fad05ae2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedUiEventLogger.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedUiEventLogger.java @@ -50,6 +50,8 @@ public class OneHandedUiEventLogger { public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_4 = 15; public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_8 = 16; public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_12 = 17; + public static final int EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON = 18; + public static final int EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF = 19; private static final String[] EVENT_TAGS = { "one_handed_trigger_gesture_in", @@ -69,7 +71,9 @@ public class OneHandedUiEventLogger { "one_handed_settings_timeout_seconds_never", "one_handed_settings_timeout_seconds_4", "one_handed_settings_timeout_seconds_8", - "one_handed_settings_timeout_seconds_12" + "one_handed_settings_timeout_seconds_12", + "one_handed_settings_show_notification_enabled_on", + "one_handed_settings_show_notification_enabled_off" }; public OneHandedUiEventLogger(UiEventLogger uiEventLogger) { @@ -152,7 +156,13 @@ public class OneHandedUiEventLogger { ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_8(364), @UiEvent(doc = "One-Handed mode timeout value changed to 12 seconds") - ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12(365); + ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12(365), + + @UiEvent(doc = "One-Handed mode show notification toggle on") + ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_ON(847), + + @UiEvent(doc = "One-Handed mode show notification toggle off") + ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF(848); private final int mId; @@ -247,6 +257,14 @@ public class OneHandedUiEventLogger { mUiEventLogger.log(OneHandedSettingsTogglesEvent .ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12); break; + case EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON: + mUiEventLogger.log(OneHandedSettingsTogglesEvent + .ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_ON); + break; + case EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF: + mUiEventLogger.log(OneHandedSettingsTogglesEvent + .ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF); + break; default: // Do nothing break;