From 3f78b045a18e3fdf10613c734d15316e61120f30 Mon Sep 17 00:00:00 2001
From: robertluo <robertluo@google.com>
Date: Mon, 3 Feb 2020 16:30:41 +0800
Subject: [PATCH] Merge Tap & Pay settings entries with NFC

Bug: 142231537
Test: make -j42 RunSettingsRoboTests

Change-Id: I45987f538f444f898d50379d45546b04086d44d1
---
 core/proto/android/app/settings_enums.proto | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index a6e08d2cecc18..fc0a2ef6041aa 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -2562,7 +2562,7 @@ enum PageId {
     // CATEGORY: SETTINGS
     // OS: R
     OPEN_SUPPORTED_LINKS = 1824;
-    
+
     // OPEN: Settings > Display > Dark theme > Set start time dialog
     DIALOG_DARK_THEME_SET_START_TIME = 1825;
 
@@ -2573,4 +2573,9 @@ enum PageId {
     // CATEGORY: SETTINGS
     // OS: R
     VIBRATE_FOR_CALLS = 1827;
+
+    // OPEN: Settings > Connected devices > Connection preferences > NFC
+    // CATEGORY: SETTINGS
+    // OS: R
+    CONNECTION_DEVICE_ADVANCED_NFC = 1828;
 }