From c0a7e8f8f05189b16d4924988d985dbf1c0cbf7b Mon Sep 17 00:00:00 2001
From: Jakub Rotkiewicz <rotkiewicz@google.com>
Date: Mon, 20 Feb 2023 12:59:03 +0000
Subject: [PATCH] Snoop Logger: fix descriptions

Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
---
 res/values/strings.xml                    | 26 ++++++++++++-----------
 res/xml/development_settings.xml          |  2 +-
 res/xml/snoop_logger_filters_settings.xml |  8 ++++++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d91ff5f1f29..fe582acb36e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5399,18 +5399,20 @@
     <string name="experimental_category_title">Experimental</string>
     <!-- Title for feature flags dashboard where developers can turn on experimental features [CHAR LIMIT=50] -->
     <string name="feature_flags_dashboard_title">Feature flags</string>
-    <!-- Title for snoop logger filters dashboard where developers can turn on filters [CHAR LIMIT=50] -->
-    <string name="snoop_logger_filters_dashboard_title">Snoop Logger Filters</string>
-    <!-- Summary for the snoop logger filters [CHAR LIMIT=50] -->
-    <string name="bt_hci_snoop_log_filters_dashboard_summary">Set filters (Toggle Bluetooth after changing this setting)</string>
-    <!-- Title for the snoop logger pbap filter [CHAR LIMIT=50] -->
-    <string name="bt_hci_snoop_log_filter_pbap_title">Snoop Logger Filter PBAP</string>
-    <!-- Title for the snoop logger map filter [CHAR LIMIT=50] -->
-    <string name="bt_hci_snoop_log_filter_map_title">Snoop Logger Filter MAP</string>
-    <!-- Summary for the snoop logger filters [CHAR LIMIT=50] -->
-    <string name="bt_hci_snoop_log_filter_summary">Set filtering mode. (Toggle Bluetooth after changing this setting)</string>
-    <!-- Summary for the snoop logger profile filters while disabled [CHAR LIMIT=50] -->
-    <string name="bt_hci_snoop_log_filtered_mode_disabled_summary">Enable Snoop Log Mode Filtered to change this option.</string>
+    <!-- Title for snoop logger filters dashboard where developers can turn on filters [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filters_dashboard_title">Bluetooth HCI snoop log filtering</string>
+    <!-- Summary for the snoop logger filters [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filters_dashboard_summary">Set filters</string>
+    <!-- Summary for the snoop logger filters [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filters_dashboard_footer">Disable and enable Bluetooth for the changes to take effect</string>
+    <!-- Title for the snoop logger pbap filter [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filter_pbap_title">Bluetooth HCI snoop log filtering PBAP</string>
+    <!-- Title for the snoop logger map filter [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filter_map_title">Bluetooth HCI snoop log filtering MAP</string>
+    <!-- Summary for the snoop logger filters [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filter_summary">Set filtering mode. (Disable and enable Bluetooth for the changes to take effect)</string>
+    <!-- Summary for the snoop logger profile filters while disabled [CHAR LIMIT=100] -->
+    <string name="bt_hci_snoop_log_filtered_mode_disabled_summary">Set Bluetooth HCI snoop log mode to Enabled Filtered to change this option</string>
     <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->
     <string name="talkback_title">Talkback</string>
     <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 08f502053a3..bc1840562ef 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -82,7 +82,7 @@
 
         <Preference
             android:key="snoop_logger_filters_dashboard"
-            android:title="@string/snoop_logger_filters_dashboard_title"
+            android:title="@string/bt_hci_snoop_log_filters_dashboard_title"
             android:fragment=
                 "com.android.settings.development.snooplogger.SnoopLoggerFiltersDashboard" />
 
diff --git a/res/xml/snoop_logger_filters_settings.xml b/res/xml/snoop_logger_filters_settings.xml
index c804ec67855..abc2546591e 100644
--- a/res/xml/snoop_logger_filters_settings.xml
+++ b/res/xml/snoop_logger_filters_settings.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/snoop_logger_filters_dashboard_title" >
+    android:title="@string/bt_hci_snoop_log_filters_dashboard_title" >
 
     <PreferenceCategory
         android:key="snoop_logger_filters_category"
@@ -26,4 +26,10 @@
         android:title="@string/bt_hci_snoop_log_filters_dashboard_summary"
         settings:controller=
           "com.android.settings.development.snooplogger.SnoopLoggerFiltersPreferenceController" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="snoop_logger_filters_footer"
+        android:title="@string/bt_hci_snoop_log_filters_dashboard_footer"
+        android:selectable="false"
+        settings:searchable="false"/>
 </PreferenceScreen>