From e952e3165a791e9a3032466337ae3d84449c53ca Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 25 Oct 2023 14:35:45 -0700
Subject: lynx(nfc): Modify NFC overlays for NFC apex

Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Iba38290fa7ef97d578036a140138c07a6c080aa3
---
 device-lynx.mk                                     |  3 +-
 .../packages/apps/Nfc/res/values/config.xml        | 35 ----------------------
 rro_overlays/NfcOverlay/Android.bp                 |  9 ++++++
 rro_overlays/NfcOverlay/AndroidManifest.xml        | 27 +++++++++++++++++
 rro_overlays/NfcOverlay/OWNERS                     |  2 ++
 rro_overlays/NfcOverlay/res/values/config.xml      | 35 ++++++++++++++++++++++
 6 files changed, 75 insertions(+), 36 deletions(-)
 delete mode 100644 lynx/overlay/packages/apps/Nfc/res/values/config.xml
 create mode 100644 rro_overlays/NfcOverlay/Android.bp
 create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 rro_overlays/NfcOverlay/OWNERS
 create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml

diff --git a/device-lynx.mk b/device-lynx.mk
index ea17b2e..3f621b7 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -80,7 +80,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayLynx
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/lynx/overlay/packages/apps/Nfc/res/values/config.xml b/lynx/overlay/packages/apps/Nfc/res/values/config.xml
deleted file mode 100644
index 4a8efa9..0000000
--- a/lynx/overlay/packages/apps/Nfc/res/values/config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 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.
--->
-<resources>
-  <bool name="nfcc_always_on_allowed">false</bool>
-  <string-array name="config_skuSupportsSecureNfc" translatable="false">
-    <item>G0DZQ</item>
-    <item>GWKK3</item>
-    <item>GHL1X</item>
-    <item>G82U8</item>
-  </string-array>
-  <bool name="tag_intent_app_pref_supported">true</bool>
-  <!-- NFC Antenna Location API -->
-  <integer name="device_width">70</integer>
-  <integer name="device_height">150</integer>
-  <bool name="device_foldable">false</bool>
-  <integer-array name="antenna_x">
-    <item>36</item>
-  </integer-array>
-  <integer-array name="antenna_y">
-    <item>102</item>
-  </integer-array>
-</resources>
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..0b3fcb6
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_lynx_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayLynx",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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.
+-->
+<!-- Pixel specific nfc overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.nfc.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.nfc"
+      android:targetName="NfcCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..4a8efa9
--- /dev/null
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G0DZQ</item>
+    <item>GWKK3</item>
+    <item>GHL1X</item>
+    <item>G82U8</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">70</integer>
+  <integer name="device_height">150</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>36</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>102</item>
+  </integer-array>
+</resources>
-- 
cgit v1.2.3