From 7dc497dfcc9e98c2dd35e7aefecefcc4700f3b0e Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 2 Feb 2024 06:06:56 +0000 Subject: [PATCH] [ToA] Metrics in Settings Bug: 323462103 Test: atest TermsOfAddressNotSpecifiedControllerTest Test: atest TermsOfAddressNeutralControllerTest Test: atest TermsOfAddressMasculineControllerTest Test: atest TermsOfAddressFeminineControllerTest Change-Id: I09c3ad4c92275ba48b810b1971a4e98e54e5136d --- .../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, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java b/src/com/android/settings/localepicker/TermsOfAddressFeminineController.java index 9a46872641b..fdc4589cf5d 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 SettingsEnums.ACTION_TERMS_OF_ADDRESS_FEMININE; + return 0; } @Override diff --git a/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java b/src/com/android/settings/localepicker/TermsOfAddressMasculineController.java index cb39df0c8f8..86011136e10 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 SettingsEnums.ACTION_TERMS_OF_ADDRESS_MASCULINE; + return 0; } @Override diff --git a/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java b/src/com/android/settings/localepicker/TermsOfAddressNeutralController.java index e0693b5e74f..e67bd4d12d8 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 SettingsEnums.ACTION_TERMS_OF_ADDRESS_NEUTRAL; + return 0; } @Override diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java index c04e5f92a63..d1e30784e13 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java @@ -97,7 +97,6 @@ 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 c2298be6faf..5bf30731295 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java @@ -97,7 +97,6 @@ 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 fb207fc8cfe..e83f3cdfcd8 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java @@ -97,7 +97,6 @@ public class TermsOfAddressNeutralControllerTest { selectedPreference.performClick(); - assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL); assertThat(selectedPreference.isSelected()).isTrue(); assertThat(pref.isSelected()).isFalse(); }