Converted Autofill sample service to kotlin.

Also modified some kotlin in Autofill client activities.

Bug: 38182790
Test: manual
Change-Id: I09938ae3edf83c7a26855c376a96f69a67f542c1

3 files changed, 18 insertions, 19 deletions

diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
index 46fdb72a..9c4121aa 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
@@ -27,7 +27,7 @@ class CreditCardActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        setContentView(R.layout.credit_card_activity)
 
         // Create an ArrayAdapter using the string array and a default spinner layout
         val dayAdapter = ArrayAdapter.createFromResource(this, R.array.day_array, android.R.layout.simple_spinner_item)
@@ -57,13 +57,12 @@ class CreditCardActivity : AppCompatActivity() {
      * any new data.
      */
     private fun submit() {
-        val intent = WelcomeActivity.getStartActivityIntent(this@CreditCardActivity)
+        val intent = WelcomeActivity.getStartActivityIntent(this)
         startActivity(intent)
         finish()
     }
 
     companion object {
-
         fun getStartActivityIntent(context: Context): Intent {
             val intent = Intent(context, CreditCardActivity::class.java)
             return intent
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 5f66364c..193008b5 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
@@ -72,21 +72,19 @@ class CustomVirtualView(context: Context, attrs: AttributeSet) : View(context, a
     override fun autofill(values: SparseArray<AutofillValue>) {
         // User has just selected a Dataset from the list of Autofill suggestions and the Dataset's
         // AutofillValue gets passed into this method.
-        Log.d(TAG, "autoFill(): " + values)
+        Log.d(TAG, "autofill(): " + values)
         for (i in 0..values.size() - 1) {
             val id = values.keyAt(i)
             val value = values.valueAt(i)
-            val item = mItems.get(id)
-            if (item == null) {
-                Log.w(TAG, "No item for id " + id)
-                return
-            }
-            if (!item.editable) {
-                Log.w(TAG, "Item for id $id is not editable: $item")
-                return
+
+            mItems[id]?.let {
+                if (!it.editable) {
+                    Log.w(TAG, "Item for autofillId $id is not editable: $it")
+                    return@autofill
+                }
+                // Set the item's text to the text wrapped in the AutofillValue.
+                it.text = value.textValue
             }
-            // Set the item's text to the text wrapped in the AutofillValue.
-            item.text = value.textValue
         }
         postInvalidate()
     }
@@ -121,9 +119,8 @@ class CustomVirtualView(context: Context, attrs: AttributeSet) : View(context, a
         Log.d(TAG, "onDraw: " + mLines.size + " lines; canvas:" + canvas)
         var x: Float
         var y = (mTopMargin + mLineLength).toFloat()
-        for (i in mLines.indices) {
+        for (line in mLines) {
             x = mLeftMargin.toFloat()
-            val line = mLines[i]
             Log.v(TAG, "Drawing '" + line + "' at " + x + "x" + y)
             mTextPaint.color = if (line.fieldTextItem.focused) mFocusedColor else mUnfocusedColor
             val readOnlyText = line.labelItem.text.toString() + ":  ["
@@ -184,7 +181,9 @@ class CustomVirtualView(context: Context, attrs: AttributeSet) : View(context, a
         return line
     }
 
-    private class Item internal constructor(val line: Line, val id: Int, val hints: Array<String>?, val type: Int, var text: CharSequence, val editable: Boolean, val sanitized: Boolean) {
+    private class Item internal constructor(val line: Line, val id: Int, val hints: Array<String>?,
+                                            val type: Int, var text: CharSequence,
+                                            val editable: Boolean, val sanitized: Boolean) {
         var focused = false
 
         override fun toString(): String {
@@ -198,7 +197,8 @@ class CustomVirtualView(context: Context, attrs: AttributeSet) : View(context, a
             get() = if (editable) EditText::class.java.name else TextView::class.java.name
     }
 
-    private inner class Line constructor(val idEntry: String, label: String, hints: Array<String>, text: String, sanitized: Boolean) {
+    private inner class Line constructor(val idEntry: String, label: String, hints: Array<String>,
+                                         text: String, sanitized: Boolean) {
 
         // Boundaries of the text field, relative to the CustomView
         internal val bounds = Rect()
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/LoginActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/LoginActivity.kt
index ca146019..bf3fe874 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/LoginActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/LoginActivity.kt
@@ -24,8 +24,8 @@ import android.widget.Toast
 import com.example.android.autofillframework.R
 import kotlinx.android.synthetic.main.login_activity.*
 
+
 class LoginActivity : AppCompatActivity() {
-    val TAG = "LoginActivity"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)