From 97b75f09ed73a9ae2c883ee001a769d534cc1d43 Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Mon, 5 Jul 2021 17:30:28 +0800 Subject: [PATCH] Add metrics log for One-handed mode Shortcut toggle switch To write metrics log for One-handed mode Shortcut toggle switch state. Bug: 192641587 Test: Local add logs to verify before writing metrics logs API call Test: atest SystemUITests Test: atest WMShellTests Change-Id: I02fda724bf2960355d78f1a26ac6d65225687176 --- .../shell/onehanded/OneHandedController.java | 4 ++++ .../onehanded/OneHandedUiEventLogger.java | 22 +++++++++++++++++-- 2 files changed, 24 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 54b81ad782564..2054a7d361c14 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 @@ -601,6 +601,10 @@ public class OneHandedController implements RemoteCallable void onShortcutEnabledChanged() { mIsShortcutEnabled = mOneHandedSettingsUtil.getShortcutEnabled( mContext.getContentResolver(), mUserId); + + mOneHandedUiEventLogger.writeEvent(mIsShortcutEnabled + ? OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON + : OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF); } private void setupTimeoutListener() { 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 4e610fad05ae2..1cf408075c9d9 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 @@ -52,6 +52,8 @@ public class OneHandedUiEventLogger { 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; + public static final int EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON = 20; + public static final int EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF = 21; private static final String[] EVENT_TAGS = { "one_handed_trigger_gesture_in", @@ -73,7 +75,9 @@ public class OneHandedUiEventLogger { "one_handed_settings_timeout_seconds_8", "one_handed_settings_timeout_seconds_12", "one_handed_settings_show_notification_enabled_on", - "one_handed_settings_show_notification_enabled_off" + "one_handed_settings_show_notification_enabled_off", + "one_handed_settings_shortcut_enabled_on", + "one_handed_settings_shortcut_enabled_off" }; public OneHandedUiEventLogger(UiEventLogger uiEventLogger) { @@ -162,7 +166,13 @@ public class OneHandedUiEventLogger { 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); + ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF(848), + + @UiEvent(doc = "One-Handed mode shortcut toggle on") + ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_ON(870), + + @UiEvent(doc = "One-Handed mode shortcut toggle off") + ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_OFF(871); private final int mId; @@ -265,6 +275,14 @@ public class OneHandedUiEventLogger { mUiEventLogger.log(OneHandedSettingsTogglesEvent .ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF); break; + case EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON: + mUiEventLogger.log(OneHandedSettingsTogglesEvent + .ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_ON); + break; + case EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF: + mUiEventLogger.log(OneHandedSettingsTogglesEvent + .ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_OFF); + break; default: // Do nothing break;