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

[Android] default to basic settings

This commit is contained in:
zilmar 2016-10-02 09:58:42 +11:00
parent 6550b293fa
commit 7f83a52641
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Android/res/xml/settings_basic.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/preferences">
<PreferenceCategory android:title="@string/Hardware" >
<Preference
android:summary="@string/input_screen_summary"
android:title="@string/input_screen_title"
android:key="settings_input"
android:icon="@drawable/ic_controller"
/>
<Preference
android:summary="@string/video_screen_summary"
android:title="@string/video_screen_title"
android:key="settings_video"
android:icon="@drawable/ic_picture"
/>
<Preference
android:summary="@string/audio_screen_summary"
android:title="@string/audio_screen_title"
android:key="settings_audio"
android:icon="@drawable/ic_speaker"
/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/Other" >
<Preference
android:summary="@string/reset_summary"
android:title="@string/reset_title"
android:key="settings_reset"
android:icon="@drawable/ic_undo"
/>
</PreferenceCategory>
</PreferenceScreen>

24
Android/src/emu/project64/settings/SettingsFragment.java
View File

@ -13,21 +13,15 @@ package emu.project64.settings;
import emu.project64.R; import emu.project64.R;
import emu.project64.jni.NativeExports; import emu.project64.jni.NativeExports;
import emu.project64.jni.SettingsID; import emu.project64.jni.SettingsID;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceManager;
public class SettingsFragment extends BaseSettingsFragment public class SettingsFragment extends BaseSettingsFragment
{ {
@Override @Override
protected int getXml() protected int getXml()
{ {
if (!NativeExports.SettingsLoadBool(SettingsID.UserInterface_BasicMode.getValue())) if (NativeExports.SettingsLoadBool(SettingsID.UserInterface_BasicMode.getValue()))
{ {
return R.xml.settings_advanced; return R.xml.settings_basic;
} }
return R.xml.settings; return R.xml.settings;
} }
@ -37,18 +31,4 @@ public class SettingsFragment extends BaseSettingsFragment
{ {
return R.string.preferences; return R.string.preferences;
} }
@Override
public boolean onPreferenceTreeClick(Preference preference)
{
if (preference.getKey().equals("logging_core"))
{
loadFragment(new LoggingProject64Core());
}
else
{
return super.onPreferenceTreeClick(preference);
}
return true;
}
} }