From f322a43a57a4c682cde25cd1b01fdd7b7e302f4a Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Sat, 17 Feb 2024 07:35:52 +0000 Subject: [PATCH] [ToA] Add the metrics in Settings Bug: 323462103 Test: manual + presubmit Change-Id: Ic7ad80ed0829b11de4f8f7278149292d0cd80622 --- .../settings/localepicker/TermsOfAddressFeminineController.java | 2 +- .../localepicker/TermsOfAddressMasculineController.java | 2 +- .../settings/localepicker/TermsOfAddressNeutralController.java | 2 +- .../localepicker/TermsOfAddressFeminineControllerTest.java | 1 + .../localepicker/TermsOfAddressMasculineControllerTest.java | 1 + .../localepicker/TermsOfAddressNeutralControllerTest.java | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java b/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java index fdc4589cf5d..2227297c1a4 100644 --- a/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java +++ b/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java @@ -35,7 +35,7 @@ public class TermsOfAddressFeminineController extends TermsOfAddressBaseControll @Override protected int getMetricsActionKey() { - return 0; + return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED; } @Override diff --git a/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java b/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java index 86011136e10..1548be2a90a 100644 --- a/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java +++ b/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java @@ -35,7 +35,7 @@ public class TermsOfAddressMasculineController extends TermsOfAddressBaseControl @Override protected int getMetricsActionKey() { - return 0; + return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED; } @Override diff --git a/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java b/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java index e67bd4d12d8..0863c4fa682 100644 --- a/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java +++ b/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java @@ -35,7 +35,7 @@ public class TermsOfAddressNeutralController extends TermsOfAddressBaseControlle @Override protected int getMetricsActionKey() { - return 0; + return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED; } @Override diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java index d1e30784e13..c04e5f92a63 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java @@ -97,6 +97,7 @@ public class TermsOfAddressFeminineControllerTest { selectedPreference.performClick(); + assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE); assertThat(selectedPreference.isSelected()).isTrue(); assertThat(pref.isSelected()).isFalse(); } diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java index 5bf30731295..c2298be6faf 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java @@ -97,6 +97,7 @@ public class TermsOfAddressMasculineControllerTest { selectedPreference.performClick(); + assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE); assertThat(selectedPreference.isSelected()).isTrue(); assertThat(pref.isSelected()).isFalse(); } diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java index e83f3cdfcd8..fb207fc8cfe 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java @@ -97,6 +97,7 @@ public class TermsOfAddressNeutralControllerTest { selectedPreference.performClick(); + assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL); assertThat(selectedPreference.isSelected()).isTrue(); assertThat(pref.isSelected()).isFalse(); }