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

[Android] Update log level display

This commit is contained in:
zilmar 2016-12-09 17:41:50 +11:00
parent 6bf14b7081
commit 82247b9f69
3 changed files with 43 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Android/res/xml/logging_audio.xml
View File

@ -1,14 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAudioInitShutdown"
android:title="@string/TraceAudioInitShutdown" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAudioAudioInterface"
android:title="@string/TraceAudioAudioInterface" />
</PreferenceScreen>

89
Android/res/xml/logging_project64core.xml
View File

@ -1,114 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceMD5"
android:title="@string/TraceMD5" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceThread"
android:title="@string/TraceThread" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TracePath"
android:title="@string/TracePath" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceSettings"
android:title="@string/TraceSettings" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceUnknown"
android:title="@string/TraceUnknown" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAppInit"
android:title="@string/TraceAppInit" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAppCleanup"
android:title="@string/TraceAppCleanup" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceN64System"
android:title="@string/TraceN64System" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TracePlugins"
android:title="@string/TracePlugins" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceGFXPlugin"
android:title="@string/TraceGFXPlugin" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAudioPlugin"
android:title="@string/TraceAudioPlugin" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceControllerPlugin"
android:title="@string/TraceControllerPlugin" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceRSPPlugin"
android:title="@string/TraceRSPPlugin" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceRSP"
android:title="@string/TraceRSP" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceAudio"
android:title="@string/TraceAudio" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceRegisterCache"
android:title="@string/TraceRegisterCache" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceRecompiler"
android:title="@string/TraceRecompiler" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceTLB"
android:title="@string/TraceTLB" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceProtectedMEM"
android:title="@string/TraceProtectedMem" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceUserInterface"
android:title="@string/TraceUserInterface" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceRomList"
android:title="@string/TraceRomList" />
<ListPreference
android:entries="@array/trace_severity_list"
android:entryValues="@array/trace_severity_values"
<emu.project64.settings.LogLevelPreference
android:key="Debugger_TraceExceptionHandler"
android:title="@string/TraceExceptionHandler" />
</PreferenceScreen>

38
Android/src/emu/project64/settings/TwoLinesListPreference.java
View File

@ -41,8 +41,8 @@ public class TwoLinesListPreference extends ListPreference
@Override
public void setValue(String value)
{
super.setValue(value);
mValueIndex = getValueIndex();
super.setValue(value);
mValueIndex = getValueIndex();
updateSummary();
}
/**
@ -53,7 +53,7 @@ public class TwoLinesListPreference extends ListPreference
*/
public int findIndexOfValue(String value)
{
CharSequence[] EntryValues = getEntryValues();
CharSequence[] EntryValues = getEntryValues();
if (value != null && EntryValues != null)
{
for (int i = EntryValues.length - 1; i >= 0; i--)
@ -80,14 +80,14 @@ public class TwoLinesListPreference extends ListPreference
@Override
public void setEntries(CharSequence[] Entries)
{
super.setEntries(Entries);
super.setEntries(Entries);
updateSummary();
}
@Override
public void setEntryValues(CharSequence[] EntryValues)
{
super.setEntryValues(EntryValues);
super.setEntryValues(EntryValues);
mValueIndex = getValueIndex();
updateSummary();
}
@ -100,20 +100,20 @@ public class TwoLinesListPreference extends ListPreference
private void updateSummary()
{
if (mValueIndex < 0)
{
return;
}
CharSequence[] Entries = getEntries();
String summary = Entries[mValueIndex].toString();
if (mEntriesSubtitles != null && mEntriesSubtitles.length > mValueIndex)
{
String subtitle = mEntriesSubtitles[mValueIndex].toString();
if (summary.length() > 0 && subtitle.length() > 0)
{
summary += " - " + subtitle;
}
}
if (mValueIndex < 0)
{
return;
}
CharSequence[] Entries = getEntries();
String summary = Entries[mValueIndex].toString();
if (mEntriesSubtitles != null && mEntriesSubtitles.length > mValueIndex)
{
String subtitle = mEntriesSubtitles[mValueIndex].toString();
if (summary.length() > 0 && subtitle.length() > 0)
{
summary += " - " + subtitle;
}
}
setSummary( summary );
}
}