diff options
3 files changed, 3 insertions, 53 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 89a983ba5d90..7876a6f74293 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -348,12 +348,6 @@ object Flags { // TODO(b/254512673): Tracking Bug @JvmField val DREAM_MEDIA_TAP_TO_OPEN = unreleasedFlag("dream_media_tap_to_open") - // TODO(b/254513168): Tracking Bug - @JvmField val UMO_SURFACE_RIPPLE = releasedFlag("umo_surface_ripple") - - // TODO(b/261734857): Tracking Bug - @JvmField val UMO_TURBULENCE_NOISE = releasedFlag("umo_turbulence_noise") - // TODO(b/263272731): Tracking Bug val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag("media_ttt_receiver_success_ripple") diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java index 2551da8e7795..5720cc74002b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java @@ -87,8 +87,6 @@ import com.android.systemui.bluetooth.BroadcastDialogController; import com.android.systemui.broadcast.BroadcastSender; 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.media.controls.models.GutsViewHolder; import com.android.systemui.media.controls.models.player.MediaAction; import com.android.systemui.media.controls.models.player.MediaButton; @@ -247,7 +245,6 @@ public class MediaControlPanel { private String mCurrentBroadcastApp; private MultiRippleController mMultiRippleController; private TurbulenceNoiseController mTurbulenceNoiseController; - private final FeatureFlags mFeatureFlags; private final GlobalSettings mGlobalSettings; private TurbulenceNoiseAnimationConfig mTurbulenceNoiseAnimationConfig; @@ -281,7 +278,6 @@ public class MediaControlPanel { ActivityIntentHelper activityIntentHelper, NotificationLockscreenUserManager lockscreenUserManager, BroadcastDialogController broadcastDialogController, - FeatureFlags featureFlags, GlobalSettings globalSettings, MediaFlags mediaFlags ) { @@ -312,8 +308,6 @@ public class MediaControlPanel { return Unit.INSTANCE; }); - mFeatureFlags = featureFlags; - mGlobalSettings = globalSettings; updateAnimatorDurationScale(); } @@ -1187,9 +1181,7 @@ public class MediaControlPanel { action.run(); - if (mFeatureFlags.isEnabled(Flags.UMO_SURFACE_RIPPLE)) { - mMultiRippleController.play(createTouchRippleAnimation(button)); - } + mMultiRippleController.play(createTouchRippleAnimation(button)); if (icon instanceof Animatable) { ((Animatable) icon).start(); @@ -1228,8 +1220,7 @@ public class MediaControlPanel { } private boolean shouldPlayTurbulenceNoise() { - return mFeatureFlags.isEnabled(Flags.UMO_TURBULENCE_NOISE) && mButtonClicked && !mWasPlaying - && isPlaying(); + return mButtonClicked && !mWasPlaying && isPlaying(); } private TurbulenceNoiseAnimationConfig createTurbulenceNoiseAnimation() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt index 2f35380e562b..59965022d7cc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt @@ -64,8 +64,6 @@ import com.android.systemui.ActivityIntentHelper import com.android.systemui.SysuiTestCase import com.android.systemui.bluetooth.BroadcastDialogController import com.android.systemui.broadcast.BroadcastSender -import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.models.GutsViewHolder import com.android.systemui.media.controls.models.player.MediaAction @@ -227,11 +225,6 @@ public class MediaControlPanelTest : SysuiTestCase() { @Mock private lateinit var recProgressBar2: SeekBar @Mock private lateinit var recProgressBar3: SeekBar private var shouldShowBroadcastButton: Boolean = false - private val fakeFeatureFlag = - FakeFeatureFlags().apply { - this.set(Flags.UMO_SURFACE_RIPPLE, false) - this.set(Flags.UMO_TURBULENCE_NOISE, false) - } @Mock private lateinit var globalSettings: GlobalSettings @Mock private lateinit var mediaFlags: MediaFlags @@ -275,7 +268,6 @@ public class MediaControlPanelTest : SysuiTestCase() { activityIntentHelper, lockscreenUserManager, broadcastDialogController, - fakeFeatureFlag, globalSettings, mediaFlags, ) { @@ -2397,8 +2389,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun onButtonClick_touchRippleFlagEnabled_playsTouchRipple() { - fakeFeatureFlag.set(Flags.UMO_SURFACE_RIPPLE, true) + fun onButtonClick_playsTouchRipple() { val semanticActions = MediaButton( playOrPause = @@ -2419,31 +2410,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun onButtonClick_touchRippleFlagDisabled_doesNotPlayTouchRipple() { - fakeFeatureFlag.set(Flags.UMO_SURFACE_RIPPLE, false) - val semanticActions = - MediaButton( - playOrPause = - MediaAction( - icon = null, - action = {}, - contentDescription = "play", - background = null - ) - ) - val data = mediaData.copy(semanticActions = semanticActions) - player.attachPlayer(viewHolder) - player.bindPlayer(data, KEY) - - viewHolder.actionPlayPause.callOnClick() - - assertThat(viewHolder.multiRippleView.ripples.size).isEqualTo(0) - } - - @Test fun playTurbulenceNoise_finishesAfterDuration() { - fakeFeatureFlag.set(Flags.UMO_TURBULENCE_NOISE, true) - val semanticActions = MediaButton( playOrPause = @@ -2474,8 +2441,6 @@ public class MediaControlPanelTest : SysuiTestCase() { @Test fun playTurbulenceNoise_whenPlaybackStateIsNotPlaying_doesNotPlayTurbulence() { - fakeFeatureFlag.set(Flags.UMO_TURBULENCE_NOISE, true) - val semanticActions = MediaButton( custom0 = |