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

Commit 924791e5 authored by Angela Wang's avatar Angela Wang
Browse files

Remove flag hearing_aids_qs_tile_dialog

Flag: EXEMPT remove flag
Bug: 388175226
Test: atest HearingDevicesTileTest
Test: atest HearingDevicesTileDataInteractorTest
Test: atest AccessibilityManagerServiceTest

Change-Id: Ia432b07fea9470070a909845919f8d343b369c11
parent c3f31531
Loading
Loading
Loading
Loading
+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);
+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 {
+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);
        }
+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ interface QSAccessibilityModule {
            stateInteractor: HearingDevicesTileDataInteractor,
            userActionInteractor: HearingDevicesTileUserActionInteractor,
        ): QSTileViewModel {
            return if (Flags.hearingAidsQsTileDialog() && Flags.qsNewTilesFuture()) {
            return if (Flags.qsNewTilesFuture()) {
                factory.create(
                    TileSpec.create(HEARING_DEVICES_TILE_SPEC),
                    userActionInteractor,
+0 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.widget.Button;
import androidx.annotation.Nullable;

import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Flags;
import com.android.systemui.accessibility.hearingaid.HearingDevicesChecker;
import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager;
import com.android.systemui.animation.Expandable;
@@ -138,9 +137,4 @@ public class HearingDevicesTile extends QSTileImpl<BooleanState> {
    public CharSequence getTileLabel() {
        return mContext.getString(R.string.quick_settings_hearing_devices_label);
    }

    @Override
    public boolean isAvailable() {
        return Flags.hearingAidsQsTileDialog();
    }
}
Loading