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

am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev

Browse Source 
* commit '86f74d2ad407214e23a717f2f24046ce9a89ea48':
  Tap & pay: change empty state UX and strings.
This commit is contained in:
Martijn Coenen
2013-09-30 17:08:54 -07:00
committed by Android Git Automerger
parent 88cd02bbce 86f74d2ad4
commit c432a71227
4 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/nfc_payment.xml
View File

@@ -23,6 +23,18 @@
android:visibility="gone"
android:paddingTop="16dp"
android:text="@string/nfc_payment_no_apps"/>
<TextView
android:id="@+id/nfc_payment_learn_more"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:clickable="true"
android:textSize="20sp"
android:textStyle="italic"
android:visibility="gone"
android:textColor="@android:color/holo_blue_light"
android:paddingTop="16dp"
android:text="@string/nfc_payment_learn_more"/>
</LinearLayout>
<ListView
android:id="@android:id/list"

7
res/values/strings.xml
View File

@@ -4778,7 +4778,10 @@
<!-- NFC payment settings --><skip/>
<string name="nfc_payment_settings_title">Tap &amp; pay</string>
<!-- String shown when there are no NFC payment applications installed -->
<string name="nfc_payment_no_apps">You have no apps configured for tap &amp; pay with NFC.</string>
<string name="nfc_payment_no_apps">Pay with just a tap</string>
<!-- String shown when there are no NFC payment applications installed, clickable, pointing to
a website to learn more-->
<string name="nfc_payment_learn_more">Learn more</string>
<string name="nfc_payment_menu_item_add_service">Find apps</string>
<!-- Label for the dialog that is shown when the user is asked to set a
preferred payment application -->
@@ -4830,6 +4833,8 @@
<string name="help_url_location_access" translatable="false"></string>
<!-- Help URL, Security settings [DO NOT TRANSLATE] -->
<string name="help_url_security" translatable="false"></string>
<!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
<string name="help_url_nfc_payment" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>