Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6368895a authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[ToA] Metrics in Settings" into main

parents 3bea5fcc 7dc497df

src/com/android/settings/localepicker/TermsOfAddressFeminineController.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class TermsOfAddressFeminineController extends TermsOfAddressBaseControll 


    @Override

    protected int getMetricsActionKey() {

        return SettingsEnums.ACTION_TERMS_OF_ADDRESS_FEMININE;

        return 0;

    }



    @Override

src/com/android/settings/localepicker/TermsOfAddressMasculineController.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class TermsOfAddressMasculineController extends TermsOfAddressBaseControl 


    @Override

    protected int getMetricsActionKey() {

        return SettingsEnums.ACTION_TERMS_OF_ADDRESS_MASCULINE;

        return 0;

    }



    @Override

src/com/android/settings/localepicker/TermsOfAddressNeutralController.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class TermsOfAddressNeutralController extends TermsOfAddressBaseControlle 


    @Override

    protected int getMetricsActionKey() {

        return SettingsEnums.ACTION_TERMS_OF_ADDRESS_NEUTRAL;

        return 0;

    }



    @Override

tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public class TermsOfAddressMasculineControllerTest { 


        selectedPreference.performClick();



        assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE);

        assertThat(selectedPreference.isSelected()).isTrue();

        assertThat(pref.isSelected()).isFalse();

    }