PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show current setting for Tap & Pay

Browse Source 
In Settings > Apps & notifications > Advanced > Default apps > Tap & pay
the setting labeled "Use default" is a drop down preference but wasn't
showing the current value it's set to in its summary. This CL fixes
that.

Change-Id: I891289abad781c3eeafa2d7979373f0d53faafc6
Fixes: 67754372
Test: make -j64 RunSettingsRoboTests
This commit is contained in:
Antony Sargent
2018-01-10 14:51:32 -08:00
parent 5c182d6d14
commit 2d4974a40b
2 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/nfc/NfcForegroundPreference.java
View File

@@ -17,18 +17,27 @@ package com.android.settings.nfc;
import android.content.Context;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference;
import com.android.settings.R;
public class NfcForegroundPreference extends DropDownPreference implements
PaymentBackend.Callback {
PaymentBackend.Callback, Preference.OnPreferenceChangeListener {
private final PaymentBackend mPaymentBackend;
public NfcForegroundPreference(Context context, PaymentBackend backend) {
super(context);
mPaymentBackend = backend;
mPaymentBackend.registerCallback(this);
setTitle(getContext().getString(R.string.nfc_payment_use_default));
setEntries(new CharSequence[] {
getContext().getString(R.string.nfc_payment_favor_open),
getContext().getString(R.string.nfc_payment_favor_default)
});
setEntryValues(new CharSequence[] { "1", "0" });
refresh();
setOnPreferenceChangeListener(this);
}
@Override
@@ -37,27 +46,20 @@ public class NfcForegroundPreference extends DropDownPreference implements
}
void refresh() {
PaymentBackend.PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
boolean foregroundMode = mPaymentBackend.isForegroundMode();
setPersistent(false);
setTitle(getContext().getString(R.string.nfc_payment_use_default));
CharSequence favorOpen;
CharSequence favorDefault;
setEntries(new CharSequence[] {
getContext().getString(R.string.nfc_payment_favor_open),
getContext().getString(R.string.nfc_payment_favor_default)
});
setEntryValues(new CharSequence[] { "1", "0" });
if (foregroundMode) {
setValue("1");
} else {
setValue("0");
}
setSummary(getEntry());
}
@Override
protected boolean persistString(String value) {
mPaymentBackend.setForegroundMode(Integer.parseInt(value) != 0);
public boolean onPreferenceChange(Preference preference, Object newValue) {
String newValueString = (String) newValue;
setSummary(getEntries()[findIndexOfValue(newValueString)]);
mPaymentBackend.setForegroundMode(Integer.parseInt(newValueString) != 0);
return true;
}
}