Skip to content

Commit a4411de

Browse files
committed
Revert A13+ per-app language preferences
See #12093 (comment)
1 parent 86efde5 commit a4411de

6 files changed

Lines changed: 0 additions & 43 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ android {
9797
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
9898
}
9999

100-
androidResources {
101-
generateLocaleConfig = true
102-
}
103-
104100
buildFeatures {
105101
viewBinding true
106102
buildConfig true

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package org.schabi.newpipe.settings;
22

33
import android.content.Context;
4-
import android.content.Intent;
5-
import android.net.Uri;
6-
import android.os.Build;
74
import android.os.Bundle;
8-
import android.provider.Settings;
95
import android.util.Log;
106
import android.widget.Toast;
117

@@ -23,7 +19,6 @@
2319
import org.schabi.newpipe.util.image.PreferredImageQuality;
2420

2521
import java.io.IOException;
26-
import java.util.Locale;
2722

2823
public class ContentSettingsFragment extends BasePreferenceFragment {
2924
private String youtubeRestrictedModeEnabledKey;
@@ -40,26 +35,6 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
4035

4136
private void setupAppLanguagePreferences() {
4237
final Preference appLanguagePref = requirePreference(R.string.app_language_key);
43-
// Android 13+ allows to set app specific languages
44-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
45-
appLanguagePref.setVisible(false);
46-
47-
final Preference newAppLanguagePref =
48-
requirePreference(R.string.app_language_android_13_and_up_key);
49-
newAppLanguagePref.setSummaryProvider(preference -> {
50-
final Locale loc = AppCompatDelegate.getApplicationLocales().get(0);
51-
return loc != null ? loc.getDisplayName() : getString(R.string.systems_language);
52-
});
53-
newAppLanguagePref.setOnPreferenceClickListener(preference -> {
54-
final Intent intent = new Intent(Settings.ACTION_APP_LOCALE_SETTINGS)
55-
.setData(Uri.fromParts("package", requireContext().getPackageName(), null));
56-
startActivity(intent);
57-
return true;
58-
});
59-
newAppLanguagePref.setVisible(true);
60-
return;
61-
}
62-
6338
appLanguagePref.setOnPreferenceChangeListener((preference, newValue) -> {
6439
final String language = (String) newValue;
6540
final String systemLang = getString(R.string.default_localization_key);

app/src/main/java/org/schabi/newpipe/util/Localization.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,11 +447,6 @@ public static void migrateAppLanguageSettingIfNecessary(@NonNull final Context c
447447
final String appLanguageKey = context.getString(R.string.app_language_key);
448448
final String appLanguageValue = sp.getString(appLanguageKey, null);
449449
if (appLanguageValue != null) {
450-
// The app language key is used on Android versions < 33
451-
// for more info, see ContentSettingsFragment
452-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
453-
sp.edit().remove(appLanguageKey).apply();
454-
}
455450
final String appLanguageDefaultValue =
456451
context.getString(R.string.default_localization_key);
457452
if (!appLanguageValue.equals(appLanguageDefaultValue)) {

app/src/main/res/resources.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/src/main/res/values/settings_keys.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
<string name="playback_skip_silence_key">playback_skip_silence_key</string>
357357

358358
<string name="app_language_key">app_language_key</string>
359-
<string name="app_language_android_13_and_up_key">app_language_android_13_and_up_key</string>
360359

361360
<string name="feed_update_threshold_key">feed_update_threshold_key</string>
362361
<string name="feed_update_threshold_default_value">300</string>

app/src/main/res/xml/content_settings.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
app:iconSpaceReserved="false"
1414
app:useSimpleSummaryProvider="true" />
1515

16-
<Preference
17-
android:key="@string/app_language_android_13_and_up_key"
18-
android:title="@string/app_language_title"
19-
app:isPreferenceVisible="false"
20-
app:singleLineTitle="false"
21-
app:iconSpaceReserved="false" />
22-
2316
<ListPreference
2417
android:defaultValue="@string/default_localization_key"
2518
android:entries="@array/language_names"

0 commit comments

Comments
 (0)