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

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

Merge "Remove flag enable_hearing_aid_preset_control" into main

parents cfe94340 a6c383ec

src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceController.java

+2 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import androidx.annotation.NonNull; 
import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;



import com.android.settings.accessibility.Flags;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -107,10 +106,8 @@ public class BluetoothDetailsHearingDeviceController extends BluetoothDetailsCon 
            mControllers.add(new BluetoothDetailsHearingDeviceSettingsController(mContext,

                    mFragment, mCachedDevice, mLifecycle));

        }

        if (Flags.enableHearingAidPresetControl()) {

        mControllers.add(new BluetoothDetailsHearingAidsPresetsController(mContext, mFragment,

                mManager, mCachedDevice, mLifecycle));

        }

        if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {

            mControllers.add(new BluetoothDetailsAmbientVolumePreferenceController(mContext,

                    mManager, mFragment, mCachedDevice, mLifecycle));

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHearingDeviceControllerTest.java

+1 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.platform.test.annotations.RequiresFlagsEnabled; 
import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;



import com.android.settings.accessibility.Flags;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -119,23 +118,13 @@ public class BluetoothDetailsHearingDeviceControllerTest extends 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_HEARING_AID_PRESET_CONTROL)

    public void initSubControllers_flagEnabled_presetControllerExist() {

    public void initSubControllers_presetControllerExist() {

        mHearingDeviceController.initSubControllers(false);



        assertThat(mHearingDeviceController.getSubControllers().stream().anyMatch(

                c -> c instanceof BluetoothDetailsHearingAidsPresetsController)).isTrue();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_HEARING_AID_PRESET_CONTROL)

    public void initSubControllers_flagDisabled_presetControllerNotExist() {

        mHearingDeviceController.initSubControllers(false);



        assertThat(mHearingDeviceController.getSubControllers().stream().anyMatch(

                c -> c instanceof BluetoothDetailsHearingAidsPresetsController)).isFalse();

    }



    @Test

    @RequiresFlagsEnabled(

            com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICES_AMBIENT_VOLUME_CONTROL)