doc: Reorganize the Google Fast Pair docs

divipillai · carlescufi · commit 8ec1b21e6569 · 2025-08-08T17:59:38.000+02:00
Reorganize the Google Fast Pair integration
and libray docs.

NCSDK-34559

Signed-off-by: divya pillai &lt;divya.pillai@nordicsemi.no&gt;
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -103,7 +103,6 @@
 /doc/nrf/drivers/wifi.rst                 @nrfconnect/ncs-wifi-doc
 /doc/nrf/drivers/uart_nrf_sw_lpuart.rst   @nrfconnect/ncs-doc-leads
 /doc/nrf/external_comp/avsystem.rst       @nrfconnect/ncs-iot-oulu-tampere-doc
-/doc/nrf/external_comp/bt_fast_pair.rst   @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/external_comp/bt_fast_pair/      @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/external_comp/coremark.rst       @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/external_comp/dult.rst           @nrfconnect/ncs-si-bluebagel-doc
@@ -121,7 +120,6 @@
 /doc/nrf/libraries/bluetooth/adv_prov.rst @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/bluetooth/mesh.rst     @nrfconnect/ncs-paladin-doc
 /doc/nrf/libraries/bluetooth/services/fast_pair/ @nrfconnect/ncs-si-bluebagel-doc
-/doc/nrf/libraries/bluetooth/services/fast_pair.rst @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/bluetooth/services/wifi_prov_ble.rst @nrfconnect/ncs-wifi-doc
 /doc/nrf/libraries/caf/                   @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/debug/cpu_load.rst     @nrfconnect/ncs-doc-leads
diff --git a/doc/_utils/redirects.py b/doc/_utils/redirects.py
@@ -527,7 +527,8 @@
     ("libraries/bluetooth_services/services/cts_client", "libraries/bluetooth/services/cts_client"),
     ("libraries/bluetooth_services/services/ddfs", "libraries/bluetooth/services/ddfs"),
     ("libraries/bluetooth_services/services/dfu_smp", "libraries/bluetooth/services/dfu_smp"),
-    ("libraries/bluetooth_services/services/fast_pair", "libraries/bluetooth/services/fast_pair"),
+    ("libraries/bluetooth_services/services/fast_pair", "libraries/bluetooth/services/fast_pair/core"),
+    ("libraries/bluetooth/services/fast_pair", "libraries/bluetooth/services/fast_pair/core"),
     ("libraries/bluetooth_services/services/gattp", "libraries/bluetooth/services/gattp"),
     ("libraries/bluetooth_services/services/hids", "libraries/bluetooth/services/hids"),
     ("libraries/bluetooth_services/services/hogp", "libraries/bluetooth/services/hogp"),
@@ -564,7 +565,8 @@
     ("libraries/others/hw_unique_key", "libraries/security/hw_unique_key"), # Hardware unique key
     ("libraries/others/identity_key", "libraries/security/identity_key"), # Identity key
     ("ecosystems_integrations", "integrations"), # Integrations (landing)
-    ("ug_bt_fast_pair", "external_comp/bt_fast_pair"), # Google Fast Pair integration
+    ("ug_bt_fast_pair", "external_comp/bt_fast_pair/index"), # Google Fast Pair integration
+    ("external_comp/bt_fast_pair", "external_comp/bt_fast_pair/index"),
     ("ug_edge_impulse", "external_comp/edge_impulse"), # Edge Impulse integration
     ("ug_memfault", "external_comp/memfault"), # Memfault integration
     ("ug_nrf_cloud", "external_comp/nrf_cloud"), # Using nRF Cloud with the nRF Connect SDK
diff --git a/doc/_zoomin/ncs.tags.yml b/doc/_zoomin/ncs.tags.yml
@@ -397,7 +397,7 @@ mapping_topics:
   - nrf/libraries/others/esb.html: ["esb"]
   - nrf/libraries/others/fem_al.html: ["fem", "nrf21540"]
   - nrf/libraries/others/st25r3911b_nfc.html: ["nfc"]
