summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-06-08 08:02:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 08:02:30 +0000
commit1276b21317d0f86bbd3f59b14d9c0c745cecfa56 (patch)
tree85429026015ffe829aa4bf8f6c3ad732024a3aad /res
parent63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9 (diff)
parentcbcc76e8d32f95690d08258a91d58136cd9fb056 (diff)
downloadpackages_apps_Settings-1276b21317d0f86bbd3f59b14d9c0c745cecfa56.zip
packages_apps_Settings-1276b21317d0f86bbd3f59b14d9c0c745cecfa56.tar.gz
packages_apps_Settings-1276b21317d0f86bbd3f59b14d9c0c745cecfa56.tar.bz2
Merge "Add NFC payment "how it works" screens." into mnc-dev
Diffstat (limited to 'res')
-rw-r--r--res/drawable-mdpi/nfc_how_it_works.pngbin0 -> 16293 bytes
-rw-r--r--res/drawable-xhdpi/nfc_how_it_works.pngbin0 -> 38565 bytes
-rw-r--r--res/drawable-xxhdpi/nfc_how_it_works.pngbin0 -> 63923 bytes
-rw-r--r--res/drawable-xxxhdpi/nfc_how_it_works.pngbin0 -> 93244 bytes
-rw-r--r--res/layout/nfc_payment_empty.xml1
-rw-r--r--res/layout/nfc_payment_how_it_works.xml74
-rw-r--r--res/values/strings.xml6
7 files changed, 81 insertions, 0 deletions
diff --git a/res/drawable-mdpi/nfc_how_it_works.png b/res/drawable-mdpi/nfc_how_it_works.png
new file mode 100644
index 0000000..ef3cd8c
--- /dev/null
+++ b/res/drawable-mdpi/nfc_how_it_works.png
Binary files differ
diff --git a/res/drawable-xhdpi/nfc_how_it_works.png b/res/drawable-xhdpi/nfc_how_it_works.png
new file mode 100644
index 0000000..874d32f
--- /dev/null
+++ b/res/drawable-xhdpi/nfc_how_it_works.png
Binary files differ
diff --git a/res/drawable-xxhdpi/nfc_how_it_works.png b/res/drawable-xxhdpi/nfc_how_it_works.png
new file mode 100644
index 0000000..748ad6a
--- /dev/null
+++ b/res/drawable-xxhdpi/nfc_how_it_works.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/nfc_how_it_works.png b/res/drawable-xxxhdpi/nfc_how_it_works.png
new file mode 100644
index 0000000..d970dae
--- /dev/null
+++ b/res/drawable-xxxhdpi/nfc_how_it_works.png
Binary files differ
diff --git a/res/layout/nfc_payment_empty.xml b/res/layout/nfc_payment_empty.xml
index 42e2fa9..e89d865 100644
--- a/res/layout/nfc_payment_empty.xml
+++ b/res/layout/nfc_payment_empty.xml
@@ -30,6 +30,7 @@
android:id="@+id/nfc_payment_empty_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorSecondary"
android:paddingTop="32dp"
diff --git a/res/layout/nfc_payment_how_it_works.xml b/res/layout/nfc_payment_how_it_works.xml
new file mode 100644
index 0000000..ac48e4e
--- /dev/null
+++ b/res/layout/nfc_payment_how_it_works.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/trusted_devices_prompt_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#FF80CBC4" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="200dp"
+ android:background="#FFB2DFDB" >
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/nfc_how_it_works_image_text"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="72dp"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/nfc_how_it_works_image"
+ android:layout_width="match_parent"
+ android:layout_height="188dp"
+ android:gravity="center"
+ android:src="@drawable/nfc_how_it_works" />
+
+ <TextView
+ android:id="@+id/nfc_how_it_works_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/nfc_how_it_works_title"
+ android:paddingLeft="74dp"
+ android:paddingRight="74dp"
+ android:textColor="#FF263238"
+ android:textSize="24sp" />
+
+ <TextView
+ android:id="@+id/nfc_how_it_works_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dp"
+ android:paddingBottom="18dp"
+ android:paddingLeft="74dp"
+ android:paddingRight="74dp"
+ android:text="@string/nfc_how_it_works_content"
+ android:textColor="#FF263238"
+ android:textSize="20sp" />
+ </LinearLayout>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:layout_alignParentBottom="true"
+ android:background="#FFB2DFDB" >
+ <Button
+ android:id="@+id/nfc_how_it_works_button"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_alignParentRight="true"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:layout_marginRight="20dp"
+ android:text="@string/nfc_how_it_works_got_it"
+ android:textSize="14sp"
+ android:textColor="#263238"
+ style="?android:attr/borderlessButtonStyle" />
+ </RelativeLayout>
+ </RelativeLayout>
+</FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1db6770..967e52f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5580,6 +5580,12 @@
<string name="nfc_payment_favor_default_default_unknown">Still use default</string>
<!-- Header for a dialog asking the user which payment app to use -->
<string name="nfc_payment_pay_with">At a Tap &amp; pay terminal, pay with:</string>
+ <!-- Header for text explaning how to pay at a payment terminal in a store -->
+ <string name="nfc_how_it_works_title">Paying at the terminal</string>
+ <!-- Content for text explaning how to pay at a payment terminal in a store -->
+ <string name="nfc_how_it_works_content">Once you\'ve set up a Tap &amp; pay app and your phone is powered on, tap your phone on any terminal with the Tap &amp; pay logo on it to make a purchase.</string>
+ <!-- Button the user can click to indicate he understood and dismiss the screen -->
+ <string name="nfc_how_it_works_got_it">Got it</string>
<!-- NFC More... title. [CHAR LIMIT=40] -->
<string name="nfc_more_title">More...</string>
<!-- Label for the dialog that is shown when the user is asked to set a