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

Merge "Fix incorrect RemoteInput result source" into tm-dev

Browse Source
This commit is contained in:
Steve Elliott
2022-03-16 13:57:03 +00:00
committed by Android (Google) Code Review
parent 3a6360c11d 4c1d687b1c
commit fcf5da1a07
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputViewController.kt
View File

@@ -299,10 +299,7 @@ class RemoteInputViewControllerImpl @Inject constructor(
view.clearAttachment()
entry.remoteInputUri = null
entry.remoteInputMimeType = null
val resultSource = entry.editedSuggestionInfo
?.let { RemoteInput.SOURCE_FREE_FORM_INPUT }
?: RemoteInput.SOURCE_CHOICE
RemoteInput.setResultsSource(fillInIntent, resultSource)
RemoteInput.setResultsSource(fillInIntent, remoteInputResultsSource)
return fillInIntent
}
@@ -332,10 +329,12 @@ class RemoteInputViewControllerImpl @Inject constructor(
entry.remoteInputText = fullText
// mirror prepareRemoteInputFromText for text input
val resultSource = entry.editedSuggestionInfo
?.let { RemoteInput.SOURCE_FREE_FORM_INPUT }
?: RemoteInput.SOURCE_CHOICE
RemoteInput.setResultsSource(fillInIntent, resultSource)
RemoteInput.setResultsSource(fillInIntent, remoteInputResultsSource)
return fillInIntent
}
private val remoteInputResultsSource
get() = entry.editedSuggestionInfo
?.let { RemoteInput.SOURCE_CHOICE }
?: RemoteInput.SOURCE_FREE_FORM_INPUT
}