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

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

Merge "NFC payment settings."

parents b75f1030 26515da0
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,31 @@
                android:resource="@id/user_settings" />
        </activity>

        <activity android:name="Settings$PaymentSettingsActivity"
                android:uiOptions="splitActionBarWhenNarrow"
                android:label="@string/nfc_payment_settings_title"
                android:taskAffinity=""
                android:excludeFromRecents="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.nfc.PaymentSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/nfc_payment_settings" />
        </activity>
        <activity android:name=".nfc.PaymentDefaultDialog"
                  android:label="@string/nfc_payment_set_default"
                  android:excludeFromRecents="true"
                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
            <intent-filter>
                <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <activity android:name="Settings$NotificationAccessSettingsActivity"
                  android:label="@string/manage_notification_access"
                  android:taskAffinity=""
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@
-keep class com.android.settings.fuelgauge.*
-keep class com.android.settings.users.*
-keep class com.android.settings.NotificationStation
-keep class com.android.settings.nfc.*

# Keep click responders
-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+6.99 KiB
Loading image diff...
+80 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 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:layout_weight="1"
    android:id="@+id/nfc_payment_pref"
    android:focusable="true"
    android:clickable="true"
    android:gravity="center_vertical"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:background="?android:attr/selectableItemBackground">
    <LinearLayout
        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:layout_gravity="center"
            android:minWidth="48dp"
            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>
    <RadioButton
        android:id="@android:id/button1"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:layout_alignParentEnd="true"
        android:layout_centerVertical="true"
        android:duplicateParentState="true"
        android:clickable="false"
        android:focusable="false" />
</LinearLayout>
+9 −0
Original line number Diff line number Diff line
@@ -4589,6 +4589,15 @@
    <!-- Warning message title for global font change [CHAR LIMIT=40] -->
    <string name="global_font_change_title">Change font size</string>

    <!-- NFC payment settings --><skip/>
    <string name="nfc_payment_settings_title">Tap and Pay</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>
    <!-- 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>

    <!-- Restrictions settings --><skip/>

    <!-- Restriction settings title [CHAR LIMIT=35] -->
Loading