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

Commit 01d13c04 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "New Tap & Pay UX." into mnc-dev

parents a16257db fe58b534

res/drawable-mdpi/tapandpay_emptystate.png

0 → 100644
+8.26 KiB
Loading image diff...

res/drawable-xhdpi/tapandpay_emptystate.png

0 → 100644
+20.3 KiB
Loading image diff...

res/drawable-xxhdpi/tapandpay_emptystate.png

0 → 100644
+34.1 KiB
Loading image diff...

res/drawable-xxxhdpi/tapandpay_emptystate.png

0 → 100644
+50 KiB
Loading image diff...

res/layout/nfc_payment.xml

+59 −42
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent">
@@ -5,7 +26,6 @@ 
            xmlns:tools="http://schemas.android.com/tools"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

        android:gravity="center_vertical"

            android:orientation="vertical" >

            <ImageView

                android:id="@+id/nfc_payment_tap_image"
@@ -13,7 +33,7 @@ 
                android:layout_height="wrap_content"

                android:gravity="center"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/nfc_payment_empty_text"

                android:layout_width="fill_parent"
@@ -21,25 +41,22 @@ 
                android:gravity="center"

                android:textSize="24sp"

                android:visibility="gone"

            android:paddingTop="16dp"

                android:paddingTop="32dp"

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

        <TextView

            android:id="@+id/nfc_payment_learn_more"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:clickable="true"

            android:textSize="20sp"

            android:textStyle="italic"

            android:visibility="gone"

            android:textColor="@android:color/holo_blue_light"

            android:paddingTop="16dp"

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

        </LinearLayout>

        <ListView android:id="@android:id/list"

            android:drawSelectorOnTop="false"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:clipToPadding="false"

            android:scrollbarStyle="@integer/preference_scrollbar_style" />

<!--

        <ListView

            android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

        android:layout_marginTop="5dp" />



            android:clipToPadding="false"

            android:scrollbarStyle="@integer/preference_scrollbar_style" />

-->

    </FrameLayout>

</LinearLayout>