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

NFC Tap&Pay: deal with changes from API review.

Browse Source 
Also, removed "Ask every time" mode.

Bug: 10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
This commit is contained in:
Martijn Coenen
2013-08-30 12:57:42 -07:00
parent 573a21ada2
commit a73aa32278
4 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -1609,9 +1609,14 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert"> android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
<intent-filter> <intent-filter>
<!-- TODO this filter can be removed -->
<action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" /> <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity> </activity>
<activity android:name="Settings$NotificationAccessSettingsActivity" <activity android:name="Settings$NotificationAccessSettingsActivity"

8
src/com/android/settings/nfc/PaymentBackend.java
View File

@@ -22,7 +22,7 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.nfc.cardemulation.ApduServiceInfo; import android.nfc.cardemulation.ApduServiceInfo;
import android.nfc.cardemulation.CardEmulationManager; import android.nfc.cardemulation.CardEmulation;
import android.provider.Settings; import android.provider.Settings;
import java.util.ArrayList; import java.util.ArrayList;
@@ -40,19 +40,19 @@ public class PaymentBackend {
private final Context mContext; private final Context mContext;
private final NfcAdapter mAdapter; private final NfcAdapter mAdapter;
private final CardEmulationManager mCardEmuManager; private final CardEmulation mCardEmuManager;
public PaymentBackend(Context context) { public PaymentBackend(Context context) {
mContext = context; mContext = context;
mAdapter = NfcAdapter.getDefaultAdapter(context); mAdapter = NfcAdapter.getDefaultAdapter(context);
mCardEmuManager = CardEmulationManager.getInstance(mAdapter); mCardEmuManager = CardEmulation.getInstance(mAdapter);
} }
public List<PaymentAppInfo> getPaymentAppInfos() { public List<PaymentAppInfo> getPaymentAppInfos() {
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
List<ApduServiceInfo> serviceInfos = List<ApduServiceInfo> serviceInfos =
mCardEmuManager.getServices(CardEmulationManager.CATEGORY_PAYMENT); mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT);
List<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>(); List<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
if (serviceInfos == null) return appInfos; if (serviceInfos == null) return appInfos;

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

@@ -22,7 +22,7 @@ import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.nfc.cardemulation.CardEmulationManager; import android.nfc.cardemulation.CardEmulation;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -47,8 +47,8 @@ public final class PaymentDefaultDialog extends AlertActivity implements
mBackend = new PaymentBackend(this); mBackend = new PaymentBackend(this);
Intent intent = getIntent(); Intent intent = getIntent();
ComponentName component = intent.getParcelableExtra( ComponentName component = intent.getParcelableExtra(
CardEmulationManager.EXTRA_SERVICE_COMPONENT); CardEmulation.EXTRA_SERVICE_COMPONENT);
String category = intent.getStringExtra(CardEmulationManager.EXTRA_CATEGORY); String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
if (!buildDialog(component, category)) { if (!buildDialog(component, category)) {
@@ -75,7 +75,7 @@ public final class PaymentDefaultDialog extends AlertActivity implements
return false; return false;
} }
if (!CardEmulationManager.CATEGORY_PAYMENT.equals(category)) { if (!CardEmulation.CATEGORY_PAYMENT.equals(category)) {
Log.e(TAG, "Don't support defaults for category " + category); Log.e(TAG, "Don't support defaults for category " + category);
return false; return false;
} }

15
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -55,23 +55,10 @@ public class PaymentSettings extends SettingsPreferenceFragment implements
for (PaymentAppInfo appInfo : appInfos) { for (PaymentAppInfo appInfo : appInfos) {
PaymentAppPreference preference = PaymentAppPreference preference =
new PaymentAppPreference(getActivity(), appInfo, this); new PaymentAppPreference(getActivity(), appInfo, this);
// If for some reason isAuto gets out of sync, clear out app default
preference.setIcon(appInfo.icon); preference.setIcon(appInfo.icon);
preference.setTitle(appInfo.caption); preference.setTitle(appInfo.caption);
screen.addPreference(preference); screen.addPreference(preference);
} }
if (appInfos.size() > 1) {
PaymentAppInfo appInfo = new PaymentAppInfo();
appInfo.icon = null;
appInfo.componentName = null;
appInfo.isDefault = !(mPaymentBackend.getDefaultPaymentApp() != null);
// Add "Ask every time" option
PaymentAppPreference preference =
new PaymentAppPreference(getActivity(), appInfo, this);
preference.setIcon(null);
preference.setTitle(R.string.nfc_payment_ask);
screen.addPreference(preference);
}
} }
setPreferenceScreen(screen); setPreferenceScreen(screen);
} }
@@ -82,8 +69,6 @@ public class PaymentSettings extends SettingsPreferenceFragment implements
PaymentAppInfo appInfo = (PaymentAppInfo) v.getTag(); PaymentAppInfo appInfo = (PaymentAppInfo) v.getTag();
if (appInfo.componentName != null) { if (appInfo.componentName != null) {
mPaymentBackend.setDefaultPaymentApp(appInfo.componentName); mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
} else {
mPaymentBackend.setDefaultPaymentApp(null);
} }
refresh(); refresh();
} }