Merge "Revert "Revert "Delete Fast Pair Settings"""

res/xml/connected_devices_advanced.xml

@@ -69,15 +69,6 @@
         settings:userRestriction="no_ultra_wideband_radio"
         settings:useAdminDisabledSummary="true"/>
 
-    <Preference
-        android:key="connected_device_fast_pair"
-        android:title="@string/fast_pair_settings"
-        android:summary="@string/fast_pair_settings_summary"
-        android:icon="@drawable/ic_fast_pair_24dp"
-        android:fragment="com.android.settings.nearby.FastPairSettingsFragment"
-        settings:controller="com.android.settings.nearby.FastPairPreferenceController"
-        android:order="-2"/>
-
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="-8"/>

res/xml/fast_pair_settings.xml

@@ -1,32 +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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/fast_pair_settings"
-    settings:keywords="@string/keywords_fast_pair">
-
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="fast_pair_scan_switch"
-        android:title="@string/fast_pair_main_switch_title" />
-
-    <Preference
-        android:key="saved_devices"
-        android:title="@string/fast_pair_saved_devices_title" />
-
-</PreferenceScreen>