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

Commit 6c611e37 authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive] Put preferences in a PreferenceCategory" into main

parents e8e3f41d 2d593884

res/xml/accounts_dashboard_settings.xml

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

        android:order="130"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <SwitchPreferenceCompat

          android:key="auto_sync_account_data"

          android:title="@string/auto_sync_account_title"
@@ -68,5 +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>



</PreferenceScreen>

res/xml/accounts_dashboard_settings_credman.xml

+21 −18
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
        android:key="dashboard_tile_placeholder"

        android:order="130"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:order="200">

      <SwitchPreferenceCompat

          android:key="auto_sync_account_data"

          android:title="@string/auto_sync_account_title"
@@ -70,5 +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>



</PreferenceScreen>

res/xml/connected_devices.xml

+36 −30
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:key="connected_devices_screen"

    android:title="@string/connected_devices_dashboard_title">



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <com.android.settings.slices.SlicePreference

          android:key="bt_nearby_slice"

          android:title="@string/summary_placeholder"
@@ -33,6 +34,7 @@ 
          android:title="@string/audio_sharing_title"

          settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"

          settings:searchable="false" />

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



    <PreferenceCategory

        android:key="audio_sharing_device_list"
@@ -50,6 +52,7 @@ 
        android:title="@string/connected_device_other_device_title"

        settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController" />



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <com.android.settingslib.RestrictedPreference

          android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"

          android:icon="@drawable/ic_add_24dp"
@@ -60,6 +63,7 @@ 
          settings:keywords="@string/keywords_add_bt_device"

          settings:useAdminDisabledSummary="true"

          settings:userRestriction="no_config_bluetooth" />

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



    <PreferenceCategory

        android:key="previously_connected_devices"
@@ -91,6 +95,7 @@ 
            settings:searchable="false" />

    </PreferenceCategory>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <Preference

          android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"

          android:key="connection_preferences"
@@ -98,6 +103,7 @@ 
          android:title="@string/connected_device_connections_title"

          settings:allowDividerAbove="true"

          settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController" />

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



    <com.android.settingslib.widget.FooterPreference

        android:key="discoverable_footer"

res/xml/location_settings.xml

+9 −7
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <Preference

          android:key="recent_location_access_see_all_button"

          android:title="@string/location_recent_location_access_see_all"
@@ -34,6 +35,7 @@ 
          android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"

          settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"

          settings:searchable="false"/>

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



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="location_advanced_settings">

res/xml/mobile_network_settings.xml

+75 −69
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ 


        </PreferenceCategory>



        <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

          <com.android.settings.network.telephony.cdma.CdmaListPreference

              android:key="cdma_system_select_key"

              android:title="@string/cdma_system_select_title"
@@ -261,6 +262,7 @@ 
              android:entryValues="@array/cdma_subscription_values"

              android:dialogTitle="@string/cdma_subscription_dialogtitle"

             settings:controller="com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController"/>

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



        <PreferenceCategory

            android:key="network_operators_category_key"
@@ -279,6 +281,7 @@ 
                settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>

        </PreferenceCategory>



        <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

          <!--We want separate APN setting from reset of settings because we want user to change it with caution-->

          <com.android.settingslib.RestrictedPreference

              android:key="telephony_apn_key"
@@ -314,7 +317,9 @@ 
              settings:searchable="false"

              settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>

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

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



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

      <Preference

          android:key="convert_to_esim"

          android:persistent="false"
@@ -333,6 +338,7 @@ 
          android:title="@string/mobile_network_erase_sim"

          settings:allowDividerBelow="true"

          settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController"/>

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



    <com.android.settingslib.widget.FooterPreference

        android:key="disable_sim_explanation"