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

Commit 204fa8a4 authored by Toby Chuang's avatar Toby Chuang
Browse files

[NFC] Add a picture under NFC settings to show NFC detection point. 

Each smartphone has a different NFC antenna detection point,
users would confuse where the NFC antenna is and how to place the
smartphone close to the card reader/equipment.

Starting from Android R device, we move NFC antenna position from
top area to middle center of the phone.

From the OEMs perspective, they could implement their own picture
to indicate the best NFC detection point.Hence, we propose to
show NFC antenna position under NFC setting.

Bug: 142230563
Test: build pass
Change-Id: Ib3cd7fc3ea299be1667aba0aeebaa148fb49015f
parent ddd8a8fa

res/drawable-nodpi/nfc_detection_point.png

0 → 100644
+95 B
Loading image diff...

res/layout/nfc_detection_point.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <ImageView

        android:layout_width="match_parent"

        android:layout_height="@dimen/nfc_detection_point_height"

        android:scaleType="centerCrop"

        android:cropToPadding="true"

        android:src="@drawable/nfc_detection_point"

        android:contentDescription="@null" />



</FrameLayout>

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -442,4 +442,7 @@ 


    <!-- Package name of dialer supports RTT setting-->

    <string name="config_rtt_setting_package_name" translatable="false"></string>



    <!-- Whether nfc detection point preview image is available or not. -->

    <bool name="config_nfc_detection_point">false</bool>

</resources>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->

    <integer name="preferences_right_pane_weight">6</integer>



    <dimen name="nfc_detection_point_height">300dp</dimen>



    <dimen name="notification_app_icon_size">64dp</dimen>

    <dimen name="notification_app_icon_badge_size">20dp</dimen>

    <dimen name="notification_app_icon_badge_margin">4dp</dimen>

res/xml/nfc_and_payment_settings.xml

+7 −1
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/nfc_quick_toggle_title">



    <com.android.settingslib.widget.LayoutPreference

        android:key="nfc_detection_point"

        android:selectable="false"

        android:layout="@layout/nfc_detection_point"

        settings:controller="com.android.settings.nfc.NfcDetectionPointController"/>



    <SwitchPreference

        android:key="toggle_nfc"

        android:title="@string/nfc_quick_toggle_title"