diff options
author | Douglas Sigelbaum <sigelbaum@google.com> | 2017-06-02 18:00:57 -0700 |
---|---|---|
committer | Douglas Sigelbaum <sigelbaum@google.com> | 2017-06-07 16:47:24 -0400 |
commit | b7d6772dc5b2a35a1d23cd274f9e3e17b4b55b08 (patch) | |
tree | 1624399ce1c4be67cd220d96fe2a03b22d2bf8bf /input/autofill/AutofillFramework/kotlinApp/Application/src/main | |
parent | 95a0d7180447c727b98aec366112185aed6e9343 (diff) | |
download | android-b7d6772dc5b2a35a1d23cd274f9e3e17b4b55b08.tar.gz |
Using Beta2 autofill APIs in autofill sample.
Bug: 38182790
Test: manual
Change-Id: Id59b54d1c5fb36a49d4f7e3a78d7697b290e18cc
Diffstat (limited to 'input/autofill/AutofillFramework/kotlinApp/Application/src/main')
4 files changed, 5 insertions, 15 deletions
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.kt index b230db47..299e6042 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.kt @@ -101,7 +101,7 @@ class CustomVirtualView(context: Context, attrs: AttributeSet) : View(context, a val item = mItems.valueAt(i) Log.d(TAG, "Adding new child at index $index: $item") val child = structure.newChild(index) - child.setAutofillId(structure, item.id) + child.setAutofillId(structure.getAutofillId(), item.id) child.setAutofillHints(item.hints) child.setAutofillType(item.type) child.setDataIsSensitive(!item.sanitized) diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt index 41712bd1..a67e08a9 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt @@ -33,19 +33,9 @@ import com.example.android.autofillframework.service.settings.MyPreferences class MyAutofillService : AutofillService() { - override fun onFillRequest(assistStructure: AssistStructure, bundle: Bundle, i: Int, - cancellationSignal: CancellationSignal, fillCallback: FillCallback) { - /* Deprecated, ignore */ - } - - override fun onSaveRequest(assistStructure: AssistStructure, bundle: Bundle, - saveCallback: SaveCallback) { - /* Deprecated, ignore */ - } - override fun onFillRequest(request: FillRequest, cancellationSignal: CancellationSignal, callback: FillCallback) { - val structure = request.structure + val structure = request.fillContexts[request.fillContexts.size - 1].structure val data = request.clientState Log.d(TAG, "onFillRequest(): data=" + bundleToString(data)) diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt index 315299be..f6e89bde 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt @@ -31,7 +31,7 @@ class AutofillField(view: ViewNode) { val autofillHints: Array<String> = view.autofillHints val autofillId: AutofillId = view.autofillId val autofillType: Int = view.autofillType - val autofillOptions: Array<String>? = view.autofillOptions + val autofillOptions: Array<CharSequence>? = view.autofillOptions val isFocused: Boolean = view.isFocused init { @@ -42,7 +42,7 @@ class AutofillField(view: ViewNode) { * When the [ViewNode] is a list that the user needs to choose a string from (i.e. a spinner), * this is called to return the index of a specific item in the list. */ - fun getAutofillOptionIndex(value: String): Int? { + fun getAutofillOptionIndex(value: CharSequence): Int? { return autofillOptions?.indexOf(value) } diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt index 44baebfa..a088cb6c 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt @@ -22,7 +22,7 @@ import android.view.autofill.AutofillValue * JSON serializable data class containing the same data as an [AutofillValue]. */ class SavableAutofillData(viewNode: AssistStructure.ViewNode) { - var textValue: String? = null + var textValue: CharSequence? = null var dateValue: Long? = null var toggleValue: Boolean? = null |