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

Commit c5a4bbef authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 80cd7439 cb1721e8

res/xml/configure_notification_settings.xml

+0 −6
Original line number Diff line number Diff line
@@ -110,12 +110,6 @@ 
            android:title="@string/notification_pulse_title"

            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>



        <!-- Battery light -->

        <org.lineageos.internal.lineageparts.LineagePartsPreference

            android:key="battery_lights"

            lineage:requiresConfig="@*lineageos.platform:integer/config_deviceLightCapabilities"

            lineage:requiresConfigMask="64" />



        <!-- Notification lights -->

        <org.lineageos.internal.lineageparts.LineagePartsPreference

            android:key="notification_lights"

res/xml/power_usage_summary.xml

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ 
        android:title="@string/smart_battery_manager_title"

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



    <!-- Battery light -->

    <org.lineageos.internal.lineageparts.LineagePartsPreference

        android:key="battery_lights"

        lineage:requiresConfig="@*lineageos.platform:integer/config_deviceLightCapabilities"

        lineage:requiresConfigMask="64" />



    <!-- Custom perf profiles settings -->

    <org.lineageos.internal.lineageparts.LineagePartsPreference

        android:key="perf_profile_settings"

res/xml/security_lockscreen_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
        <lineageos.preference.RemotePreference

            android:key="doze_device_settings"

            android:title="@string/ambient_display_screen_title"

            lineage:replacesKey="ambient_display_notification">

            lineage:replacesKey="ambient_display_always_on|ambient_display_notification">

            <intent android:action="org.lineageos.settings.device.DOZE_SETTINGS" />

        </lineageos.preference.RemotePreference>