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

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

Merge changes Ia432b07f,If39fb7b2 into main 

* changes:
  Remove flag hearing_aids_qs_tile_dialog
  Remove flag hearing_devices_dialog_related_tools
parents 5221e926 924791e5

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/multivalentTests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java

+0 −15
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import static org.mockito.Mockito.when; 


import android.content.Intent;

import android.os.Handler;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.provider.Settings;

import android.service.quicksettings.Tile;

import android.testing.TestableLooper;
@@ -38,7 +36,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.accessibility.hearingaid.HearingDevicesChecker;

import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager;
@@ -123,18 +120,6 @@ public class HearingDevicesTileTest extends SysuiTestCase { 
        mTestableLooper.processAllMessages();

    }



    @Test

    @EnableFlags(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG)

    public void isAvailable_flagEnabled_true() {

        assertThat(mTile.isAvailable()).isTrue();

    }



    @Test

    @DisableFlags(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG)

    public void isAvailable_flagDisabled_false() {

        assertThat(mTile.isAvailable()).isFalse();

    }



    @Test

    public void longClick_expectedAction() {

        mTile.longClick(null);

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/interactor/HearingDevicesTileDataInteractorTest.kt

+1 −14
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ 
package com.android.systemui.qs.tiles.impl.hearingdevices.domain.interactor



import android.os.UserHandle

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.EnabledOnRavenwood

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.accessibility.hearingaid.HearingDevicesChecker

import com.android.systemui.coroutines.collectLastValue
@@ -66,24 +63,14 @@ class HearingDevicesTileDataInteractorTest : SysuiTestCase() { 
        underTest = HearingDevicesTileDataInteractor(testScope.testScheduler, controller, checker)

    }



    @EnableFlags(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG)

    @Test

    fun availability_flagEnabled_returnTrue() =

    fun availability_returnTrue() =

        testScope.runTest {

            val availability by collectLastValue(underTest.availability(testUser))



            assertThat(availability).isTrue()

        }



    @DisableFlags(Flags.FLAG_HEARING_AIDS_QS_TILE_DIALOG)

    @Test

    fun availability_flagDisabled_returnFalse() =

        testScope.runTest {

            val availability by collectLastValue(underTest.availability(testUser))



            assertThat(availability).isFalse()

        }



    @Test

    fun tileData_bluetoothStateChanged_dataMatchesChecker() =

        testScope.runTest {

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) {

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

+0 −6
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;



import com.android.systemui.Flags;



import javax.inject.Inject;



/**
@@ -43,10 +41,6 @@ public class HearingDevicesDialogReceiver extends BroadcastReceiver { 


    @Override

    public void onReceive(Context context, Intent intent) {

        if (!Flags.hearingAidsQsTileDialog()) {

            return;

        }



        if (ACTION.equals(intent.getAction())) {

            mDialogManager.showDialog(/* expandable= */ null, LAUNCH_SOURCE_A11Y);

        }