diff options
| author | Joanne Chung <joannechung@google.com> | 2020-08-19 05:38:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 05:38:11 +0000 |
| commit | d0435400ab1e4b582f209bbbae806802c9148b16 (patch) | |
| tree | dc14d3d116fe072cbfd245e73567c9d2eaf42384 /input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt | |
| parent | d7a6afd5b79a76f3255a59ff8761724fc2646b5e (diff) | |
| parent | d951dc8e2917efc9f8f6dda675da18ff7456ee33 (diff) | |
| download | android-d0435400ab1e4b582f209bbbae806802c9148b16.tar.gz | |
Merge "Update language to comply with Android's inclusive language guidance" am: 4cd108aef6 am: d951dc8e29
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487
Change-Id: Ia26b0c80df080afb36dd723740abca78aeb6ce25
Diffstat (limited to 'input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt')
| -rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt | 10 |
1 files changed, 5 insertions, 5 deletions
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 c24a0e95..5eeb901d 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 @@ -70,7 +70,7 @@ class SettingsActivity : AppCompatActivity() { settings_auth_credentials_label, settings_auth_credentials_icon, View.OnClickListener { - if (MyPreferences.getMasterPassword(this@SettingsActivity) != null) { + if (MyPreferences.getMainPassword(this@SettingsActivity) != null) { buildCurrentCredentialsDialog().show() } else { buildNewCredentialsDialog().show() @@ -101,13 +101,13 @@ class SettingsActivity : AppCompatActivity() { val currentPasswordField = LayoutInflater .from(this@SettingsActivity) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById<EditText>(R.id.master_password_field) + .findViewById<EditText>(R.id.main_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_current_password) .setView(currentPasswordField) .setPositiveButton(R.string.ok) { dialog, which -> val password = currentPasswordField.text.toString() - if (MyPreferences.getMasterPassword(this@SettingsActivity) == password) { + if (MyPreferences.getMainPassword(this@SettingsActivity) == password) { buildNewCredentialsDialog().show() dialog.dismiss() } @@ -119,13 +119,13 @@ class SettingsActivity : AppCompatActivity() { val newPasswordField = LayoutInflater .from(this@SettingsActivity) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById<EditText>(R.id.master_password_field) + .findViewById<EditText>(R.id.main_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_new_password) .setView(newPasswordField) .setPositiveButton(R.string.ok) { dialog, which -> val password = newPasswordField.text.toString() - MyPreferences.setMasterPassword(this@SettingsActivity, password) + MyPreferences.setMainPassword(this@SettingsActivity, password) dialog.dismiss() } .create() |