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

Commit b1b64b7c authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Use UntitledPreferenceCategory" into main

parents 1449cd23 4b0afd08

res/xml/accounts_dashboard_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        android:key="dashboard_tile_placeholder"

        android:order="130"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    <com.android.settingslib.widget.UntitledPreferenceCategory>

      <SwitchPreferenceCompat

          android:key="auto_sync_account_data"

          android:title="@string/auto_sync_account_title"
@@ -69,6 +69,6 @@ 
          android:title="@string/account_settings_menu_auto_sync_personal"

          android:summary="@string/auto_sync_account_summary"

          android:order="204"/>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>



</PreferenceScreen>

res/xml/accounts_dashboard_settings_credman.xml

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        android:key="dashboard_tile_placeholder"

        android:order="130"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="200">

      <SwitchPreferenceCompat

          android:key="auto_sync_account_data"
@@ -72,6 +72,6 @@ 
          android:title="@string/account_settings_menu_auto_sync_personal"

          android:summary="@string/auto_sync_account_summary"

          android:order="204"/>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>



</PreferenceScreen>

res/xml/adb_device_details_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        android:selectable="false" />



    <!-- Device Fingerprint Details -->

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

            android:key="fingerprint_category">

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>

</PreferenceScreen>

res/xml/adb_wireless_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        xmlns:settings="http://schemas.android.com/apk/res-auto"

        android:title="@string/adb_wireless_settings">



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    <com.android.settingslib.widget.UntitledPreferenceCategory>

        <!-- ADB device name -->

        <Preference

            android:key="adb_device_name_pref"
@@ -36,10 +36,10 @@ 
            android:summary="@string/summary_placeholder"

            android:selectable="false"

            settings:enableCopying="true"/>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>



    <!-- Pairing methods category -->

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:key="adb_pairing_methods_category"

        settings:allowDividerAbove="true">

        <!-- qrcode scanner -->
@@ -54,7 +54,7 @@ 
            android:icon="@drawable/ic_password_adb_wireless"

            android:title="@string/adb_pair_method_code_title"

            android:summary="@string/adb_pair_method_code_summary"/>

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>



    <!-- Paired devices list -->

    <PreferenceCategory
@@ -63,7 +63,7 @@ 
        settings:allowDividerAbove="true"/>



    <!-- Off message: Shown only in the off state -->

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:key="adb_wireless_footer_category"

        settings:allowDividerAbove="false"/>

res/xml/app_data_usage.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:key="app_data_usage_summary"

        settings:controller="com.android.settings.datausage.AppDataUsageSummaryController"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:key="app_data_usage_settings_category"

        settings:isPreferenceVisible="@bool/config_show_sim_info">
@@ -55,7 +55,7 @@ 
            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/disabled_by_admin" />



    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    </com.android.settingslib.widget.UntitledPreferenceCategory>



    <PreferenceCategory

        android:key="app_list"