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

Fix up Tap and Pay how it works.

Browse Source 
Also, don't use HCE service description.

Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
This commit is contained in:
Martijn Coenen
2015-07-07 09:35:19 +02:00
parent e21573da92
commit 91dcad4089
4 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
res/layout-sw600dp/nfc_payment_how_it_works.xml Normal file
View File

@@ -0,0 +1,71 @@
<?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>

6
res/layout/nfc_payment_empty.xml
View File

@@ -23,16 +23,16 @@
<ImageView <ImageView
android:id="@+id/nfc_payment_tap_image" android:id="@+id/nfc_payment_tap_image"
android:layout_width="fill_parent" android:layout_width="288dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/tapandpay_emptystate"/> android:src="@drawable/tapandpay_emptystate"/>
<TextView <TextView
android:id="@+id/nfc_payment_empty_text" android:id="@+id/nfc_payment_empty_text"
android:layout_width="wrap_content" android:layout_width="264dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:paddingTop="32dp" android:paddingTop="36dp"
android:text="@string/nfc_payment_no_apps"/> android:text="@string/nfc_payment_no_apps"/>
</LinearLayout> </LinearLayout>

10
res/layout/nfc_payment_how_it_works.xml
View File

@@ -36,8 +36,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/nfc_how_it_works_title" android:text="@string/nfc_how_it_works_title"
android:paddingLeft="74dp" android:paddingLeft="16dp"
android:paddingRight="74dp" android:paddingRight="16dp"
android:textColor="#FF263238" android:textColor="#FF263238"
android:textSize="24sp" /> android:textSize="24sp" />
@@ -47,11 +47,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="18dp" android:paddingBottom="18dp"
android:paddingLeft="74dp" android:paddingLeft="16dp"
android:paddingRight="74dp" android:paddingRight="16dp"
android:text="@string/nfc_how_it_works_content" android:text="@string/nfc_how_it_works_content"
android:textColor="#FF263238" android:textColor="#FF263238"
android:textSize="20sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
src/com/android/settings/nfc/NfcPaymentPreference.java
View File

@@ -82,8 +82,7 @@ public class NfcPaymentPreference extends DialogPreference implements
} }
setTitle(R.string.nfc_payment_default); setTitle(R.string.nfc_payment_default);
if (defaultApp != null) { if (defaultApp != null) {
setSummary(mContext.getString(R.string.nfc_payment_app_and_desc, setSummary(defaultApp.label);
defaultApp.label, defaultApp.description));
} else { } else {
setSummary(mContext.getString(R.string.nfc_payment_default_not_set)); setSummary(mContext.getString(R.string.nfc_payment_default_not_set));
} }