-  - nrf/external_comp/bt_fast_pair.html: ["ble"]
+  - nrf/external_comp/bt_fast_pair/*.html: ["ble"]
   - nrf/external_comp/nrf_cloud.html: ["nrf-cloud"]
   - nrf/external_comp/avsystem.html: ["lte"]
   - nrf/releases_and_maturity/release_notes.html: ["release-notes"]
diff --git a/doc/nrf/external_comp/bt_fast_pair/adv_manager.rst b/doc/nrf/external_comp/bt_fast_pair/adv_manager.rst
@@ -12,14 +12,14 @@ This page provides guidelines on how to integrate this module in your applicatio
 
 .. note::
    This page complements the main Fast Pair integration guide and covers only integration steps for the :ref:`bt_fast_pair_adv_manager_readme` module.
-   For the complete Fast Pair integration guide, see :ref:`ug_bt_fast_pair`.
+   For the complete Fast Pair integration guide, see :ref:`Google Fast Pair integration <ug_bt_fast_pair_integration>`.
 
 Prerequisites
 *************
 
 Before using the :ref:`bt_fast_pair_adv_manager_readme`, ensure to fulfill the following prerequisites:
 
-* Read through the main :ref:`ug_bt_fast_pair` guide to understand the overall Fast Pair integration requirements and ensure you meet all the prerequisites listed in this document.
+* Read through the main :ref:`Google Fast Pair integration <ug_bt_fast_pair_integration>` guide to understand the overall Fast Pair integration requirements and ensure you meet all the prerequisites listed in this document.
 * Accept the usage of the Bluetooth® LE Extended Advertising feature (:kconfig:option:`CONFIG_BT_EXT_ADV`), which is a dependency for the :ref:`bt_fast_pair_adv_manager_readme` module.
 
   .. note::
diff --git a/doc/nrf/external_comp/bt_fast_pair/core.rst b/doc/nrf/external_comp/bt_fast_pair/core.rst
@@ -1,18 +1,14 @@
-.. _ug_bt_fast_pair:
+.. _ug_bt_fast_pair_integration:
 
-Google Fast Pair integration
-############################
+Integration overview
+####################
 
 .. contents::
    :local:
    :depth: 2
 
-Google Fast Pair is a standard for pairing *Bluetooth®* and Bluetooth Low Energy (LE) devices with as little user interaction required as possible.
-Google also provides additional features built upon the Fast Pair standard.
-For detailed information about supported functionalities, see the official `Fast Pair`_ documentation.
 
-.. note::
-   The software maturity level for the Fast Pair support in the |NCS| is indicated at the use case level in the :ref:`Google Fast Pair use case support <software_maturity_fast_pair_use_case>` table and at the feature level in the :ref:`Google Fast Pair feature support <software_maturity_fast_pair_feature>` table.
+The |NCS| integrates the Fast Pair Provider role, facilitating communication between the Fast Pair Seeker (typically a smartphone) and the Provider (your device).
 
 Integration prerequisites
 *************************
@@ -31,7 +27,6 @@ Before you start the |NCS| integration with Fast Pair, make sure that the follow
 Solution architecture
 *********************
 
-The |NCS| integrates the Fast Pair Provider role, facilitating communication between the Fast Pair Seeker (typically a smartphone) and the Provider (your device).
 The integration involves following the instructions outlined in the :ref:`ug_integrating_fast_pair` section.
 The SDK supports extensions such as Battery Notification and Personalized Name, which can be included based on the specific use case requirements.
 
@@ -70,7 +65,7 @@ For more details on this extension, see the `Fast Pair Personalized Name extensi
 FMDN extension
 ==============
 
-The FMDN extension leverages the Find My Device network, which is a crowdsourced network consisting of millions of Android devices that use Bluetooth LE to detect missing devices and report their approximate locations back to their owners.
+The FMDN extension leverages the Find My Device network, which is a crowdsourced network consisting of millions of Android devices that use Bluetooth® LE to detect missing devices and report their approximate locations back to their owners.
 The entire process is end-to-end encrypted and anonymous, so no one else (including Google) can view device's location or information.
 The Find My Device network also includes features protecting the user against unwanted tracking.
 
@@ -104,20 +99,6 @@ The FMDN Accessory specification integrates the Detecting Unwanted Location Trac
 Relevant FMDN sections of this guide describe the DULT integration with the FMDN extension.
 For more details on the DULT integration guidelines, see the `Fast Pair Unwanted Tracking Prevention Guidelines`_ documentation.
 
-Integration guides for helper modules
-*************************************
-
-This integration guide includes additional pages that discuss the Fast Pair helper modules.
-While these helper modules can provide additional functionality in your application, they are not strictly required for the Fast Pair integration.
-Each helper module is described on a dedicated page.
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Integration guides for helper modules:
-   :glob:
-
-   bt_fast_pair/*
-
 .. _ug_integrating_fast_pair:
 
 Integration steps
diff --git a/doc/nrf/external_comp/bt_fast_pair/index.rst b/doc/nrf/external_comp/bt_fast_pair/index.rst
@@ -0,0 +1,21 @@
+.. _ug_bt_fast_pair:
+
+Google Fast Pair integration
+############################
+
+Google Fast Pair is a standard for pairing *Bluetooth®* and Bluetooth Low Energy (LE) devices with as little user interaction required as possible.
+Google also provides additional features built upon the Fast Pair standard.
+For detailed information about supported functionalities, see the official `Fast Pair`_ documentation.
+
+.. note::
+   The software maturity level for the Fast Pair support in the |NCS| is indicated at the use case level in the :ref:`Google Fast Pair use case support <software_maturity_fast_pair_use_case>` table and at the feature level in the :ref:`Google Fast Pair feature support <software_maturity_fast_pair_feature>` table.
+
+The subpages include the :ref:`main integration guide <ug_bt_fast_pair_integration>` and an additional page that discusses the :ref:`Advertising Manager helper module <ug_bt_fast_pair_adv_manager>`.
+While this helper module can provide additional functionality in your application, it is not strictly required for the Fast Pair integration.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   core
+   adv_manager
diff --git a/doc/nrf/integrations.rst b/doc/nrf/integrations.rst
@@ -21,7 +21,7 @@ The following user guides describe available integrations:
    :maxdepth: 1
    :caption: Subpages:
 
-   external_comp/bt_fast_pair
+   external_comp/bt_fast_pair/index
    external_comp/edge_impulse
    external_comp/memfault
    external_comp/avsystem
diff --git a/doc/nrf/libraries/bluetooth/index.rst b/doc/nrf/libraries/bluetooth/index.rst
@@ -16,4 +16,5 @@ Bluetooth libraries and services
    :caption: Bluetooth® services:
    :glob:
 
+   services/fast_pair/index
    services/*
diff --git a/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst b/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst
@@ -9,19 +9,6 @@ Google Fast Pair Service (GFPS)
 
 The Google Fast Pair Service (Fast Pair for short) implements a Bluetooth® Low Energy (LE) GATT Service required for :ref:`ug_bt_fast_pair` with the |NCS|.
 
-Helper modules
-**************
-
-The Fast Pair service includes helper modules that may provide additional functionality during the implementation of the Fast Pair application.
-Each helper module is described in a dedicated subpage.
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Helper modules:
-   :glob:
-
-   fast_pair/*
-
 Service UUID
 ************
 
diff --git a/doc/nrf/libraries/bluetooth/services/fast_pair/index.rst b/doc/nrf/libraries/bluetooth/services/fast_pair/index.rst
@@ -0,0 +1,16 @@
+.. _lib_bt_fast_pair:
+
+Google Fast Pair libraries
+##########################
+
+The Google Fast Pair Service (Fast Pair for short) implements a Bluetooth® Low Energy (LE) GATT Service required for :ref:`ug_bt_fast_pair` with the |NCS|.
+
+The subpages include the :ref:`main library <bt_fast_pair_readme>` documentation and an additional page that discusses the :ref:`Advertising Manager helper module <bt_fast_pair_adv_manager_readme>`.
+The helper module provides additional functionality during the implementation of the Fast Pair application.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   core
+   adv_manager
