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

Commit 925f3c48 authored by Toby Chuang's avatar Toby Chuang Committed by Automerger Merge Worker
Browse files

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

Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e am: 88fd6fb1

Change-Id: I5a6e97de416b0b1bf41846ec7b7ccfdcb0161079
parents 5850dd19 88fd6fb1
Loading
Loading
Loading
Loading
+95 B
Loading image diff...
+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>
+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>
+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>
+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"
Loading