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

Commit c3f31531 authored by Angela Wang's avatar Angela Wang
Browse files

Remove flag hearing_devices_dialog_related_tools 

Flag: EXEMPT remove flag
Bug: 388175226
Test: atest HearingDevicesDialogDelegateTest
Change-Id: If39fb7b28eb389af5d5677d8ed8b821118813f0f
parent b4351c14

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java

+0 −4
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothAdapter; 
import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;

import com.android.settingslib.bluetooth.VolumeControlProfile;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogTransitionAnimator;

import com.android.systemui.bluetooth.qsdialog.DeviceItem;
@@ -227,7 +226,6 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS)

    public void showDialog_noLiveCaption_noRelatedToolsInConfig_relatedToolLayoutGone() {

        mContext.getOrCreateTestableResources().addOverride(

                R.array.config_quickSettingsHearingDevicesRelatedToolName, new String[]{});
@@ -239,7 +237,6 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS)

    public void showDialog_hasLiveCaption_noRelatedToolsInConfig_showOneRelatedTool() {

        when(mPackageManager.queryIntentActivities(

                eq(LIVE_CAPTION_INTENT), anyInt())).thenReturn(
@@ -254,7 +251,6 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS)

    public void showDialog_hasLiveCaption_oneRelatedToolInConfig_showTwoRelatedTools()

            throws PackageManager.NameNotFoundException {

        when(mPackageManager.queryIntentActivities(eq(LIVE_CAPTION_INTENT), anyInt()))

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+1 −3
Original line number Diff line number Diff line
@@ -286,10 +286,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
        if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {

            setupAmbientControls();

        }

        if (com.android.systemui.Flags.hearingDevicesDialogRelatedTools()) {

        setupRelatedToolsView(dialog);

    }

    }



    @Override

    public void onStart(@NonNull SystemUIDialog dialog) {