| Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/autofill/CardUnmaskPrompt.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
|
| similarity index 95%
|
| rename from ui/android/java/src/org/chromium/ui/autofill/CardUnmaskPrompt.java
|
| rename to chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
|
| index e9c0a0d9bb70461f2194f5199eb61a805b3c9d2b..76349d6d93de094fe3e2e4afd475a7726bffbe81 100644
|
| --- a/ui/android/java/src/org/chromium/ui/autofill/CardUnmaskPrompt.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -package org.chromium.ui.autofill;
|
| +package org.chromium.chrome.browser.autofill;
|
|
|
| import android.app.AlertDialog;
|
| import android.content.Context;
|
| @@ -16,11 +16,12 @@ import android.view.inputmethod.InputMethodManager;
|
| import android.widget.ArrayAdapter;
|
| import android.widget.Button;
|
| import android.widget.EditText;
|
| +import android.widget.ImageView;
|
| import android.widget.ProgressBar;
|
| import android.widget.Spinner;
|
| import android.widget.TextView;
|
|
|
| -import org.chromium.ui.R;
|
| +import org.chromium.chrome.R;
|
|
|
| import java.text.NumberFormat;
|
| import java.util.Calendar;
|
| @@ -62,7 +63,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
|
| }
|
|
|
| public CardUnmaskPrompt(Context context, CardUnmaskPromptDelegate delegate, String title,
|
| - String instructions, boolean shouldRequestExpirationDate) {
|
| + String instructions, int drawableId, boolean shouldRequestExpirationDate) {
|
| mDelegate = delegate;
|
|
|
| LayoutInflater inflater = LayoutInflater.from(context);
|
| @@ -74,6 +75,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
|
| mYearSpinner = (Spinner) v.findViewById(R.id.expiration_year);
|
| mVerificationProgressBar = (ProgressBar) v.findViewById(R.id.verification_progress_bar);
|
| mVerificationView = (TextView) v.findViewById(R.id.verification_message);
|
| + ((ImageView) v.findViewById(R.id.cvc_hint_image)).setImageResource(drawableId);
|
|
|
| mDialog = new AlertDialog.Builder(context)
|
| .setTitle(title)
|
| @@ -207,7 +209,7 @@ public class CardUnmaskPrompt implements DialogInterface.OnDismissListener, Text
|
| private boolean areInputsValid() {
|
| if (mShouldRequestExpirationDate
|
| && (mMonthSpinner.getSelectedItemPosition() == 0
|
| - || mYearSpinner.getSelectedItemPosition() == 0)) {
|
| + || mYearSpinner.getSelectedItemPosition() == 0)) {
|
| return false;
|
| }
|
| return mDelegate.checkUserInputValidity(mCardUnmaskInput.getText().toString());
|
|
|