- Update LauncherPreferenceFragment.java

- Clean up some code
This commit is contained in:
SerpentSpirale 2021-08-13 17:52:11 +02:00
parent cf0db09ea9
commit ba640d0458
2 changed files with 16 additions and 18 deletions

View File

@ -1,28 +1,37 @@
package net.kdt.pojavlaunch.prefs; package net.kdt.pojavlaunch.prefs;
import android.app.ActivityManager;
import android.graphics.Color;
import android.os.*; import android.os.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.*; import androidx.preference.*;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;
import net.kdt.pojavlaunch.Tools; import net.kdt.pojavlaunch.fragments.LauncherFragment;
import android.content.*; import android.content.*;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import static net.kdt.pojavlaunch.Architecture.is32BitsDevice; import static net.kdt.pojavlaunch.Architecture.is32BitsDevice;
import static net.kdt.pojavlaunch.Tools.getFreeDeviceMemory;
import static net.kdt.pojavlaunch.Tools.getTotalDeviceMemory; import static net.kdt.pojavlaunch.Tools.getTotalDeviceMemory;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE; import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE;
public class LauncherPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener public class LauncherPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener
{ {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
view.setBackgroundColor(Color.parseColor("#44000000"));
super.onViewCreated(view, savedInstanceState);
}
@Override @Override
public void onCreatePreferences(Bundle b, String str) { public void onCreatePreferences(Bundle b, String str) {
addPreferencesFromResource(R.xml.pref_main); addPreferencesFromResource(R.xml.pref_main);
// Disable freeform mode in Android 6.0 and below.
findPreference("freeform").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N);
//Disable notch checking behavior on android 8.1 and below. //Disable notch checking behavior on android 8.1 and below.
findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && PREF_NOTCH_SIZE != 0); findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && PREF_NOTCH_SIZE != 0);

View File

@ -344,26 +344,15 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
mActivity.mCrashView.setLastCrash(""); mActivity.mCrashView.setLastCrash("");
try { try {
/*
List<String> jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments();
jvmArgs.add("-Xms128M");
jvmArgs.add("-Xmx1G");
*/
Intent mainIntent = new Intent(mActivity, MainActivity.class /* MainActivity.class */); Intent mainIntent = new Intent(mActivity, MainActivity.class /* MainActivity.class */);
// mainIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); // mainIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
mainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); mainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
mainIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); mainIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
mActivity.startActivity(mainIntent); mActivity.startActivity(mainIntent);
} }
catch (Throwable e) { catch (Throwable e) {
Tools.showError(mActivity, e); Tools.showError(mActivity, e);
} }
/*
FloatingIntent maini = new FloatingIntent(PojavLauncherActivity.this, MainActivity.class);
maini.startFloatingActivity();
*/
} }
mActivity.mTask = null; mActivity.mTask = null;