Merge commit 'ec668827e033592b6e16bedc905643a0548bc0fd'

This commit is contained in:
SerpentSpirale 2021-01-26 12:35:51 +01:00
commit 778a56c408
2 changed files with 20 additions and 13 deletions

View File

@ -1,7 +1,7 @@
package net.kdt.pojavlaunch.prefs;
import android.os.*;
import androidx.core.app.*;
import androidx.preference.*;
import net.kdt.pojavlaunch.R;
@ -16,20 +16,27 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat impleme
// Disable freeform mode in Android 6.0 and below.
findPreference("freeform").setEnabled(Build.VERSION.SDK_INT >= 24);
SeekBarPreference seek2 = (SeekBarPreference) findPreference("timeLongPressTrigger");
CustomSeekBarPreference seek2 = (CustomSeekBarPreference) findPreference("timeLongPressTrigger");
seek2.setMin(100);
seek2.setMax(1000);
seek2.setValue(LauncherPreferences.PREF_LONGPRESS_TRIGGER);
seek2.setSuffix(" ms");
SeekBarPreference seek3 = (SeekBarPreference) findPreference("buttonscale");
seek3.setMin(20);
seek3.setMax(500);
CustomSeekBarPreference seek3 = (CustomSeekBarPreference) findPreference("buttonscale");
seek3.setMin(80);
seek3.setMax(250);
seek3.setValue((int) LauncherPreferences.PREF_BUTTONSIZE);
SeekBarPreference seek4 = (SeekBarPreference) findPreference("mousescale");
seek4.setMin(20);
seek4.setMax(500);
seek3.setSuffix(" %");
CustomSeekBarPreference seek4 = (CustomSeekBarPreference) findPreference("mousescale");
seek4.setMin(100);
seek4.setMax(300);
seek4.setValue((int) LauncherPreferences.PREF_MOUSESCALE);
seek4.setSuffix(" %");
CustomSeekBarPreference seek5 = (CustomSeekBarPreference) findPreference("resolutionRatio");
seek5.setMin(25);
seek5.setSuffix(" %");
EditTextPreference editJVMArgs = findPreference("javaArgs");
if (editJVMArgs != null) {

View File

@ -11,14 +11,14 @@
android:title="@string/mcl_setting_title_uninstalljre"
app2:icon="@drawable/rm_jre" />
<androidx.preference.SeekBarPreference
<net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
android:key="timeLongPressTrigger"
android:summary="@string/mcl_setting_subtitle_longpresstrigger"
android:title="@string/mcl_setting_title_longpresstrigger"
app2:showSeekBarValue="true"
app2:selectable="false"
app2:icon="@drawable/tap_len" />
<androidx.preference.SeekBarPreference
<net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
android:key="resolutionRatio"
android:summary="@string/resolution_decrease_subtitle"
android:title="@string/resolution_decrease_title"
@ -57,7 +57,7 @@
<androidx.preference.PreferenceCategory
android:title="@string/mcl_setting_category_scaling">
<androidx.preference.SeekBarPreference
<net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
android:key="buttonscale"
android:title="@string/mcl_setting_title_buttonscale"
android:summary="@string/mcl_setting_subtitle_buttonscale"
@ -65,7 +65,7 @@
app2:selectable="false"
app2:icon="@drawable/btn_scale"/>
<androidx.preference.SeekBarPreference
<net.kdt.pojavlaunch.prefs.CustomSeekBarPreference
android:key="mousescale"
android:summary="@string/mcl_setting_subtitle_mousescale"
android:title="@string/mcl_setting_title_mousescale"