ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Add advanced settings

This commit is contained in:
zilmar 2016-10-02 14:13:41 +11:00
parent 13fb7aa8ac
commit 71f07251ca
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Android/res/xml/settings_advanced.xml
View File

@ -3,11 +3,6 @@
android:title="@string/preferences"> android:title="@string/preferences">
<CheckBoxPreference <CheckBoxPreference
android:key="audio_Enabled"
android:summary="@string/audioEnabled_summary"
android:title="@string/audioEnabled_title" />
<PreferenceCategory android:title="@string/Advanced" >
<CheckBoxPreference
android:key="UserInterface_BasicMode" android:key="UserInterface_BasicMode"
android:summary="@string/advancedSettings_summary" android:summary="@string/advancedSettings_summary"
android:title="@string/advancedSettings_title" /> android:title="@string/advancedSettings_title" />
@ -27,20 +22,10 @@
android:key="Debugger_CpuUsage" android:key="Debugger_CpuUsage"
android:summary="@string/CpuUsage_summary" android:summary="@string/CpuUsage_summary"
android:title="@string/CpuUsage_title" /> android:title="@string/CpuUsage_title" />
<CheckBoxPreference
android:key="Debugger_DisplaySpeed"
android:summary="@string/DisplaySpeed_summary"
android:title="@string/DisplaySpeed_title" />
<ListPreference
android:entries="@array/DisplaySpeed_list"
android:entryValues="@array/DisplaySpeed_values"
android:key="Debugger_DisplaySpeedType"
android:title="@string/DisplaySpeedDisplay" />
<CheckBoxPreference <CheckBoxPreference
android:key="Plugin_ForceGfxReset" android:key="Plugin_ForceGfxReset"
android:summary="@string/ForceGfxReset_summary" android:summary="@string/ForceGfxReset_summary"
android:title="@string/ForceGfxReset_title" /> android:title="@string/ForceGfxReset_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/logging" > <PreferenceCategory android:title="@string/logging" >
<Preference <Preference
android:title="@string/project64core" android:title="@string/project64core"

29
Android/src/emu/project64/settings/AdvancedFragment.java Normal file
View File

@ -0,0 +1,29 @@
/****************************************************************************
* *
* Project64 - A Nintendo 64 emulator. *
* http://www.pj64-emu.com/ *
* Copyright (C) 2012 Project64. All rights reserved. *
* *
* License: *
* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html *
* *
****************************************************************************/
package emu.project64.settings;
import emu.project64.R;
import android.support.v7.preference.Preference;
public class AdvancedFragment extends BaseSettingsFragment
{
@Override
protected int getXml()
{
return R.xml.settings_advanced;
}
@Override
protected int getTitleId()
{
return R.string.advanced_screen_title;
}
}

8
Android/src/emu/project64/settings/BaseSettingsFragment.java
View File

@ -88,6 +88,14 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat
{ {
loadFragment(new AudioFragment()); loadFragment(new AudioFragment());
} }
else if (preference.getKey().equals("settings_advanced"))
{
loadFragment(new AdvancedFragment());
}
else if (preference.getKey().equals("logging_core"))
{
loadFragment(new LoggingProject64Core());
}
else if (preference.getKey().equals("settings_reset")) else if (preference.getKey().equals("settings_reset"))
{ {
DialogInterface.OnClickListener internalListener = new DialogInterface.OnClickListener() DialogInterface.OnClickListener internalListener = new DialogInterface.OnClickListener()