mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-10 14:39:01 +01:00
[Android] Redo the Settings menu, Can now change the CPU Core, dual core setting, and video backend in the settings"
This commit is contained in:
Ryan Houdek
parent
9a1b9e9b3b
commit
f8a5d05c07
456
Source/Android/.idea/workspace.xml
generated
456
Source/Android/.idea/workspace.xml
generated
@ -1,9 +1,26 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="AndroidLayoutPreviewToolWindow">
|
||||||
|
<option name="state">
|
||||||
|
<GlobalState>
|
||||||
|
<option name="visible" value="false" />
|
||||||
|
</GlobalState>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
<component name="AndroidLayouts">
|
<component name="AndroidLayouts">
|
||||||
<shared>
|
<shared>
|
||||||
<config />
|
<config>
|
||||||
|
<target>android-17</target>
|
||||||
|
</config>
|
||||||
</shared>
|
</shared>
|
||||||
|
<layouts>
|
||||||
|
<layout url="file://$PROJECT_DIR$/res/layout/fragment_edit_name.xml">
|
||||||
|
<config>
|
||||||
|
<device>Nexus 4</device>
|
||||||
|
<theme>@android:style/Theme.Holo</theme>
|
||||||
|
</config>
|
||||||
|
</layout>
|
||||||
|
</layouts>
|
||||||
</component>
|
</component>
|
||||||
<component name="BookmarkManager">
|
<component name="BookmarkManager">
|
||||||
<bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
|
<bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
|
||||||
@ -14,11 +31,17 @@
|
|||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
<file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
|
<file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
|
||||||
<file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
|
<file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
|
||||||
<file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956140826" ignored="false" />
|
<file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369035891369" ignored="false" />
|
||||||
<file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957239085" ignored="false" />
|
<file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368965879091" ignored="false" />
|
||||||
<file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
|
<file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
|
||||||
<file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
|
<file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
|
||||||
<file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956692901" ignored="false" />
|
<file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032503953" ignored="false" />
|
||||||
|
<file path="/EditNameDialog.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369023935830" ignored="false" />
|
||||||
|
<file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
|
||||||
|
<file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
|
||||||
|
<file path="/prefs.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036284146" ignored="false" />
|
||||||
|
<file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036186956" ignored="false" />
|
||||||
|
<file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -26,6 +49,11 @@
|
|||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
|
||||||
|
<component name="Commander">
|
||||||
|
<leftPanel />
|
||||||
|
<rightPanel />
|
||||||
|
<splitter proportion="0.5" />
|
||||||
|
</component>
|
||||||
<component name="CreatePatchCommitExecutor">
|
<component name="CreatePatchCommitExecutor">
|
||||||
<option name="PATCH_PATH" value="" />
|
<option name="PATCH_PATH" value="" />
|
||||||
</component>
|
</component>
|
||||||
@ -82,25 +110,25 @@
|
|||||||
<file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
|
<state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
|
<file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
|
<state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="prefvalues.xml" pinned="false" current="true" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
|
<entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@ -109,19 +137,22 @@
|
|||||||
<file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
|
<state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="SettingBrowser.java" pinned="false" current="false" current-in-tab="false">
|
<file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
|
<entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
|
<state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
<provider editor-type-id="android-designer">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
@ -143,15 +174,26 @@
|
|||||||
<option name="changedFiles">
|
<option name="changedFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
|
||||||
<option value="$PROJECT_DIR$/AndroidManifest.xml" />
|
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
|
||||||
|
<option value="$PROJECT_DIR$/res/layout/fragment_edit_name.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/EditNameDialog.java" />
|
||||||
|
<option value="$PROJECT_DIR$/res/values/array.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/AndroidManifest.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsFragment.java" />
|
||||||
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
|
||||||
|
<option value="$PROJECT_DIR$/res/values/prefs.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
|
||||||
|
<option value="$PROJECT_DIR$/res/layout/prefs.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
|
||||||
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
|
<option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
<component name="MavenProjectNavigator">
|
||||||
|
<treeState />
|
||||||
|
</component>
|
||||||
<component name="ProjectFrameBounds">
|
<component name="ProjectFrameBounds">
|
||||||
<option name="x" value="24" />
|
<option name="x" value="24" />
|
||||||
<option name="width" value="1342" />
|
<option name="width" value="1342" />
|
||||||
@ -183,26 +225,6 @@
|
|||||||
<sortByType />
|
<sortByType />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scope">
|
|
||||||
<subPane subId="Project Files">
|
|
||||||
<PATH>
|
|
||||||
<PATH_ELEMENT USER_OBJECT="Root">
|
|
||||||
<option name="myItemId" value="" />
|
|
||||||
<option name="myItemType" value="" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
</PATH>
|
|
||||||
<PATH>
|
|
||||||
<PATH_ELEMENT USER_OBJECT="Root">
|
|
||||||
<option name="myItemId" value="" />
|
|
||||||
<option name="myItemType" value="" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
<PATH_ELEMENT USER_OBJECT="Android">
|
|
||||||
<option name="myItemId" value="" />
|
|
||||||
<option name="myItemType" value="" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
</PATH>
|
|
||||||
</subPane>
|
|
||||||
</pane>
|
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
@ -242,28 +264,167 @@
|
|||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
|
<pane id="Scope">
|
||||||
|
<subPane subId="Project Files">
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="src">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="res">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="values">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="res">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="layout">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Root">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="Android">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT USER_OBJECT="res">
|
||||||
|
<option name="myItemId" value="" />
|
||||||
|
<option name="myItemType" value="" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
|
</subPane>
|
||||||
|
</pane>
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="options.splitter.main.proportions" value="0.3" />
|
<property name="dynamic.classpath" value="false" />
|
||||||
<property name="FullScreen" value="false" />
|
|
||||||
<property name="options.searchVisible" value="true" />
|
|
||||||
<property name="recentsLimit" value="5" />
|
|
||||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
||||||
<property name="GoToClass.includeLibraries" value="false" />
|
|
||||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
|
|
||||||
<property name="options.splitter.details.proportions" value="0.2" />
|
|
||||||
<property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
|
|
||||||
<property name="MemberChooser.showClasses" value="true" />
|
<property name="MemberChooser.showClasses" value="true" />
|
||||||
|
<property name="options.searchVisible" value="true" />
|
||||||
|
<property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
|
||||||
|
<property name="FullScreen" value="false" />
|
||||||
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
|
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
|
||||||
<property name="MemberChooser.sorted" value="false" />
|
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
|
||||||
<property name="restartRequiresConfirmation" value="true" />
|
<property name="GoToClass.includeLibraries" value="false" />
|
||||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
|
||||||
<property name="GoToFile.includeJavaFiles" value="false" />
|
<property name="GoToFile.includeJavaFiles" value="false" />
|
||||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||||
<property name="dynamic.classpath" value="false" />
|
<property name="MemberChooser.sorted" value="false" />
|
||||||
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||||
|
<property name="options.splitter.main.proportions" value="0.3" />
|
||||||
|
<property name="options.splitter.details.proportions" value="0.2" />
|
||||||
|
<property name="recentsLimit" value="5" />
|
||||||
|
<property name="restartRequiresConfirmation" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Android Application.Dolphin Emulator">
|
<component name="RunManager" selected="Android Application.Dolphin Emulator">
|
||||||
|
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
|
||||||
|
<module name="" />
|
||||||
|
<option name="TESTING_TYPE" value="0" />
|
||||||
|
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
|
||||||
|
<option name="METHOD_NAME" value="" />
|
||||||
|
<option name="CLASS_NAME" value="" />
|
||||||
|
<option name="PACKAGE_NAME" value="" />
|
||||||
|
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
||||||
|
<option name="PREFERRED_AVD" value="" />
|
||||||
|
<option name="USE_COMMAND_LINE" value="true" />
|
||||||
|
<option name="COMMAND_LINE" value="" />
|
||||||
|
<option name="WIPE_USER_DATA" value="false" />
|
||||||
|
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
||||||
|
<option name="NETWORK_SPEED" value="full" />
|
||||||
|
<option name="NETWORK_LATENCY" value="none" />
|
||||||
|
<option name="CLEAR_LOGCAT" value="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
<configuration default="true" type="Applet" factoryName="Applet">
|
||||||
|
<module name="" />
|
||||||
|
<option name="MAIN_CLASS_NAME" />
|
||||||
|
<option name="HTML_FILE_NAME" />
|
||||||
|
<option name="HTML_USED" value="false" />
|
||||||
|
<option name="WIDTH" value="400" />
|
||||||
|
<option name="HEIGHT" value="300" />
|
||||||
|
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||||
|
<option name="VM_PARAMETERS" />
|
||||||
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
@ -284,18 +445,12 @@
|
|||||||
<patterns />
|
<patterns />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
<configuration default="true" type="Remote" factoryName="Remote">
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="SERVER_MODE" value="false" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="SHMEM_ADDRESS" value="javadebug" />
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="HOST" value="localhost" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="PORT" value="5005" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<module name="" />
|
|
||||||
<envs />
|
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
|
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
|
||||||
@ -314,43 +469,18 @@
|
|||||||
<option name="CLEAR_LOGCAT" value="false" />
|
<option name="CLEAR_LOGCAT" value="false" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
<configuration default="true" type="Application" factoryName="Application">
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
|
||||||
<option name="SERVER_MODE" value="false" />
|
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
|
||||||
<option name="HOST" value="localhost" />
|
|
||||||
<option name="PORT" value="5005" />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
|
||||||
<module name="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" />
|
<option name="MAIN_CLASS_NAME" />
|
||||||
<option name="HTML_FILE_NAME" />
|
|
||||||
<option name="HTML_USED" value="false" />
|
|
||||||
<option name="WIDTH" value="400" />
|
|
||||||
<option name="HEIGHT" value="300" />
|
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
<method />
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
</configuration>
|
<option name="ENV_VARIABLES" />
|
||||||
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
<module name="" />
|
<module name="" />
|
||||||
<option name="TESTING_TYPE" value="0" />
|
<envs />
|
||||||
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="CLASS_NAME" value="" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
|
||||||
<option name="PREFERRED_AVD" value="" />
|
|
||||||
<option name="USE_COMMAND_LINE" value="true" />
|
|
||||||
<option name="COMMAND_LINE" value="" />
|
|
||||||
<option name="WIPE_USER_DATA" value="false" />
|
|
||||||
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
|
||||||
<option name="NETWORK_SPEED" value="full" />
|
|
||||||
<option name="NETWORK_LATENCY" value="none" />
|
|
||||||
<option name="CLEAR_LOGCAT" value="false" />
|
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
|
<configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
|
||||||
@ -420,11 +550,12 @@
|
|||||||
<workItem from="1368955681290" duration="2332000" />
|
<workItem from="1368955681290" duration="2332000" />
|
||||||
<workItem from="1368958063194" duration="125000" />
|
<workItem from="1368958063194" duration="125000" />
|
||||||
<workItem from="1368958842851" duration="47000" />
|
<workItem from="1368958842851" duration="47000" />
|
||||||
|
<workItem from="1369030521257" duration="6092000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="17593000" />
|
<option name="totallyTimeSpent" value="26691000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="TodoView" selected-index="0">
|
<component name="TodoView" selected-index="0">
|
||||||
<todo-panel id="selected-file">
|
<todo-panel id="selected-file">
|
||||||
@ -450,29 +581,30 @@
|
|||||||
<frame x="24" y="0" width="1342" height="744" extended-state="0" />
|
<frame x="24" y="0" width="1342" height="744" extended-state="0" />
|
||||||
<editor active="false" />
|
<editor active="false" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6812081" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
||||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19474497" sideWeight="0.680067" order="0" side_tool="false" content_ui="combo" />
|
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.319933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31879196" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6812081" order="0" side_tool="false" content_ui="combo" />
|
||||||
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
|
||||||
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16306028" sideWeight="0.6812081" order="6" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
||||||
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
@ -536,107 +668,85 @@
|
|||||||
<breakpoint-manager />
|
<breakpoint-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
|
<state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/R.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="5" column="19" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0" />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/Manifest.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="5" column="19" selection-start="183" selection-end="183" vertical-scroll-proportion="0.0" />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="5" column="19" selection-start="135" selection-end="135" vertical-scroll-proportion="0.078809105" />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/content/ContentProvider.class">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="69" column="2" selection-start="4062" selection-end="4062" vertical-scroll-proportion="0.81182796" />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="11" column="13" selection-start="0" selection-end="1323" vertical-scroll-proportion="0.10507881" />
|
<state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834">
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/res/layout/sidemenu.xml">
|
|
||||||
<provider selected="true" editor-type-id="android-designer">
|
|
||||||
<state />
|
|
||||||
</provider>
|
|
||||||
<provider editor-type-id="text-editor">
|
|
||||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
|
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="21" column="48" selection-start="955" selection-end="955" vertical-scroll-proportion="0.82894737">
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#659#677#0" expanded="true" />
|
<element signature="e#659#677#0" expanded="true" />
|
||||||
<element signature="e#767#785#0" expanded="true" />
|
<element signature="e#767#785#0" expanded="true" />
|
||||||
<element signature="e#1338#1356#0" expanded="true" />
|
<element signature="e#1338#1356#0" expanded="true" />
|
||||||
<element signature="e#1646#1664#0" expanded="true" />
|
<element signature="e#1646#1664#0" expanded="true" />
|
||||||
<element signature="e#1955#1973#0" expanded="true" />
|
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
|
<entry file="file://$PROJECT_DIR$/res/layout/main.xml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="1" column="0" selection-start="35" selection-end="35" vertical-scroll-proportion="0.039473683">
|
<state line="2" column="0" selection-start="112" selection-end="190" vertical-scroll-proportion="-0.6">
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
<provider editor-type-id="android-designer">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="23" column="15" selection-start="454" selection-end="454" vertical-scroll-proportion="0.33157894" />
|
<state line="23" column="9" selection-start="698" selection-end="698" vertical-scroll-proportion="0.39473686">
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="41" column="88" selection-start="1280" selection-end="1280" vertical-scroll-proportion="1.3421053" />
|
<state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
|
<entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
|
||||||
|
<provider editor-type-id="android-designer">
|
||||||
|
<state />
|
||||||
|
</provider>
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
|
<state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
|
<entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
|
<state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|||||||
@ -37,11 +37,9 @@
|
|||||||
android:theme="@android:style/Theme"
|
android:theme="@android:style/Theme"
|
||||||
android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
|
android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name="org.dolphinemu.dolphinemu.SettingBrowser"
|
android:name=".PrefsActivity"
|
||||||
android:label="@string/app_name"
|
android:theme="@android:style/Theme.Black.NoTitleBar" >
|
||||||
android:theme="@android:style/Theme"
|
|
||||||
android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
|
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
|
|||||||
28
Source/Android/res/layout/prefs.xml
Normal file
28
Source/Android/res/layout/prefs.xml
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
>
|
||||||
|
<PreferenceCategory
|
||||||
|
android:summary="Settings"
|
||||||
|
android:title="CPU Settings" >
|
||||||
|
<ListPreference
|
||||||
|
android:entries="@array/cpuOptions"
|
||||||
|
android:entryValues="@array/cpuValues"
|
||||||
|
android:key="cpupref"
|
||||||
|
android:summary="Emulation core to use"
|
||||||
|
android:title="CPU Core" />
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:key="dualcorepref"
|
||||||
|
android:summary="On/Off"
|
||||||
|
android:title="Dual Core" />
|
||||||
|
</PreferenceCategory>
|
||||||
|
<PreferenceCategory
|
||||||
|
android:summary="Settings"
|
||||||
|
android:title="Video Settings" >
|
||||||
|
<ListPreference
|
||||||
|
android:entries="@array/gpuOptions"
|
||||||
|
android:entryValues="@array/gpuValues"
|
||||||
|
android:key="gpupref"
|
||||||
|
android:summary="Video backend to use"
|
||||||
|
android:title="Video Backend" />
|
||||||
|
</PreferenceCategory>
|
||||||
|
</PreferenceScreen>
|
||||||
22
Source/Android/res/values/prefvalues.xml
Normal file
22
Source/Android/res/values/prefvalues.xml
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string-array name="cpuOptions">
|
||||||
|
<item>Interpreter</item>
|
||||||
|
<item>ARM JIT Recompiler</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="cpuValues">
|
||||||
|
<item>0</item>
|
||||||
|
<item>3</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="gpuOptions">
|
||||||
|
<item>Software Renderer</item>
|
||||||
|
<item>OpenGL</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="gpuValues">
|
||||||
|
<item>Software Renderer</item>
|
||||||
|
<item>OGL</item>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
||||||
@ -3,7 +3,9 @@ package org.dolphinemu.dolphinemu;
|
|||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.ListActivity;
|
import android.app.ListActivity;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
@ -24,6 +26,8 @@ public class GameListView extends ListActivity {
|
|||||||
private static GameListView me;
|
private static GameListView me;
|
||||||
public static native String GetConfig(String Key, String Value, String Default);
|
public static native String GetConfig(String Key, String Value, String Default);
|
||||||
public static native void SetConfig(String Key, String Value, String Default);
|
public static native void SetConfig(String Key, String Value, String Default);
|
||||||
|
|
||||||
|
enum keyTypes {TYPE_STRING, TYPE_BOOL};
|
||||||
|
|
||||||
private void Fill()
|
private void Fill()
|
||||||
{
|
{
|
||||||
@ -88,19 +92,67 @@ public class GameListView extends ListActivity {
|
|||||||
public void onActivityResult(int requestCode, int resultCode, Intent data)
|
public void onActivityResult(int requestCode, int resultCode, Intent data)
|
||||||
{
|
{
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
|
|
||||||
if (resultCode == Activity.RESULT_OK)
|
switch (requestCode)
|
||||||
{
|
{
|
||||||
String FileName = data.getStringExtra("Select");
|
// Browse
|
||||||
Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
|
case 1:
|
||||||
String Directories = GetConfig("General", "GCMPathes", "0");
|
if (resultCode == Activity.RESULT_OK)
|
||||||
int intDirectories = Integer.parseInt(Directories);
|
{
|
||||||
Directories = Integer.toString(intDirectories + 1);
|
String FileName = data.getStringExtra("Select");
|
||||||
SetConfig("General", "GCMPathes", Directories);
|
Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
|
||||||
SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
|
String Directories = GetConfig("General", "GCMPathes", "0");
|
||||||
|
int intDirectories = Integer.parseInt(Directories);
|
||||||
Fill();
|
Directories = Integer.toString(intDirectories + 1);
|
||||||
}
|
SetConfig("General", "GCMPathes", Directories);
|
||||||
|
SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
|
||||||
|
|
||||||
|
Fill();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
// Settings
|
||||||
|
case 2:
|
||||||
|
|
||||||
|
String Keys[] = {
|
||||||
|
"cpupref",
|
||||||
|
"dualcorepref",
|
||||||
|
"gpupref",
|
||||||
|
};
|
||||||
|
String ConfigKeys[] = {
|
||||||
|
"Core-CPUCore",
|
||||||
|
"Core-CPUThread",
|
||||||
|
"Core-GFXBackend",
|
||||||
|
};
|
||||||
|
|
||||||
|
keyTypes KeysTypes[] = {
|
||||||
|
keyTypes.TYPE_STRING,
|
||||||
|
keyTypes.TYPE_BOOL,
|
||||||
|
keyTypes.TYPE_STRING,
|
||||||
|
};
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
|
||||||
|
|
||||||
|
// Set our preferences here
|
||||||
|
for (int a = 0; a < Keys.length; ++a)
|
||||||
|
{
|
||||||
|
String ConfigValues[] = ConfigKeys[a].split("-");
|
||||||
|
String Key = ConfigValues[0];
|
||||||
|
String Value = ConfigValues[1];
|
||||||
|
|
||||||
|
switch(KeysTypes[a])
|
||||||
|
{
|
||||||
|
case TYPE_STRING:
|
||||||
|
String strPref = prefs.getString(Keys[a], "");
|
||||||
|
SetConfig(Key, Value, strPref);
|
||||||
|
break;
|
||||||
|
case TYPE_BOOL:
|
||||||
|
boolean boolPref = prefs.getBoolean(Keys[a], true);
|
||||||
|
SetConfig(Key, Value, boolPref ? "True" : "False");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -138,8 +190,8 @@ public class GameListView extends ListActivity {
|
|||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
|
Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
|
||||||
Intent SettingIntent = new Intent(me, SettingBrowser.class);
|
Intent SettingIntent = new Intent(me, PrefsActivity.class);
|
||||||
startActivityForResult(SettingIntent, 1);
|
startActivityForResult(SettingIntent, 2);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -0,0 +1,40 @@
|
|||||||
|
package org.dolphinemu.dolphinemu;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceActivity;
|
||||||
|
import android.preference.PreferenceFragment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright 2013 Dolphin Emulator Project
|
||||||
|
* Licensed under GPLv2
|
||||||
|
* Refer to the license.txt file included.
|
||||||
|
*/
|
||||||
|
public class PrefsActivity extends PreferenceActivity {
|
||||||
|
|
||||||
|
public class PrefsFragment extends PreferenceFragment {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// Load the preferences from an XML resource
|
||||||
|
addPreferencesFromResource(R.layout.prefs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
getFragmentManager().beginTransaction().replace(android.R.id.content,
|
||||||
|
new PrefsFragment()).commit();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
Intent intent = new Intent();
|
||||||
|
setResult(Activity.RESULT_OK, intent);
|
||||||
|
this.finish();
|
||||||
|
super.onBackPressed();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,56 +0,0 @@
|
|||||||
package org.dolphinemu.dolphinemu;
|
|
||||||
|
|
||||||
import android.app.ListActivity;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.ListView;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copyright 2013 Dolphin Emulator Project
|
|
||||||
* Licensed under GPLv2
|
|
||||||
* Refer to the license.txt file included.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class SettingBrowser extends ListActivity {
|
|
||||||
private SettingMenuAdapter adapter;
|
|
||||||
private void Fill()
|
|
||||||
{
|
|
||||||
this.setTitle("Settings");
|
|
||||||
List<SettingMenuItem> dir = new ArrayList<SettingMenuItem>();
|
|
||||||
|
|
||||||
dir.add(new SettingMenuItem("Setting 1", "SubTitle 1", 0));
|
|
||||||
Collections.sort(dir);
|
|
||||||
|
|
||||||
adapter = new SettingMenuAdapter(this,R.layout.folderbrowser,dir);
|
|
||||||
this.setListAdapter(adapter);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onListItemClick(ListView l, View v, int position, long id) {
|
|
||||||
super.onListItemClick(l, v, position, id);
|
|
||||||
SettingMenuItem o = adapter.getItem(position);
|
|
||||||
switch (o.getID())
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
// Do nothing yet
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState)
|
|
||||||
{
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
Fill();
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
this.finish();
|
|
||||||
super.onBackPressed();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
package org.dolphinemu.dolphinemu;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copyright 2013 Dolphin Emulator Project
|
|
||||||
* Licensed under GPLv2
|
|
||||||
* Refer to the license.txt file included.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class SettingMenuAdapter extends ArrayAdapter<SettingMenuItem>{
|
|
||||||
|
|
||||||
private Context c;
|
|
||||||
private int id;
|
|
||||||
private List<SettingMenuItem>items;
|
|
||||||
|
|
||||||
public SettingMenuAdapter(Context context, int textViewResourceId,
|
|
||||||
List<SettingMenuItem> objects) {
|
|
||||||
super(context, textViewResourceId, objects);
|
|
||||||
c = context;
|
|
||||||
id = textViewResourceId;
|
|
||||||
items = objects;
|
|
||||||
}
|
|
||||||
public SettingMenuItem getItem(int i)
|
|
||||||
{
|
|
||||||
return items.get(i);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
|
||||||
View v = convertView;
|
|
||||||
if (v == null) {
|
|
||||||
LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
||||||
v = vi.inflate(id, null);
|
|
||||||
if (v == null)
|
|
||||||
return null; // This should never be hit, but have it to clear a warning
|
|
||||||
}
|
|
||||||
final SettingMenuItem o = items.get(position);
|
|
||||||
if (o != null) {
|
|
||||||
TextView t1 = (TextView) v.findViewById(R.id.TextView01);
|
|
||||||
TextView t2 = (TextView) v.findViewById(R.id.TextView02);
|
|
||||||
|
|
||||||
if (t1 != null)
|
|
||||||
t1.setText(o.getName());
|
|
||||||
if (t2 != null)
|
|
||||||
t2.setText(o.getSubtitle());
|
|
||||||
}
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
package org.dolphinemu.dolphinemu;
|
|
||||||
|
|
||||||
public class SettingMenuItem implements Comparable<SettingMenuItem>{
|
|
||||||
private String name;
|
|
||||||
private String subtitle;
|
|
||||||
private int m_id;
|
|
||||||
|
|
||||||
public SettingMenuItem(String n,String d, int id)
|
|
||||||
{
|
|
||||||
name = n;
|
|
||||||
subtitle = d;
|
|
||||||
m_id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getSubtitle()
|
|
||||||
{
|
|
||||||
return subtitle;
|
|
||||||
}
|
|
||||||
public int getID()
|
|
||||||
{
|
|
||||||
return m_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int compareTo(SettingMenuItem o)
|
|
||||||
{
|
|
||||||
if(this.name != null)
|
|
||||||
return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user