diff options
2 files changed, 45 insertions, 19 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt index 1f27582cb7aa..537dbb93826e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt @@ -136,9 +136,9 @@ enum class ChipStateSender( ), ) { override fun isValidNextState(nextState: ChipStateSender): Boolean { - return nextState == FAR_FROM_RECEIVER || - nextState == ALMOST_CLOSE_TO_START_CAST || - nextState == TRANSFER_TO_THIS_DEVICE_TRIGGERED + // Since _SUCCEEDED is the end of a transfer sequence, we should be able to move to any + // state that represents the beginning of a new sequence. + return stateIsStartOfSequence(nextState) } }, @@ -158,9 +158,9 @@ enum class ChipStateSender( ), ) { override fun isValidNextState(nextState: ChipStateSender): Boolean { - return nextState == FAR_FROM_RECEIVER || - nextState == ALMOST_CLOSE_TO_END_CAST || - nextState == TRANSFER_TO_RECEIVER_TRIGGERED + // Since _SUCCEEDED is the end of a transfer sequence, we should be able to move to any + // state that represents the beginning of a new sequence. + return stateIsStartOfSequence(nextState) } }, @@ -173,9 +173,9 @@ enum class ChipStateSender( endItem = SenderEndItem.Error, ) { override fun isValidNextState(nextState: ChipStateSender): Boolean { - return nextState == FAR_FROM_RECEIVER || - nextState == ALMOST_CLOSE_TO_START_CAST || - nextState == TRANSFER_TO_THIS_DEVICE_TRIGGERED + // Since _FAILED is the end of a transfer sequence, we should be able to move to any + // state that represents the beginning of a new sequence. + return stateIsStartOfSequence(nextState) } }, @@ -188,9 +188,9 @@ enum class ChipStateSender( endItem = SenderEndItem.Error, ) { override fun isValidNextState(nextState: ChipStateSender): Boolean { - return nextState == FAR_FROM_RECEIVER || - nextState == ALMOST_CLOSE_TO_END_CAST || - nextState == TRANSFER_TO_RECEIVER_TRIGGERED + // Since _FAILED is the end of a transfer sequence, we should be able to move to any + // state that represents the beginning of a new sequence. + return stateIsStartOfSequence(nextState) } }, @@ -210,9 +210,9 @@ enum class ChipStateSender( } override fun isValidNextState(nextState: ChipStateSender): Boolean { - return nextState == FAR_FROM_RECEIVER || - nextState.transferStatus == TransferStatus.NOT_STARTED || - nextState.transferStatus == TransferStatus.IN_PROGRESS + // When far away, we can go to any state that represents the start of a transfer + // sequence. + return stateIsStartOfSequence(nextState) } }; @@ -227,6 +227,20 @@ enum class ChipStateSender( return Text.Loaded(context.getString(stringResId!!, otherDeviceName)) } + /** + * Returns true if moving from this state to [nextState] is a valid transition. + * + * In general, we expect a media transfer go to through a sequence of states: + * For push-to-receiver: + * - ALMOST_CLOSE_TO_START_CAST => TRANSFER_TO_RECEIVER_TRIGGERED => + * TRANSFER_TO_RECEIVER_(SUCCEEDED|FAILED) + * - ALMOST_CLOSE_TO_END_CAST => TRANSFER_TO_THIS_DEVICE_TRIGGERED => + * TRANSFER_TO_THIS_DEVICE_(SUCCEEDED|FAILED) + * + * This method should validate that the states go through approximately that sequence. + * + * See b/221265848 for more details. + */ abstract fun isValidNextState(nextState: ChipStateSender): Boolean companion object { @@ -276,6 +290,18 @@ enum class ChipStateSender( return currentState.isValidNextState(desiredState) } + + /** + * Returns true if [state] represents a state at the beginning of a sequence and false + * otherwise. + */ + private fun stateIsStartOfSequence(state: ChipStateSender): Boolean { + return state == FAR_FROM_RECEIVER || + state.transferStatus == TransferStatus.NOT_STARTED || + // It's possible to skip the NOT_STARTED phase and go immediately into the + // IN_PROGRESS phase. + state.transferStatus == TransferStatus.IN_PROGRESS + } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt index 54d4460af6e4..7e0aa1d025dd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt @@ -622,7 +622,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { } @Test - fun commandQueueCallback_receiverSucceededThenReceiverTriggered_invalidTransitionLogged() { + fun commandQueueCallback_receiverSucceededThenThisDeviceSucceeded_invalidTransitionLogged() { displayReceiverTriggered() commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, @@ -632,7 +632,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { reset(windowManager) commandQueueCallback.updateMediaTapToTransferSenderDisplay( - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, routeInfo, null ) @@ -642,7 +642,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { } @Test - fun commandQueueCallback_thisDeviceSucceededThenThisDeviceTriggered_invalidTransitionLogged() { + fun commandQueueCallback_thisDeviceSucceededThenReceiverSucceeded_invalidTransitionLogged() { displayThisDeviceTriggered() commandQueueCallback.updateMediaTapToTransferSenderDisplay( StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, @@ -652,7 +652,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() { reset(windowManager) commandQueueCallback.updateMediaTapToTransferSenderDisplay( - StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, routeInfo, null ) |