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

Commit f52d24e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add summary text for settings page" into main

parents 7e3d30c9 08e15a1c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -11124,6 +11124,9 @@
    <!-- Message of the error dialog when too many credential providers are selected (new strings for 24Q3). [CHAR_LIMIT=NONE] -->
    <string name="credman_limit_error_msg">Turn off at least 1 service to add another</string>
    <!-- Message that tells the user what the credential provider setting screen is used for. [CHAR_LIMIT=NONE] -->
    <string name="credman_main_settings_intro_text">Choose your preferred service to save data for sign-in and autofill suggestions. Turn on additional services if you\'d like them to provide suggestions too.</string>
    <!-- Message of the warning dialog for enabling the credential provider. [CHAR_LIMIT=NONE] -->
    <string name="credman_enable_confirmation_message">%1$s uses what\'s on your screen to determine what can be autofilled.</string>
+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@
    android:title="@string/account_dashboard_title_with_passkeys"
    settings:keywords="@string/keywords_accounts">

    <com.android.settingslib.widget.TopIntroPreference
      android:title="@string/credman_main_settings_intro_text" />

    <PreferenceCategory
        android:key="default_service_category"
        android:order="10"
+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@
    android:title="@string/account_dashboard_title_with_passkeys"
    settings:keywords="@string/keywords_accounts">

    <com.android.settingslib.widget.TopIntroPreference
      android:title="@string/credman_main_settings_intro_text" />

    <PreferenceCategory
        android:key="default_service_category"
        android:order="10"
+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@
    android:title="@string/account_dashboard_title_with_passkeys"
    settings:keywords="@string/keywords_accounts">

    <com.android.settingslib.widget.TopIntroPreference
      android:title="@string/credman_main_settings_intro_text" />

    <PreferenceCategory
        android:key="default_service_category"
        android:order="10"