[settings logging] Log accessibility changes from the system tray.

Bug: 1014839
Change-Id: Icd2ff4b14e42118f05bc964824bea004e3a14bf5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2029388Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Jia Meng <jiameng@chromium.org>
Commit-Queue: Rachel Wong <wrong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737205}

ash/system/accessibility/tray_accessibility.cc

@@ -16,6 +16,7 @@
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/machine_learning/user_settings_event_logger.h"
 #include "ash/system/model/system_tray_model.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/tray_detailed_view.h"
@@ -32,6 +33,8 @@
 namespace ash {
 namespace {
 
+using ml::UserSettingsEvent;
+
 enum AccessibilityState {
   A11Y_NONE = 0,
   A11Y_SPOKEN_FEEDBACK = 1 << 0,
@@ -51,6 +54,14 @@ enum AccessibilityState {
   A11Y_SWITCH_ACCESS = 1 << 14,
 };
 
+void LogUserAccessibilityEvent(UserSettingsEvent::Event::AccessibilityId id,
+                               bool new_state) {
+  auto* logger = ml::UserSettingsEventLogger::Get();
+  if (logger) {
+    logger->LogAccessibilityUkmEvent(id, new_state);
+  }
+}
+
 }  // namespace
 
 namespace tray {
@@ -350,6 +361,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_SpokenFeedbackEnabled")
                      : UserMetricsAction("StatusArea_SpokenFeedbackDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::SPOKEN_FEEDBACK,
+                              new_state);
     controller->SetSpokenFeedbackEnabled(new_state, A11Y_NOTIFICATION_NONE);
   } else if (select_to_speak_view_ && view == select_to_speak_view_ &&
              !controller->IsEnterpriseIconVisibleForSelectToSpeak()) {
@@ -357,12 +370,15 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_SelectToSpeakEnabled")
                      : UserMetricsAction("StatusArea_SelectToSpeakDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::SELECT_TO_SPEAK,
+                              new_state);
     controller->SetSelectToSpeakEnabled(new_state);
   } else if (dictation_view_ && view == dictation_view_ &&
              !controller->IsEnterpriseIconVisibleForDictation()) {
     bool new_state = !controller->dictation_enabled();
     RecordAction(new_state ? UserMetricsAction("StatusArea_DictationEnabled")
                            : UserMetricsAction("StatusArea_DictationDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::DICTATION, new_state);
     controller->SetDictationEnabled(new_state);
   } else if (high_contrast_view_ && view == high_contrast_view_ &&
              !controller->IsEnterpriseIconVisibleForHighContrast()) {
@@ -370,13 +386,16 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_HighContrastEnabled")
                      : UserMetricsAction("StatusArea_HighContrastDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::HIGH_CONTRAST,
+                              new_state);
     controller->SetHighContrastEnabled(new_state);
   } else if (screen_magnifier_view_ && view == screen_magnifier_view_ &&
              !controller->IsEnterpriseIconVisibleForFullScreenMagnifier()) {
-    RecordAction(delegate->IsMagnifierEnabled()
-                     ? UserMetricsAction("StatusArea_MagnifierDisabled")
-                     : UserMetricsAction("StatusArea_MagnifierEnabled"));
-    delegate->SetMagnifierEnabled(!delegate->IsMagnifierEnabled());
+    bool new_state = !delegate->IsMagnifierEnabled();
+    RecordAction(new_state ? UserMetricsAction("StatusArea_MagnifierEnabled")
+                           : UserMetricsAction("StatusArea_MagnifierDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::MAGNIFIER, new_state);
+    delegate->SetMagnifierEnabled(new_state);
   } else if (docked_magnifier_view_ && view == docked_magnifier_view_ &&
              !controller->IsEnterpriseIconVisibleForDockedMagnifier()) {
     auto* docked_magnifier_controller =
@@ -392,6 +411,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_DockedMagnifierEnabled")
                      : UserMetricsAction("StatusArea_DockedMagnifierDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::DOCKED_MAGNIFIER,
+                              new_state);
     docked_magnifier_controller->SetEnabled(new_state);
   } else if (large_cursor_view_ && view == large_cursor_view_ &&
              !controller->IsEnterpriseIconVisibleForLargeCursor()) {
@@ -399,12 +420,15 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_LargeCursorEnabled")
                      : UserMetricsAction("StatusArea_LargeCursorDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::LARGE_CURSOR,
+                              new_state);
     controller->SetLargeCursorEnabled(new_state);
   } else if (autoclick_view_ && view == autoclick_view_ &&
              !controller->IsEnterpriseIconVisibleForAutoclick()) {
     bool new_state = !controller->autoclick_enabled();
     RecordAction(new_state ? UserMetricsAction("StatusArea_AutoClickEnabled")
                            : UserMetricsAction("StatusArea_AutoClickDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::AUTO_CLICK, new_state);
     controller->SetAutoclickEnabled(new_state);
   } else if (virtual_keyboard_view_ && view == virtual_keyboard_view_ &&
              !controller->IsEnterpriseIconVisibleForVirtualKeyboard()) {
@@ -412,6 +436,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_VirtualKeyboardEnabled")
                      : UserMetricsAction("StatusArea_VirtualKeyboardDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::VIRTUAL_KEYBOARD,
+                              new_state);
     controller->SetVirtualKeyboardEnabled(new_state);
   } else if (switch_access_view_ && view == switch_access_view_ &&
              !controller->IsEnterpriseIconVisibleForSwitchAccess()) {
@@ -419,6 +445,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_SwitchAccessEnabled")
                      : UserMetricsAction("StatusArea_SwitchAccessDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::SWITCH_ACCESS,
+                              new_state);
     controller->SetSwitchAccessEnabled(new_state);
   } else if (caret_highlight_view_ && view == caret_highlight_view_ &&
              !controller->IsEnterpriseIconVisibleForCaretHighlight()) {
@@ -426,12 +454,15 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_CaretHighlightEnabled")
                      : UserMetricsAction("StatusArea_CaretHighlightDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::CARET_HIGHLIGHT,
+                              new_state);
     controller->SetCaretHighlightEnabled(new_state);
   } else if (mono_audio_view_ && view == mono_audio_view_ &&
              !controller->IsEnterpriseIconVisibleForMonoAudio()) {
     bool new_state = !controller->mono_audio_enabled();
     RecordAction(new_state ? UserMetricsAction("StatusArea_MonoAudioEnabled")
                            : UserMetricsAction("StatusArea_MonoAudioDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::MONO_AUDIO, new_state);
     controller->SetMonoAudioEnabled(new_state);
   } else if (highlight_mouse_cursor_view_ &&
              view == highlight_mouse_cursor_view_ &&
@@ -441,6 +472,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
         new_state
             ? UserMetricsAction("StatusArea_HighlightMouseCursorEnabled")
             : UserMetricsAction("StatusArea_HighlightMouseCursorDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::HIGHLIGHT_MOUSE_CURSOR,
+                              new_state);
     controller->SetCursorHighlightEnabled(new_state);
   } else if (highlight_keyboard_focus_view_ &&
              view == highlight_keyboard_focus_view_ &&
@@ -450,6 +483,8 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
         new_state
             ? UserMetricsAction("StatusArea_HighlightKeyboardFocusEnabled")
             : UserMetricsAction("StatusArea_HighlightKeyboardFocusDisabled"));
+    LogUserAccessibilityEvent(
+        UserSettingsEvent::Event::HIGHLIGHT_KEYBOARD_FOCUS, new_state);
     controller->SetFocusHighlightEnabled(new_state);
   } else if (sticky_keys_view_ && view == sticky_keys_view_ &&
              !controller->IsEnterpriseIconVisibleForStickyKeys()) {
@@ -457,6 +492,7 @@ void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
     RecordAction(new_state
                      ? UserMetricsAction("StatusArea_StickyKeysEnabled")
                      : UserMetricsAction("StatusArea_StickyKeysDisabled"));
+    LogUserAccessibilityEvent(UserSettingsEvent::Event::STICKY_KEYS, new_state);
     controller->SetStickyKeysEnabled(new_state);
   }
 }

ash/system/machine_learning/user_settings_event_logger.cc

@@ -151,6 +151,24 @@ void UserSettingsEventLogger::LogQuietModeUkmEvent(const bool enabled) {
   SendToUkm(settings_event);
 }
 
+void UserSettingsEventLogger::LogAccessibilityUkmEvent(
+    UserSettingsEvent::Event::AccessibilityId id,
+    bool enabled) {
+  UserSettingsEvent settings_event;
+  auto* const event = settings_event.mutable_event();
+
+  event->set_setting_id(UserSettingsEvent::Event::ACCESSIBILITY);
+  event->set_setting_type(UserSettingsEvent::Event::QUICK_SETTINGS);
+  // Convert the setting state to an int. Some settings have multiple states, so
+  // all setting states are stored as ints.
+  event->set_previous_value(!enabled ? 1 : 0);
+  event->set_current_value(enabled ? 1 : 0);
+  event->set_accessibility_id(id);
+
+  PopulateSharedFeatures(&settings_event);
+  SendToUkm(settings_event);
+}
+
 void UserSettingsEventLogger::LogVolumeUkmEvent(const int previous_level,
                                                 const int current_level) {
   UserSettingsEvent settings_event;
@@ -254,6 +272,8 @@ void UserSettingsEventLogger::SendToUkm(
     ukm_event.SetPreviousValue(event.previous_value());
   if (event.has_current_value())
     ukm_event.SetCurrentValue(event.current_value());
+  if (event.has_accessibility_id())
+    ukm_event.SetAccessibilityId(event.accessibility_id());
 
   if (features.has_is_playing_audio())
     ukm_event.SetIsPlayingAudio(features.is_playing_audio());

ash/system/machine_learning/user_settings_event_logger.h

@@ -48,6 +48,11 @@ class UserSettingsEventLogger
   // state.
   void LogQuietModeUkmEvent(bool enabled);
 
+  // Logs an event to UKM that the user has toggled an accessibility setting to
+  // the given state.
+  void LogAccessibilityUkmEvent(UserSettingsEvent::Event::AccessibilityId id,
+                                bool enabled);
+
   // Logs an event to UKM that the user has changed the volume from the tray.
   void LogVolumeUkmEvent(int previous_level, int current_level);