Autofill sample: formatting.
Bug: 38182790
Test: manual
Change-Id: Ia77568bdc45e736ea993a96c9508cc224b92335b
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 88e28b4..8000d91 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
@@ -53,15 +53,13 @@
val year = Calendar.getInstance().get(Calendar.YEAR)
val years = (0 until CC_EXP_YEARS_COUNT)
- .map {Integer.toString(year + it)}
+ .map { Integer.toString(year + it) }
.toTypedArray<CharSequence>()
expirationYear.adapter = object : ArrayAdapter<CharSequence?>(this,
android.R.layout.simple_spinner_item, years) {
- override fun getAutofillOptions(): Array<CharSequence> {
- return years
- }
- }
+ override fun getAutofillOptions() = years
+ }
submit.setOnClickListener { submitCcInfo() }
clear.setOnClickListener { resetFields() }
}
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardCompoundViewActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardCompoundViewActivity.kt
index 09f83ac..d83a7df 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardCompoundViewActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardCompoundViewActivity.kt
@@ -19,9 +19,11 @@
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
-
import com.example.android.autofillframework.R
-import kotlinx.android.synthetic.main.credit_card_compound_view_activity.*
+import kotlinx.android.synthetic.main.credit_card_compound_view_activity.clearButton
+import kotlinx.android.synthetic.main.credit_card_compound_view_activity.creditCardExpirationView
+import kotlinx.android.synthetic.main.credit_card_compound_view_activity.creditCardNumberField
+import kotlinx.android.synthetic.main.credit_card_compound_view_activity.submitButton
class CreditCardCompoundViewActivity : AppCompatActivity() {
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardExpirationDateView.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardExpirationDateView.kt
index 609522b..b361192 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardExpirationDateView.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardExpirationDateView.kt
@@ -25,7 +25,8 @@
import android.widget.ArrayAdapter
import android.widget.FrameLayout
import com.example.android.autofillframework.R
-import kotlinx.android.synthetic.main.cc_exp_date.view.*
+import kotlinx.android.synthetic.main.cc_exp_date.view.ccExpMonth
+import kotlinx.android.synthetic.main.cc_exp_date.view.ccExpYear
import java.util.Calendar
class CreditCardExpirationDateView @JvmOverloads constructor(
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/MainActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/MainActivity.kt
index 43a2522..0722e14 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/MainActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/MainActivity.kt
@@ -19,7 +19,12 @@
import android.support.v7.app.AppCompatActivity
import android.view.View
import com.example.android.autofillframework.R
-import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main.creditCardCheckoutButton
+import kotlinx.android.synthetic.main.activity_main.creditCardCompoundViewButton
+import kotlinx.android.synthetic.main.activity_main.emailComposeButton
+import kotlinx.android.synthetic.main.activity_main.standardLoginWithAutoCompleteButton
+import kotlinx.android.synthetic.main.activity_main.standardViewSignInButton
+import kotlinx.android.synthetic.main.activity_main.virtualViewSignInButton
/**
* This is used to launch sample activities that showcase autofill.
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt
index 1e7ed0d..1006124 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt
@@ -20,7 +20,6 @@
import android.util.ArraySet
import com.example.android.autofillframework.CommonUtil
import com.example.android.autofillframework.multidatasetservice.model.FilledAutofillFieldCollection
-import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt
index 5004fa2..c24a0e9 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt
@@ -137,7 +137,7 @@
with(switchView) {
contentDescription = switchLabel
isChecked = checked
- setOnCheckedChangeListener (checkedChangeListener)
+ setOnCheckedChangeListener(checkedChangeListener)
}
container.setOnClickListener { switchView.performClick() }
}
diff --git a/input/autofill/AutofillFramework/kotlinApp/build.gradle b/input/autofill/AutofillFramework/kotlinApp/build.gradle
index 76b99cb..6fc4282 100644
--- a/input/autofill/AutofillFramework/kotlinApp/build.gradle
+++ b/input/autofill/AutofillFramework/kotlinApp/build.gradle
@@ -5,7 +5,7 @@
url 'https://maven.google.com'
}
}
- ext.kotlin_version = '1.1.4-2'
+ ext.kotlin_version = '1.1.4-3'
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
