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

Commit 368a52c9 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 1c5d4399 c228a067
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@


<PreferenceScreen
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/sound_settings"
    android:title="@string/sound_settings"
    android:key="sound_settings"
    android:key="sound_settings"
@@ -198,6 +199,11 @@
          android:key="charging_sounds"
          android:key="charging_sounds"
          android:title="@string/charging_sounds_title"/>
          android:title="@string/charging_sounds_title"/>


        <!-- Custom charging sounds -->
        <org.lineageos.internal.lineageparts.LineagePartsPreference
          android:key="charging_sounds_settings"
          lineage:replacesKey="charging_sounds" />

        <!-- Docking sounds -->
        <!-- Docking sounds -->
        <SwitchPreference
        <SwitchPreference
          android:key="docking_sounds"
          android:key="docking_sounds"