summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-10-15 19:00:35 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-10-15 19:00:35 -0700
commitdaef2e2b066a0bf204b9a63b7cae13e3d5441f4e (patch)
tree24ca92150d7ca3a49333b2743fc56d97ca13cb20 /src/com/android/settings/nfc
parent886387373e21ffe78ccbc9b032b18794e2ce826f (diff)
downloadpackages_apps_Settings-daef2e2b066a0bf204b9a63b7cae13e3d5441f4e.zip
packages_apps_Settings-daef2e2b066a0bf204b9a63b7cae13e3d5441f4e.tar.gz
packages_apps_Settings-daef2e2b066a0bf204b9a63b7cae13e3d5441f4e.tar.bz2
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert more CheckBoxes to Switches Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/PaymentSettings.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index df4e396..02254dd 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -22,11 +22,11 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -95,7 +95,7 @@ public class PaymentSettings extends SettingsPreferenceFragment implements
emptyImage.setVisibility(View.VISIBLE);
getListView().setVisibility(View.GONE);
} else {
- CheckBoxPreference foreground = new CheckBoxPreference(getActivity());
+ SwitchPreference foreground = new SwitchPreference(getActivity());
boolean foregroundMode = mPaymentBackend.isForegroundMode();
foreground.setPersistent(false);
foreground.setTitle(getString(R.string.nfc_payment_favor_foreground));
@@ -231,7 +231,7 @@ public class PaymentSettings extends SettingsPreferenceFragment implements
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference instanceof CheckBoxPreference) {
+ if (preference instanceof SwitchPreference) {
mPaymentBackend.setForegroundMode(((Boolean) newValue).booleanValue());
return true;
} else {