luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-10 08:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #288 from michaelschattgen/set-locale

Browse source 
Fix setting locale on 7.0
This commit is contained in:
Alexander Bakker 2020-01-20 21:35:04 +01:00 • committed by GitHub
commit c52e60b410
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
View file

@ -110,7 +110,7 @@ public abstract class AegisActivity extends AppCompatActivity implements AegisAp
Configuration config = new Configuration(); Configuration config = new Configuration();
config.locale = locale; config.locale = locale;
getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics()); this.getResources().updateConfiguration(config, this.getResources().getDisplayMetrics());
} }
/** /**

6
app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
View file

@ -5,6 +5,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
@ -124,11 +125,16 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
}); });
Preference langPreference = findPreference("pref_lang"); Preference langPreference = findPreference("pref_lang");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
langPreference.setOnPreferenceChangeListener((preference, newValue) -> { langPreference.setOnPreferenceChangeListener((preference, newValue) -> {
_result.putExtra("needsRecreate", true); _result.putExtra("needsRecreate", true);
getActivity().recreate(); getActivity().recreate();
return true; return true;
}); });
} else {
// Setting locale doesn't work on Marshmallow or below
langPreference.setVisible(false);
}
int currentViewMode = app.getPreferences().getCurrentViewMode().ordinal(); int currentViewMode = app.getPreferences().getCurrentViewMode().ordinal();
Preference viewModePreference = findPreference("pref_view_mode"); Preference viewModePreference = findPreference("pref_view_mode");