| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java
|
| index 2841b2995404cf6cbcf3483b80ecb23be1292d70..6b98b0eb9e86fd797ffba652d44f195a94e73f90 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillAndPaymentsPreferences.java
|
| @@ -10,7 +10,9 @@ import android.preference.Preference.OnPreferenceChangeListener;
|
| import android.preference.PreferenceFragment;
|
|
|
| import org.chromium.chrome.R;
|
| +import org.chromium.chrome.browser.ChromeFeatureList;
|
| import org.chromium.chrome.browser.autofill.PersonalDataManager;
|
| +import org.chromium.chrome.browser.payments.AndroidPaymentAppFactory;
|
| import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
|
|
|
| /**
|
| @@ -24,6 +26,7 @@ public class AutofillAndPaymentsPreferences extends PreferenceFragment {
|
| // chrome/browser/ui/webui/options/autofill_options_handler.cc
|
| public static final String SETTINGS_ORIGIN = "Chrome settings";
|
| private static final String PREF_AUTOFILL_SWITCH = "autofill_switch";
|
| + private static final String PREF_ANDROID_PAYMENT_APPS = "android_payment_apps";
|
|
|
| @Override
|
| public void onCreate(Bundle savedInstanceState) {
|
| @@ -40,6 +43,15 @@ public class AutofillAndPaymentsPreferences extends PreferenceFragment {
|
| return true;
|
| }
|
| });
|
| +
|
| + if (ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_PAYMENT_APPS)) {
|
| + Preference pref = new Preference(getActivity());
|
| + pref.setTitle(getActivity().getString(R.string.payment_apps_title));
|
| + pref.setFragment(AndroidPaymentAppsFragment.class.getCanonicalName());
|
| + pref.setShouldDisableView(true);
|
| + pref.setKey(PREF_ANDROID_PAYMENT_APPS);
|
| + getPreferenceScreen().addPreference(pref);
|
| + }
|
| }
|
|
|
| @Override
|
| @@ -47,5 +59,19 @@ public class AutofillAndPaymentsPreferences extends PreferenceFragment {
|
| super.onResume();
|
| ((ChromeSwitchPreference) findPreference(PREF_AUTOFILL_SWITCH))
|
| .setChecked(PersonalDataManager.isAutofillEnabled());
|
| + refreshPaymentAppsPref();
|
| + }
|
| +
|
| + private void refreshPaymentAppsPref() {
|
| + Preference pref = findPreference(PREF_ANDROID_PAYMENT_APPS);
|
| + if (pref != null) {
|
| + if (AndroidPaymentAppFactory.hasAndroidPaymentApps()) {
|
| + pref.setSummary(null);
|
| + pref.setEnabled(true);
|
| + } else {
|
| + pref.setSummary(getActivity().getString(R.string.payment_no_apps_summary));
|
| + pref.setEnabled(false);
|
| + }
|
| + }
|
| }
|
| }
|
|
|