MaintainTeam/LastPipeBender
1
0
Fork 0
mirror of https://github.com/MaintainTeam/LastPipeBender.git synced 2025-03-01 22:08:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixed a stupid merge issue related to preference-searching (fixes #143)

Browse source
This commit is contained in:
polymorphicshade 2022-02-21 10:45:10 -07:00
parent 1ae09302ad
commit 6ea97e239c
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/settings/ExtraSettingsFragment.java
View file

@ -2,11 +2,9 @@ package org.schabi.newpipe.settings;
import android.os.Bundle;
import org.schabi.newpipe.R;
public class ExtraSettingsFragment extends BasePreferenceFragment {
@Override
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
addPreferencesFromResource(R.xml.extra_settings);
addPreferencesFromResourceRegistry();
}
}

4
app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
View file

@ -39,8 +39,8 @@ public final class SettingsResourceRegistry {
add(NotificationSettingsFragment.class, R.xml.notification_settings);
add(UpdateSettingsFragment.class, R.xml.update_settings);
add(VideoAudioSettingsFragment.class, R.xml.video_audio_settings);
add(VideoAudioSettingsFragment.class, R.xml.sponsor_block_settings);
add(VideoAudioSettingsFragment.class, R.xml.extra_settings);
add(SponsorBlockSettingsFragment.class, R.xml.sponsor_block_settings);
add(ExtraSettingsFragment.class, R.xml.extra_settings);
}
private SettingRegistryEntry add(

2
app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java
View file

@ -21,7 +21,7 @@ public class SponsorBlockCategoriesSettingsFragment extends BasePreferenceFragme
@Override
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
addPreferencesFromResource(R.xml.sponsor_block_category_settings);
addPreferencesFromResourceRegistry();
final Preference resetPreference =
findPreference(getString(R.string.sponsor_block_category_reset_key));

2
app/src/main/java/org/schabi/newpipe/settings/SponsorBlockSettingsFragment.java
View file

@ -19,7 +19,7 @@ public class SponsorBlockSettingsFragment extends BasePreferenceFragment {
@Override
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
addPreferencesFromResource(R.xml.sponsor_block_settings);
addPreferencesFromResourceRegistry();
final Preference sponsorBlockWebsitePreference =
findPreference(getString(R.string.sponsor_block_home_page_key));