diff --git a/res/drawable-mdpi/nfc_how_it_works.png b/res/drawable-mdpi/nfc_how_it_works.png deleted file mode 100644 index 1dc272cee4c..00000000000 Binary files a/res/drawable-mdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-mdpi/tapandpay_emptystate.png b/res/drawable-mdpi/tapandpay_emptystate.png deleted file mode 100644 index 1c0eb7612e7..00000000000 Binary files a/res/drawable-mdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-xhdpi/nfc_how_it_works.png b/res/drawable-xhdpi/nfc_how_it_works.png deleted file mode 100644 index e61d77fd020..00000000000 Binary files a/res/drawable-xhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xhdpi/tapandpay_emptystate.png b/res/drawable-xhdpi/tapandpay_emptystate.png deleted file mode 100644 index f7f436ba2e4..00000000000 Binary files a/res/drawable-xhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-xxhdpi/nfc_how_it_works.png b/res/drawable-xxhdpi/nfc_how_it_works.png deleted file mode 100644 index 0c816bd52eb..00000000000 Binary files a/res/drawable-xxhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xxhdpi/tapandpay_emptystate.png b/res/drawable-xxhdpi/tapandpay_emptystate.png deleted file mode 100644 index 6e600227aba..00000000000 Binary files a/res/drawable-xxhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/nfc_how_it_works.png b/res/drawable-xxxhdpi/nfc_how_it_works.png deleted file mode 100644 index 0add50f7795..00000000000 Binary files a/res/drawable-xxxhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/tapandpay_emptystate.png b/res/drawable-xxxhdpi/tapandpay_emptystate.png deleted file mode 100644 index de8e437b1f8..00000000000 Binary files a/res/drawable-xxxhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable/nfc_how_it_works.xml b/res/drawable/nfc_how_it_works.xml new file mode 100644 index 00000000000..f2a6b61c2c3 --- /dev/null +++ b/res/drawable/nfc_how_it_works.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + diff --git a/res/drawable/tapandpay_emptystate.xml b/res/drawable/tapandpay_emptystate.xml new file mode 100644 index 00000000000..8d623e870b5 --- /dev/null +++ b/res/drawable/tapandpay_emptystate.xml @@ -0,0 +1,34 @@ + + + + + + + + \ No newline at end of file diff --git a/res/layout/nfc_payment.xml b/res/layout/nfc_payment.xml deleted file mode 100644 index c7039cf09c1..00000000000 --- a/res/layout/nfc_payment.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/layout/nfc_payment_empty.xml b/res/layout/nfc_payment_empty.xml index 74c15bcf65f..c9a83a588dc 100644 --- a/res/layout/nfc_payment_empty.xml +++ b/res/layout/nfc_payment_empty.xml @@ -15,24 +15,22 @@ --> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical"> - - + + diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 7a915ae5ed7..62a3d54fe65 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -74,11 +74,10 @@ public class PaymentSettings extends DashboardFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - ViewGroup contentRoot = (ViewGroup) getListView().getParent(); + View emptyView = getActivity().getLayoutInflater().inflate( - R.layout.nfc_payment_empty, contentRoot, false); - contentRoot.addView(emptyView); - setEmptyView(emptyView); + R.layout.nfc_payment_empty, null, false); + ((ViewGroup) view.findViewById(android.R.id.list_container)).addView(emptyView); } @Override