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

Commit 74cf39fb authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 3495a496 74c15e81

res/xml/display_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
            android:title="@string/wake_when_plugged_or_unplugged_title"

            android:summary="@string/wake_when_plugged_or_unplugged_summary"

            android:defaultValue="@*android:bool/config_unplugTurnsOnScreen"

            settings:requiresConfig="@*com.android.settings:bool/config_show_top_level_battery" />

            settings:requiresConfig="@bool/config_show_top_level_battery" />



        <lineageos.preference.LineageSystemSettingSwitchPreference

            android:key="high_touch_polling_rate_enable"

res/xml/sound_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
    <!-- Custom charging sounds -->

    <lineageos.preference.LineagePartsPreference

        android:key="charging_sounds_settings"

        settings:requiresConfig="@*com.android.settings:bool/config_show_charging_sounds"

        settings:requiresConfig="@bool/config_show_charging_sounds"

        settings:replacesKey="charging_sounds" />



    <!-- Docking sounds -->