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

Commit 91dcad40 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Fix up Tap and Pay how it works. 

Also, don't use HCE service description.

Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
parent e21573da

res/layout-sw600dp/nfc_payment_how_it_works.xml

0 → 100644
+71 −0
Original line number Diff line number Diff line 
<?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="336dp"

            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:gravity="center_horizontal"

            android:paddingTop="144dp"

            android:orientation="vertical">



          <ImageView

              android:id="@+id/nfc_how_it_works_image"

              android:layout_width="match_parent"

              android:layout_height="282dp"

              android:gravity="center"

              android:src="@drawable/nfc_how_it_works" />



          <TextView

              android:id="@+id/nfc_how_it_works_title"

              android:layout_width="420dp"

              android:layout_height="wrap_content"

              android:text="@string/nfc_how_it_works_title"

              android:textColor="#FF263238"

              android:textSize="24sp" />



          <TextView

              android:id="@+id/nfc_how_it_works_content"

              android:layout_width="420dp"

              android:layout_height="wrap_content"

              android:paddingTop="10dp"

              android:paddingBottom="18dp"

              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>

res/layout/nfc_payment_empty.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ 


        <ImageView

            android:id="@+id/nfc_payment_tap_image"

            android:layout_width="fill_parent"

            android:layout_width="288dp"

            android:layout_height="wrap_content"

            android:src="@drawable/tapandpay_emptystate"/>

        <TextView

            android:id="@+id/nfc_payment_empty_text"

            android:layout_width="wrap_content"

            android:layout_width="264dp"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:textColor="?android:attr/textColorSecondary"

            android:paddingTop="32dp"

            android:paddingTop="36dp"

            android:text="@string/nfc_payment_no_apps"/>

</LinearLayout>

res/layout/nfc_payment_how_it_works.xml

+5 −5
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
              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:paddingLeft="16dp"

              android:paddingRight="16dp"

              android:textColor="#FF263238"

              android:textSize="24sp" />
@@ -47,11 +47,11 @@ 
              android:layout_height="wrap_content"

              android:paddingTop="10dp"

              android:paddingBottom="18dp"

              android:paddingLeft="74dp"

              android:paddingRight="74dp"

              android:paddingLeft="16dp"

              android:paddingRight="16dp"

              android:text="@string/nfc_how_it_works_content"

              android:textColor="#FF263238"

              android:textSize="20sp" />

              android:textSize="16sp" />

        </LinearLayout>

        <RelativeLayout

            android:layout_width="match_parent"

src/com/android/settings/nfc/NfcPaymentPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ public class NfcPaymentPreference extends DialogPreference implements 
        }

        setTitle(R.string.nfc_payment_default);

        if (defaultApp != null) {

            setSummary(mContext.getString(R.string.nfc_payment_app_and_desc,

                    defaultApp.label, defaultApp.description));

            setSummary(defaultApp.label);

        } else {

            setSummary(mContext.getString(R.string.nfc_payment_default_not_set));

        }