Merge "[ToA] Add the metrics in Settings" into main

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

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

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

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();
     }

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();
     }

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();
     }