diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
index 9996a4d14..eb60752ad 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -203,9 +203,6 @@ public class PojavLauncherActivity extends BaseLauncherActivity
}
public void statusIsLaunching(boolean isLaunching) {
- // As preference fragment put to tab, changes without notice, so need re-load pref
- if (isLaunching) LauncherPreferences.loadPreferences();
-
LinearLayout.LayoutParams reparam = new LinearLayout.LayoutParams((int) updateWidthHeight(), LinearLayout.LayoutParams.WRAP_CONTENT);
ViewGroup.MarginLayoutParams lmainTabParam = (ViewGroup.MarginLayoutParams) fullTab.getLayoutParams();
int launchVisibility = isLaunching ? View.VISIBLE : View.GONE;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 7adba7acd..920cb6ae1 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -308,7 +308,7 @@ public class PojavLoginActivity extends BaseActivity
private boolean isJavaRuntimeInstalled(AssetManager am) {
boolean prefValue = firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false);
try {
- return prefValue && Tools.read(new FileInputStream(Tools.homeJreDir+"/version")).equals(Tools.read(am.open("components/jre/version")));
+ return prefValue && (am.open("components/jre/bin-" + Tools.currentArch.split("/")[0] + ".tar.xz") == null || Tools.read(new FileInputStream(Tools.homeJreDir+"/version")).equals(Tools.read(am.open("components/jre/version"))));
} catch(IOException e) {
Log.e("JVMCtl","failed to read file",e);
return prefValue;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceActivity.java b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceActivity.java
index c30db01bc..c53e964b2 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceActivity.java
@@ -15,7 +15,8 @@ public class LauncherPreferenceActivity extends MinePrefActivity
@Override
public void onBackPressed() {
super.onBackPressed();
- LauncherPreferences.loadPreferences();
}
+
+
}
diff --git a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
index 8bc51382d..39b9005ad 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
@@ -6,8 +6,9 @@ import android.support.v7.preference.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.R;
+import android.content.*;
-public class LauncherPreferenceFragment extends PreferenceFragmentCompat
+public class LauncherPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener
{
@Override
public void onCreatePreferences(Bundle b, String str) {
@@ -30,12 +31,22 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat
seek4.setMin(20);
seek4.setMax(500);
seek4.setValue((int) LauncherPreferences.PREF_MOUSESCALE);
-
}
@Override
- public void onHiddenChanged(boolean hidden) {
- super.onHiddenChanged(hidden);
- if (hidden) LauncherPreferences.loadPreferences();
+ public void onResume() {
+ super.onResume();
+ getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+ super.onPause();
+ }
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences p, String s) {
+ LauncherPreferences.loadPreferences();
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 99c4a9384..fc8e8149e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,6 +198,9 @@
Dynamic position
Dynamic X
Dynamic Y
+
+ Background transparency
+ Text transparency
Key combination
Alt