PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ToA] Metrics in Settings" into main

Browse Source
This commit is contained in:
Zoey Chen
2024-02-07 08:07:13 +00:00
committed by Android (Google) Code Review
parent 3bea5fcc98 7dc497dfcc
commit 6368895adf
6 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/localepicker/TermsOfAddressFeminineController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressFeminineController extends TermsOfAddressBaseControll
@Override
protected int getMetricsActionKey() {
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_FEMININE;
return 0;
}
@Override

2
src/com/android/settings/localepicker/TermsOfAddressMasculineController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressMasculineController extends TermsOfAddressBaseControl
@Override
protected int getMetricsActionKey() {
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_MASCULINE;
return 0;
}
@Override

2
src/com/android/settings/localepicker/TermsOfAddressNeutralController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressNeutralController extends TermsOfAddressBaseControlle
@Override
protected int getMetricsActionKey() {
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_NEUTRAL;
return 0;
}
@Override

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
View File

@@ -97,7 +97,6 @@ public class TermsOfAddressFeminineControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
View File

@@ -97,7 +97,6 @@ public class TermsOfAddressMasculineControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
View File

@@ -97,7 +97,6 @@ public class TermsOfAddressNeutralControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}