Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57f3e942 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Snoop Logger: fix descriptions" am: 5fd26540 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822



Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4886f28a 5fd26540

res/values/strings.xml

+14 −12
Original line number Diff line number Diff line
@@ -5441,18 +5441,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] -->

res/xml/development_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

res/xml/snoop_logger_filters_settings.xml

+7 −1
Original line number Diff line number Diff line
@@ -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>