Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Media TTT] Allow additional transitions from the SUCCEEDED/FAILED states." into tm-qpr-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-02-01 15:07:05 +00:00
committed by Android (Google) Code Review
parent 32d10db9c2 d262830d50
commit 1cdcd02fba
2 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt
View File

@@ -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
}
}
}

8
packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt
View File

@@ -624,7 +624,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,
@@ -634,7 +634,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
)
@@ -644,7 +644,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,
@@ -654,7 +654,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
)