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

Commit deebcef3 authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename the Settings key of HAC" into main

parents dc36cc44 a238bc2e

src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class HearingAidCompatibilityPreferenceController extends TogglePreferenc 
    @Override

    public boolean isChecked() {

        final int hac = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID, HAC_DISABLED);

                Settings.System.HEARING_AID_COMPATIBILITY, HAC_DISABLED);

        return hac == HAC_ENABLED;

    }
@@ -71,7 +71,8 @@ public class HearingAidCompatibilityPreferenceController extends TogglePreferenc 
        FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().changed(

                getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0);

        setAudioParameterHacEnabled(isChecked);

        return Settings.System.putInt(mContext.getContentResolver(), Settings.System.HEARING_AID,

        return Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID_COMPATIBILITY,

                (isChecked ? HAC_ENABLED : HAC_DISABLED));

    }

tests/robotests/src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceControllerTest.java

+6 −6
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ public class HearingAidCompatibilityPreferenceControllerTest { 


    @Test

    public void isChecked_enabledHac_shouldReturnTrue() {

        Settings.System.putInt(mContext.getContentResolver(), Settings.System.HEARING_AID,

                HAC_ENABLED);

        Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID_COMPATIBILITY, HAC_ENABLED);

        mController.updateState(mPreference);



        assertThat(mController.isChecked()).isTrue();
@@ -105,8 +105,8 @@ public class HearingAidCompatibilityPreferenceControllerTest { 


    @Test

    public void isChecked_disabledHac_shouldReturnFalse() {

        Settings.System.putInt(mContext.getContentResolver(), Settings.System.HEARING_AID,

                HAC_DISABLED);

        Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID_COMPATIBILITY, HAC_DISABLED);

        mController.updateState(mPreference);



        assertThat(mController.isChecked()).isFalse();
@@ -118,7 +118,7 @@ public class HearingAidCompatibilityPreferenceControllerTest { 
        mController.setChecked(true);



        assertThat(Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID, HAC_DISABLED)).isEqualTo(HAC_ENABLED);

                Settings.System.HEARING_AID_COMPATIBILITY, HAC_DISABLED)).isEqualTo(HAC_ENABLED);

        verify(mAudioManager).setParameters("HACSetting=ON;");

    }
@@ -127,7 +127,7 @@ public class HearingAidCompatibilityPreferenceControllerTest { 
        mController.setChecked(false);



        assertThat(Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.HEARING_AID, HAC_DISABLED)).isEqualTo(HAC_DISABLED);

                Settings.System.HEARING_AID_COMPATIBILITY, HAC_DISABLED)).isEqualTo(HAC_DISABLED);

        verify(mAudioManager).setParameters("HACSetting=OFF;");

    }