From ba640d0458672ee7ec58213a3e86fc7a73f89d6a Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Fri, 13 Aug 2021 17:52:11 +0200 Subject: [PATCH] - Update LauncherPreferenceFragment.java - Clean up some code --- .../prefs/LauncherPreferenceFragment.java | 23 +++++++++++++------ .../tasks/MinecraftDownloaderTask.java | 11 --------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java index 951bb0624..fca26f1c9 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java @@ -1,28 +1,37 @@ package net.kdt.pojavlaunch.prefs; -import android.app.ActivityManager; + +import android.graphics.Color; import android.os.*; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.preference.*; - import net.kdt.pojavlaunch.R; -import net.kdt.pojavlaunch.Tools; +import net.kdt.pojavlaunch.fragments.LauncherFragment; 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.Tools.getFreeDeviceMemory; import static net.kdt.pojavlaunch.Tools.getTotalDeviceMemory; import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE; 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 public void onCreatePreferences(Bundle b, String str) { 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. findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && PREF_NOTCH_SIZE != 0); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java index 5c77ef336..6a6c9a9a8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java @@ -344,26 +344,15 @@ public class MinecraftDownloaderTask extends AsyncTask jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments(); - jvmArgs.add("-Xms128M"); - jvmArgs.add("-Xmx1G"); - */ Intent mainIntent = new Intent(mActivity, MainActivity.class /* MainActivity.class */); // mainIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); mainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); mainIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); mActivity.startActivity(mainIntent); - } catch (Throwable e) { Tools.showError(mActivity, e); } - - /* - FloatingIntent maini = new FloatingIntent(PojavLauncherActivity.this, MainActivity.class); - maini.startFloatingActivity(); - */ } mActivity.mTask = null;