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

Update NFC payments to match new framework APIs.

Browse Source 
Bug: 10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
This commit is contained in:
Martijn Coenen
2013-08-28 19:28:17 -07:00
parent 9506d857cb
commit 573a21ada2
4 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/nfc/PaymentDefaultDialog.java
View File

@@ -62,7 +62,6 @@ public final class PaymentDefaultDialog extends AlertActivity implements
switch (which) {
case BUTTON_POSITIVE:
mBackend.setDefaultPaymentApp(mNewDefault);
mBackend.setAutoPaymentMode(true);
setResult(RESULT_OK);
break;
case BUTTON_NEGATIVE:
@@ -98,7 +97,6 @@ public final class PaymentDefaultDialog extends AlertActivity implements
}
// Get current mode and default component
boolean isAuto = mBackend.isAutoPaymentMode();
ComponentName defaultComponent = mBackend.getDefaultPaymentApp();
if (defaultComponent != null && defaultComponent.equals(component)) {
Log.e(TAG, "Component " + component + " is already default.");
@@ -128,7 +126,7 @@ public final class PaymentDefaultDialog extends AlertActivity implements
// Compose dialog; get
final AlertController.AlertParams p = mAlertParams;
p.mTitle = getString(R.string.nfc_payment_set_default);
if (defaultAppInfo == null || !isAuto) {
if (defaultAppInfo == null) {
p.mMessage = "Always use " + newAppInfo.loadLabel(pm) + " when you tap and pay?";
} else {
p.mMessage = "Always use " + newAppInfo.loadLabel(pm) + " instead of " +