Latest UX for Tap & pay.

Bug: 10862185 Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
2013-09-24 17:31:25 -07:00
parent 372b6f74b1
commit 0e940d6c00
11 changed files with 118 additions and 44 deletions
--- a/src/com/android/settings/nfc/PaymentBackend.java
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -61,8 +61,11 @@ public class PaymentBackend {

        for (ApduServiceInfo service : serviceInfos) {
            PaymentAppInfo appInfo = new PaymentAppInfo();
-            appInfo.caption = service.loadLabel(pm);
            appInfo.banner = service.loadBanner(pm);
+            appInfo.caption = service.getDescription();
+            if (appInfo.caption == null) {
+                appInfo.caption = service.loadLabel(pm);
+            }
            appInfo.isDefault = service.getComponent().equals(defaultApp);
            appInfo.componentName = service.getComponent();
            appInfos.add(appInfo);