Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 382cebc1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine NFC settings UX"

parents a1bb6057 1e9a9cde
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -7675,8 +7675,8 @@
    <string name="nfc_default_payment_workapp_confirmation_message_title">To make a payment using a work app:</string>
    <!-- Text string in the dialog [CHAR LIMIT=60] -->
    <string name="nfc_default_payment_workapp_confirmation_message_1">work profile must be turned on.</string>
    <!-- Text string in the dialog [CHAR LIMIT=60] -->
    <string name="nfc_default_payment_workapp_confirmation_message_2">you\u2019ll need to enter your work profile lock if you have one.</string>
    <!-- Text string in the dialog [CHAR LIMIT=80] -->
    <string name="nfc_default_payment_workapp_confirmation_message_2">you\u2019ll need to enter your work PIN, pattern, or password if you have one.</string>
    <!-- Caption for button linking to a page explaining how Tap and Pay works-->
    <string name="nfc_payment_how_it_works">How it works</string>
+3 −1
Original line number Diff line number Diff line
@@ -133,7 +133,9 @@ public class PaymentBackend {
                    appInfo.settingsComponent = null;
                }
                appInfo.description = service.getDescription();
                appInfo.icon = pm.getUserBadgedIcon(service.loadIcon(pm), appInfo.userHandle);
                Drawable icon = (service.loadBanner(pm) != null)
                        ? service.loadBanner(pm) : service.loadIcon(pm);
                appInfo.icon = pm.getUserBadgedIcon(icon, appInfo.userHandle);

                appInfos.add(appInfo);
            }