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

Commit 823a1462 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge changes I4ff6d8ce,I42edad87 into main

* changes:
  Remove the Font scaling tile feature flag
  Clean up the feature flag
parents 59439073 4f4811f8
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -368,10 +368,6 @@ object Flags {
    // TODO(b/244064524): Tracking Bug
    @JvmField val QS_SECONDARY_DATA_SUB_INFO = releasedFlag("qs_secondary_data_sub_info")

    /** Enables Font Scaling Quick Settings tile */
    // TODO(b/269341316): Tracking Bug
    @JvmField val ENABLE_FONT_SCALING_TILE = releasedFlag("enable_font_scaling_tile")

    /** Enables new QS Edit Mode visual refresh */
    // TODO(b/269787742): Tracking Bug
    @JvmField
+0 −7
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import com.android.systemui.animation.DialogCuj
import com.android.systemui.animation.DialogLaunchAnimator
import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.flags.FeatureFlags
import com.android.systemui.flags.Flags
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.plugins.FalsingManager
import com.android.systemui.plugins.qs.QSTile
@@ -64,7 +62,6 @@ constructor(
    private val systemSettings: SystemSettings,
    private val secureSettings: SecureSettings,
    private val systemClock: SystemClock,
    private val featureFlags: FeatureFlags,
    private val userTracker: UserTracker,
    @Background private val backgroundDelayableExecutor: DelayableExecutor
) :
@@ -81,10 +78,6 @@ constructor(
    ) {
    private val icon = ResourceIcon.get(R.drawable.ic_qs_font_scaling)

    override fun isAvailable(): Boolean {
        return featureFlags.isEnabled(Flags.ENABLE_FONT_SCALING_TILE)
    }

    override fun newTileState(): QSTile.State {
        return QSTile.State()
    }
+1 −17
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import com.android.internal.logging.MetricsLogger
import com.android.systemui.SysuiTestCase
import com.android.systemui.animation.DialogLaunchAnimator
import com.android.systemui.classifier.FalsingManagerFake
import com.android.systemui.flags.FakeFeatureFlags
import com.android.systemui.flags.Flags
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.plugins.statusbar.StatusBarStateController
import com.android.systemui.qs.QSHost
@@ -74,8 +72,6 @@ class FontScalingTileTest : SysuiTestCase() {
    private lateinit var backgroundDelayableExecutor: FakeExecutor
    private lateinit var fontScalingTile: FontScalingTile

    val featureFlags = FakeFeatureFlags()

    @Captor private lateinit var argumentCaptor: ArgumentCaptor<Runnable>

    @Before
@@ -102,7 +98,6 @@ class FontScalingTileTest : SysuiTestCase() {
                FakeSettings(),
                FakeSettings(),
                FakeSystemClock(),
                featureFlags,
                userTracker,
                backgroundDelayableExecutor,
            )
@@ -117,18 +112,7 @@ class FontScalingTileTest : SysuiTestCase() {
    }

    @Test
    fun isAvailable_whenFlagIsFalse_returnsFalse() {
        featureFlags.set(Flags.ENABLE_FONT_SCALING_TILE, false)

        val isAvailable = fontScalingTile.isAvailable()

        assertThat(isAvailable).isFalse()
    }

    @Test
    fun isAvailable_whenFlagIsTrue_returnsTrue() {
        featureFlags.set(Flags.ENABLE_FONT_SCALING_TILE, true)

    fun isAvailable_alwaysReturnsTrue() {
        val isAvailable = fontScalingTile.isAvailable()

        assertThat(isAvailable).isTrue()