Using Beta2 autofill APIs in autofill sample.

Bug: 38182790
Test: manual
Change-Id: Id59b54d1c5fb36a49d4f7e3a78d7697b290e18cc

10 files changed, 16 insertions, 37 deletions

diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.java
index e2140c4f..d4efc6a6 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/app/CustomVirtualView.java
@@ -117,7 +117,7 @@ public class CustomVirtualView extends View {
             Item item = mVirtualViews.valueAt(i);
             Log.d(TAG, "Adding new child at index " + index + ": " + item);
             ViewStructure 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/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.java
index ead8b963..ab3a350a 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.java
@@ -44,21 +44,10 @@ import static com.example.android.autofillframework.CommonUtil.bundleToString;
 public class MyAutofillService extends AutofillService {
 
     @Override
-    public void onFillRequest(AssistStructure assistStructure, Bundle bundle, int i,
-            CancellationSignal cancellationSignal, FillCallback fillCallback) {
-        /* Deprecated, ignore */
-    }
-
-    @Override
-    public void onSaveRequest(AssistStructure assistStructure, Bundle bundle,
-            SaveCallback saveCallback) {
-        /* Deprecated, ignore */
-    }
-
-    @Override
     public void onFillRequest(FillRequest request, CancellationSignal cancellationSignal,
             FillCallback callback) {
-        AssistStructure structure = request.getStructure();
+        AssistStructure structure = request.getFillContexts()
+                .get(request.getFillContexts().size() - 1).getStructure();
         final Bundle data = request.getClientState();
         Log.d(TAG, "onFillRequest(): data=" + bundleToString(data));
 
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.java
index 710112e1..1caa9666 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.java
@@ -30,7 +30,7 @@ public class AutofillField {
     private String[] mAutofillHints;
     private AutofillId mAutofillId;
     private int mAutofillType;
-    private String[] mAutofillOptions;
+    private CharSequence[] mAutofillOptions;
     private boolean mFocused;
 
     public AutofillField(ViewNode view) {
@@ -68,7 +68,7 @@ public class AutofillField {
      */
     public int getAutofillOptionIndex(String value) {
         for (int i = 0; i < mAutofillOptions.length; i++) {
-            if (mAutofillOptions[i].equals(value)) {
+            if (mAutofillOptions[i].toString().equals(value)) {
                 return i;
             }
         }
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.java
index e706511e..7d789992 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.java
@@ -30,10 +30,10 @@ public class SavableAutofillData {
         AutofillValue autofillValue = viewNode.getAutofillValue();
         if (autofillValue != null) {
             if (autofillValue.isList()) {
-                String[] autofillOptions = viewNode.getAutofillOptions();
+                CharSequence[] autofillOptions = viewNode.getAutofillOptions();
                 int index = autofillValue.getListValue();
                 if (autofillOptions != null && autofillOptions.length > 0) {
-                    mTextValue = autofillOptions[index];
+                    mTextValue = autofillOptions[index].toString();
                 }
             } else if (autofillValue.isDate()) {
                 mDateValue = autofillValue.getDateValue();
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
index 837f2ab6..c4b3fbb3 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
@@ -11,12 +11,12 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 'android-O'
+    compileSdkVersion 26
     buildToolsVersion "26.0.0 rc2"
 
     defaultConfig {
-        minSdkVersion 'O'
-        targetSdkVersion 'O'
+        minSdkVersion "O"
+        targetSdkVersion "O"
     }
 
     compileOptions {
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
 
diff --git a/input/autofill/AutofillFramework/kotlinApp/build.gradle b/input/autofill/AutofillFramework/kotlinApp/build.gradle
index c778d8c3..de48679d 100644
--- a/input/autofill/AutofillFramework/kotlinApp/build.gradle
+++ b/input/autofill/AutofillFramework/kotlinApp/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     ext.kotlin_version = '1.1.2-4'
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }