diff --git a/app/build.gradle b/app/build.gradle index 54bd86a72c9..f5e74403734 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -97,10 +97,6 @@ android { androidTest.assets.srcDirs += files("$projectDir/schemas".toString()) } - androidResources { - generateLocaleConfig = true - } - buildFeatures { viewBinding true buildConfig true diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java index b855f7c38aa..8ba653a7924 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java @@ -1,11 +1,7 @@ package org.schabi.newpipe.settings; import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Build; import android.os.Bundle; -import android.provider.Settings; import android.util.Log; import android.widget.Toast; @@ -23,7 +19,6 @@ import org.schabi.newpipe.util.image.PreferredImageQuality; import java.io.IOException; -import java.util.Locale; public class ContentSettingsFragment extends BasePreferenceFragment { private String youtubeRestrictedModeEnabledKey; @@ -40,26 +35,6 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro private void setupAppLanguagePreferences() { final Preference appLanguagePref = requirePreference(R.string.app_language_key); - // Android 13+ allows to set app specific languages - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - appLanguagePref.setVisible(false); - - final Preference newAppLanguagePref = - requirePreference(R.string.app_language_android_13_and_up_key); - newAppLanguagePref.setSummaryProvider(preference -> { - final Locale loc = AppCompatDelegate.getApplicationLocales().get(0); - return loc != null ? loc.getDisplayName() : getString(R.string.systems_language); - }); - newAppLanguagePref.setOnPreferenceClickListener(preference -> { - final Intent intent = new Intent(Settings.ACTION_APP_LOCALE_SETTINGS) - .setData(Uri.fromParts("package", requireContext().getPackageName(), null)); - startActivity(intent); - return true; - }); - newAppLanguagePref.setVisible(true); - return; - } - appLanguagePref.setOnPreferenceChangeListener((preference, newValue) -> { final String language = (String) newValue; final String systemLang = getString(R.string.default_localization_key); diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java index bd5463088c8..f2b047d845d 100644 --- a/app/src/main/java/org/schabi/newpipe/util/Localization.java +++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java @@ -447,11 +447,6 @@ public static void migrateAppLanguageSettingIfNecessary(@NonNull final Context c final String appLanguageKey = context.getString(R.string.app_language_key); final String appLanguageValue = sp.getString(appLanguageKey, null); if (appLanguageValue != null) { - // The app language key is used on Android versions < 33 - // for more info, see ContentSettingsFragment - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - sp.edit().remove(appLanguageKey).apply(); - } final String appLanguageDefaultValue = context.getString(R.string.default_localization_key); if (!appLanguageValue.equals(appLanguageDefaultValue)) { diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties deleted file mode 100644 index 467b3efec9f..00000000000 --- a/app/src/main/res/resources.properties +++ /dev/null @@ -1 +0,0 @@ -unqualifiedResLocale=en-US diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 352e4cec120..783ce8a0853 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -356,7 +356,6 @@ playback_skip_silence_key app_language_key - app_language_android_13_and_up_key feed_update_threshold_key 300 diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml index f17783a2285..2cdc6c545c9 100644 --- a/app/src/main/res/xml/content_settings.xml +++ b/app/src/main/res/xml/content_settings.xml @@ -13,13 +13,6 @@ app:iconSpaceReserved="false" app:useSimpleSummaryProvider="true" /> - -