Clean up the feature flag
Remove flag from the feature and test.
Bug: 269341316
Test: atest FontScalingTileTest
Change-Id: I42edad874a2a32390b769728d3acd4355778670c
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt
index 423fa80..1f9979a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt
@@ -28,8 +28,6 @@
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 @@
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 @@
) {
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()
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt
index cbc3553..d1d3c17 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt
@@ -26,8 +26,6 @@
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 @@
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 @@
FakeSettings(),
FakeSettings(),
FakeSystemClock(),
- featureFlags,
userTracker,
backgroundDelayableExecutor,
)
@@ -117,18 +112,7 @@
}
@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()