From 98d5568efdc834b440a8b6400c1124e6a094f73f Mon Sep 17 00:00:00 2001 From: Douglas Sigelbaum Date: Sun, 26 Nov 2017 22:27:42 -0500 Subject: Autofill sample: Cancel autofill when clear button is pressed. Bug: 69771916 Test: manual Change-Id: I6d6eee1844a36837d9f5d24021fecdd20b2ad3e2 --- .../app/commoncases/CreditCardCompoundViewActivity.java | 5 ++++- .../app/commoncases/CreditCardDatePickerActivity.java | 5 ++++- .../app/commoncases/CreditCardSpinnersActivity.java | 5 ++++- .../commoncases/StandardAutoCompleteSignInActivity.java | 4 ++++ .../autofill/app/commoncases/StandardSignInActivity.java | 5 +++++ .../android/autofill/app/edgecases/CreditCardActivity.java | 5 ++++- .../app/edgecases/CreditCardAntiPatternActivity.java | 5 ++++- .../autofill/app/edgecases/MultiplePartitionsActivity.java | 14 ++++++++------ 8 files changed, 37 insertions(+), 11 deletions(-) diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardCompoundViewActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardCompoundViewActivity.java index c09745e7..b8df27d8 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardCompoundViewActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardCompoundViewActivity.java @@ -51,7 +51,10 @@ public class CreditCardCompoundViewActivity extends AppCompatActivity { findViewById(R.id.clearButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getSystemService(AutofillManager.class).cancel(); + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardDatePickerActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardDatePickerActivity.java index f0bcdee8..4a158863 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardDatePickerActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardDatePickerActivity.java @@ -53,7 +53,10 @@ public class CreditCardDatePickerActivity extends AppCompatActivity { findViewById(R.id.clearButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getSystemService(AutofillManager.class).cancel(); + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardSpinnersActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardSpinnersActivity.java index 99ec6007..bab53798 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardSpinnersActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/CreditCardSpinnersActivity.java @@ -94,7 +94,10 @@ public class CreditCardSpinnersActivity extends AppCompatActivity { findViewById(R.id.clear).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getSystemService(AutofillManager.class).cancel(); + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java index acdb0f34..089c6b2d 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java @@ -61,6 +61,10 @@ public class StandardAutoCompleteSignInActivity extends AppCompatActivity { mClearButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java index 6604ee40..c333bce1 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java @@ -20,6 +20,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.View; +import android.view.autofill.AutofillManager; import android.widget.EditText; import android.widget.Toast; @@ -47,6 +48,10 @@ public class StandardSignInActivity extends AppCompatActivity { findViewById(R.id.clear).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardActivity.java index c23daf7b..3e68a012 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardActivity.java @@ -53,7 +53,10 @@ public class CreditCardActivity extends AppCompatActivity { findViewById(R.id.clearButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getSystemService(AutofillManager.class).cancel(); + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardAntiPatternActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardAntiPatternActivity.java index c50994cb..edffcc05 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardAntiPatternActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/CreditCardAntiPatternActivity.java @@ -49,7 +49,10 @@ public class CreditCardAntiPatternActivity extends AppCompatActivity { findViewById(R.id.clearButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - getSystemService(AutofillManager.class).cancel(); + AutofillManager afm = getSystemService(AutofillManager.class); + if (afm != null) { + afm.cancel(); + } resetFields(); } }); diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/MultiplePartitionsActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/MultiplePartitionsActivity.java index 3f4031ce..d7395c40 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/MultiplePartitionsActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/MultiplePartitionsActivity.java @@ -102,13 +102,15 @@ public class MultiplePartitionsActivity extends AppCompatActivity { mCcPartition.addLine("ccSecurityCode", View.AUTOFILL_TYPE_TEXT, getString(R.string.credit_card_security_code_label), " ", true, View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE); - - findViewById(R.id.clear).setOnClickListener((view) -> { - resetFields(); - mCustomVirtualView.resetPositions(); - mAutofillManager.cancel(); - }); mAutofillManager = getSystemService(AutofillManager.class); + findViewById(R.id.clear).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + resetFields(); + mCustomVirtualView.resetPositions(); + mAutofillManager.cancel(); + } + }); } private void resetFields() { -- cgit v1.2.3