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

Commit 6792db48 authored by David Liu's avatar David Liu
Browse files

[Expressive] Replace no title preference group with... 

[Expressive] Replace no title preference group with SettingsTitlelessPreferenceCategory to add proper padding

- Create SettingsTitlelessPreferenceCategory to use expressive layout when expressive design is used, otherwise use the existing layout

Bug: 378501860
Test: presubmit + manual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I1164f08e922f73d8c7ced832a1b82eeb634c2137
parent b1c62641

res/xml/bluetooth_device_details_fragment.xml

+2 −3
Original line number Diff line number Diff line
@@ -75,9 +75,8 @@ 
        settings:controller="com.android.settings.slices.SlicePreferenceController"

        settings:allowDividerAbove="true"/>



    <PreferenceCategory

        android:key="audio_sharing_control"

        android:layout="@layout/settingslib_preference_category_no_title"/>

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="audio_sharing_control"/>



    <PreferenceCategory

        android:key="bt_device_slice_category"

res/xml/channel_notification_settings.xml

+3 −4
Original line number Diff line number Diff line
@@ -115,14 +115,13 @@ 
        android:key="block_desc"

        android:order="110"/>



    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="external"

        android:order="18"

        android:layout="@layout/settingslib_preference_category_no_title">

        android:order="18">

        <Preference

            android:key="app_link"

            android:title="@string/app_settings_link"

            android:icon="@drawable/ic_settings_24dp"/>

    </PreferenceCategory>

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



</PreferenceScreen>

res/xml/flash_notifications_settings.xml

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ 
        settings:lottie_rawRes="@drawable/flash_notifications_illustration"

        settings:controller="com.android.settings.accessibility.FlashNotificationIllustrationPreferenceController" />



    <PreferenceCategory

        android:key="flash_notifications_category"

        android:layout="@layout/settingslib_preference_category_no_title">

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="flash_notifications_category">

        <SwitchPreferenceCompat

            android:key="camera_flash_notification_preference"

            android:persistent="false"
@@ -43,7 +42,7 @@ 
            android:persistent="false"

            android:title="@string/screen_flash_notification_title"

            settings:controller="com.android.settings.accessibility.ScreenFlashNotificationPreferenceController" />

    </PreferenceCategory>

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



    <com.android.settingslib.widget.ButtonPreference

        android:key="flash_notifications_preview"

res/xml/power_background_usage_detail.xml

+2 −3
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ 
        android:key="header_view"

        android:selectable="false"/>



    <PreferenceCategory

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="battery_optimization_mode_category"

        android:layout="@layout/settingslib_preference_category_no_title"

        settings:controller="com.android.settings.fuelgauge.BatteryOptimizationModePreferenceController">



        <com.android.settingslib.widget.MainSwitchPreference
@@ -42,7 +41,7 @@ 
            android:key="unrestricted_preference"

            android:title="@string/manager_battery_usage_unrestricted_title"

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

    </PreferenceCategory>

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



    <com.android.settingslib.widget.FooterPreference

        android:key="app_usage_footer_preference"

res/xml/power_usage_summary.xml

+3 −4
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ 
        android:title="@string/summary_placeholder"

        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />



    <PreferenceCategory

        android:key="power_usage_summary_category"

        android:layout="@layout/settingslib_preference_category_no_title">

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="power_usage_summary_category">

        <Preference

            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced"

            android:key="battery_usage_summary"
@@ -66,7 +65,7 @@ 
            android:title="@string/smart_battery_manager_title"

            settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"

            settings:keywords="@string/keywords_battery_adaptive_preferences" />

    </PreferenceCategory>

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



    <SwitchPreferenceCompat

        android:key="status_bar_show_battery_percent"