diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/nfc_payment_empty_state.png | bin | 0 -> 10225 bytes | |||
-rw-r--r-- | res/drawable-mdpi/nfc_payment_empty_state.png | bin | 0 -> 6222 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/nfc_payment_empty_state.png | bin | 0 -> 16762 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/nfc_payment_empty_state.png | bin | 0 -> 24730 bytes | |||
-rw-r--r-- | res/layout/nfc_payment.xml | 33 | ||||
-rw-r--r-- | res/layout/nfc_payment_option.xml | 47 | ||||
-rw-r--r-- | res/values/strings.xml | 10 |
7 files changed, 47 insertions, 43 deletions
diff --git a/res/drawable-hdpi/nfc_payment_empty_state.png b/res/drawable-hdpi/nfc_payment_empty_state.png Binary files differnew file mode 100644 index 0000000..69b22f2 --- /dev/null +++ b/res/drawable-hdpi/nfc_payment_empty_state.png diff --git a/res/drawable-mdpi/nfc_payment_empty_state.png b/res/drawable-mdpi/nfc_payment_empty_state.png Binary files differnew file mode 100644 index 0000000..1ab7187 --- /dev/null +++ b/res/drawable-mdpi/nfc_payment_empty_state.png diff --git a/res/drawable-xhdpi/nfc_payment_empty_state.png b/res/drawable-xhdpi/nfc_payment_empty_state.png Binary files differnew file mode 100644 index 0000000..3951c82 --- /dev/null +++ b/res/drawable-xhdpi/nfc_payment_empty_state.png diff --git a/res/drawable-xxhdpi/nfc_payment_empty_state.png b/res/drawable-xxhdpi/nfc_payment_empty_state.png Binary files differnew file mode 100644 index 0000000..914021a --- /dev/null +++ b/res/drawable-xxhdpi/nfc_payment_empty_state.png diff --git a/res/layout/nfc_payment.xml b/res/layout/nfc_payment.xml new file mode 100644 index 0000000..92fe86f --- /dev/null +++ b/res/layout/nfc_payment.xml @@ -0,0 +1,33 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" > + <TextView + android:id="@+id/nfc_payment_empty_text" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:textSize="24sp" + android:visibility="gone" + android:paddingBottom="16dp" + android:text="@string/nfc_payment_no_apps"/> + <ImageView + android:id="@+id/nfc_payment_tap_image" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:visibility="gone" + android:src="@drawable/nfc_payment_empty_state"/> + </LinearLayout> + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="5dp" /> + +</FrameLayout> diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml index 122e041..04fdc07 100644 --- a/res/layout/nfc_payment_option.xml +++ b/res/layout/nfc_payment_option.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" @@ -21,53 +21,24 @@ android:focusable="true" android:clickable="true" android:gravity="center_vertical" + android:paddingTop="10dp" + android:paddingBottom="10dp" android:minHeight="?android:attr/listPreferredItemHeight" android:background="?android:attr/selectableItemBackground"> - <LinearLayout + <FrameLayout android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center" android:minWidth="@*android:dimen/preference_icon_minWidth" android:orientation="horizontal"> <ImageView - android:id="@+android:id/icon" - android:layout_width="48dp" - android:layout_height="48dp" + android:id="@+id/banner" android:layout_gravity="center" - android:minWidth="48dp" + android:layout_width="wrap_content" + android:layout_height="96dp" android:scaleType="centerInside" - android:layout_marginEnd="@*android:dimen/preference_item_padding_inner" /> - </LinearLayout> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="6dip" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:layout_weight="1"> - <TextView - android:id="@+android:id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="marquee" - android:fadingEdge="horizontal"/> - <TextView - android:id="@android:id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@android:id/title" - android:layout_alignStart="@android:id/title" - android:paddingBottom="3dip" - android:visibility="gone" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="13sp" - android:textColor="?android:attr/textColorSecondary" - android:focusable="false" - android:maxLines="4" /> - </RelativeLayout> + </FrameLayout> <RadioButton android:id="@android:id/button1" android:layout_width="wrap_content" @@ -77,4 +48,4 @@ android:duplicateParentState="true" android:clickable="false" android:focusable="false" /> -</LinearLayout> +</RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 492697d..d316609 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4678,13 +4678,13 @@ <!-- NFC payment settings --><skip/> <string name="nfc_payment_settings_title">Payments</string> - <!-- Option to tell Android to ask the user which payment app to use every time - a payment terminal is tapped --> - <string name="nfc_payment_ask">Ask every time</string> + <!-- String shown when there are no NFC payment applications installed --> + <string name="nfc_payment_no_apps">DO NOT TRANSLATE ME</string> <!-- Label for the dialog that is shown when the user is asked to set a preferred payment application --> - <string name="nfc_payment_set_default">Set as your preference?</string> - + <string name="nfc_payment_set_default_label">Set as your preference?</string> + <string name="nfc_payment_set_default">Always use <xliff:g id="app">%1$s</xliff:g> when you tap and pay?</string> + <string name="nfc_payment_set_default_instead_of">Always use <xliff:g id="app">%1$s</xliff:g> instead of <xliff:g id="app">%2$s</xliff:g> when you tap and pay?</string> <!-- Restrictions settings --><skip/> <!-- Restriction settings title [CHAR LIMIT=35] --> |