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

Commit b8d8c58d authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Merge "Deletion of MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE flag" into main

parents c96d9001 6999eb7a

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -324,9 +324,6 @@ object Flags { 
    // TODO(b/254512673): Tracking Bug

    @JvmField val DREAM_MEDIA_TAP_TO_OPEN = unreleasedFlag("dream_media_tap_to_open")



    // TODO(b/263272731): Tracking Bug

    val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag("media_ttt_receiver_success_ripple")



    // TODO(b/266157412): Tracking Bug

    val MEDIA_RETAIN_SESSIONS = unreleasedFlag("media_retain_sessions")

packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt

+0 −4
Original line number Diff line number Diff line
@@ -26,8 +26,4 @@ import javax.inject.Inject 
class MediaTttFlags @Inject constructor(private val featureFlags: FeatureFlags) {

    /** */

    fun isMediaTttEnabled(): Boolean = featureFlags.isEnabled(Flags.MEDIA_TAP_TO_TRANSFER)



    /** Check whether the flag for the receiver success state is enabled. */

    fun isMediaTttReceiverSuccessRippleEnabled(): Boolean =

        featureFlags.isEnabled(Flags.MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE)

}

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

+1 −2
Original line number Diff line number Diff line
@@ -266,8 +266,7 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        // translation animation.

        bounceAnimator.removeAllUpdateListeners()

        bounceAnimator.cancel()

        if (removalReason == ChipStateReceiver.TRANSFER_TO_RECEIVER_SUCCEEDED.name &&

                mediaTttFlags.isMediaTttReceiverSuccessRippleEnabled()) {

        if (removalReason == ChipStateReceiver.TRANSFER_TO_RECEIVER_SUCCEEDED.name) {

            rippleController.expandToSuccessState(rippleView, onAnimationEnd)

            animateViewTranslationAndFade(

                iconContainerView,

packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { 
    fun setUp() {

        MockitoAnnotations.initMocks(this)

        whenever(mediaTttFlags.isMediaTttEnabled()).thenReturn(true)

        whenever(mediaTttFlags.isMediaTttReceiverSuccessRippleEnabled()).thenReturn(true)



        fakeAppIconDrawable = context.getDrawable(R.drawable.ic_cake)!!

        whenever(packageManager.getApplicationIcon(PACKAGE_NAME)).thenReturn(fakeAppIconDrawable)