diff options
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/.idea/workspace.xml | 84 | ||||
| -rw-r--r-- | Source/Android/project.properties | 1 |
2 files changed, 48 insertions, 37 deletions
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml index 7fde93f443..dd3a4d6818 100644 --- a/Source/Android/.idea/workspace.xml +++ b/Source/Android/.idea/workspace.xml @@ -100,19 +100,19 @@ </component> <component name="FileEditorManager"> <leaf> - <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"> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="3045"> + <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="GameListActivity.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java"> + <file leaf-file-name="project.properties" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/project.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="173" column="64" selection-start="5829" selection-end="5829" vertical-scroll-proportion="-2.3393178" vertical-offset="3478" max-vertical-offset="4035"> + <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570"> <folding /> </state> </provider> @@ -141,7 +141,6 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/res/layout/newmain.xml" /> <option value="$PROJECT_DIR$/res/layout/activity_main.xml" /> <option value="$PROJECT_DIR$/res/layout/gamelist_listview.xml" /> <option value="$PROJECT_DIR$/res/layout/gamelist_layout.xml" /> @@ -157,6 +156,7 @@ <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" /> <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" /> <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" /> + <option value="$PROJECT_DIR$/project.properties" /> </list> </option> </component> @@ -256,6 +256,24 @@ <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="libs"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> </PATH> </subPane> </pane> @@ -478,11 +496,11 @@ </component> <component name="ToolWindowManager"> <frame x="24" y="0" width="1342" height="744" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <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="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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" 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.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" /> @@ -593,26 +611,6 @@ <breakpoint-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/res/layout/gamelist_activity.xml"> - <provider editor-type-id="android-designer"> - <state /> - </provider> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="545"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/res/layout/gamelist_listview.xml"> - <provider editor-type-id="android-designer"> - <state /> - </provider> - <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="29" selection-start="98" selection-end="98" vertical-scroll-proportion="0.040871933" vertical-offset="0" max-vertical-offset="367"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java"> <provider selected="true" editor-type-id="text-editor"> <state line="43" column="40" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.6505102" vertical-offset="285" max-vertical-offset="780"> @@ -648,13 +646,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="2293" max-vertical-offset="2850"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml"> <provider editor-type-id="android-designer"> <state /> @@ -715,6 +706,27 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.026929982" vertical-offset="45" max-vertical-offset="2850"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/project.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570"> + <folding /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> diff --git a/Source/Android/project.properties b/Source/Android/project.properties index 91be165ce3..a3ee5ab64f 100644 --- a/Source/Android/project.properties +++ b/Source/Android/project.properties @@ -12,4 +12,3 @@ # Project target. target=android-17 -android.library.reference.1=../../Externals/android-menudrawer/library |