|
|
@ -1,12 +1,24 @@
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<project version="4">
|
|
|
|
<project version="4">
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<component name="AndroidLayouts">
|
|
|
|
|
|
|
|
<shared>
|
|
|
|
|
|
|
|
<config />
|
|
|
|
|
|
|
|
</shared>
|
|
|
|
|
|
|
|
</component>
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<component name="CMakeSettings">
|
|
|
|
<component name="CMakeSettings">
|
|
|
|
<configurations>
|
|
|
|
<configurations>
|
|
|
|
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
|
|
|
|
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
|
|
|
|
</configurations>
|
|
|
|
</configurations>
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<list default="true" id="4ec2040d-347e-4090-bf9e-278bd3bdbeda" name="Default" comment="" />
|
|
|
|
<list default="true" id="4ec2040d-347e-4090-bf9e-278bd3bdbeda" name="Default" comment="" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<list default="true" id="f3a05928-0cfc-47a3-a42a-af2529e2907f" name="Default" comment="" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@ -27,12 +39,131 @@
|
|
|
|
</system>
|
|
|
|
</system>
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="FileEditorManager">
|
|
|
|
<component name="FileEditorManager">
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<leaf>
|
|
|
|
<leaf>
|
|
|
|
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="true">
|
|
|
|
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="true">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="-323">
|
|
|
|
<state relative-caret-position="-323">
|
|
|
|
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
|
|
|
|
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
|
|
|
|
|
<file leaf-file-name="content_main.xml" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="19">
|
|
|
|
|
|
|
|
<caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="amend_linear_layout.xml" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="111">
|
|
|
|
|
|
|
|
<caret line="140" column="36" selection-start-line="140" selection-start-column="36" selection-end-line="140" selection-end-column="36" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="AmendActivity.java" pinned="false" current-in-tab="true">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="285">
|
|
|
|
|
|
|
|
<caret line="290" column="28" lean-forward="true" selection-start-line="290" selection-start-column="28" selection-end-line="290" selection-end-column="28" />
|
|
|
|
|
|
|
|
<folding>
|
|
|
|
|
|
|
|
<element signature="e#18198#18199#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#18227#18228#0" expanded="true" />
|
|
|
|
|
|
|
|
</folding>
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="BaseActivity.java" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/BaseActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="95">
|
|
|
|
|
|
|
|
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="comm_item.xml" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/comm_item.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="EditActivity.java" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="209">
|
|
|
|
|
|
|
|
<caret line="142" column="28" selection-start-line="142" selection-start-column="28" selection-end-line="142" selection-end-column="28" />
|
|
|
|
|
|
|
|
<folding>
|
|
|
|
|
|
|
|
<element signature="e#3858#5334#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5333#5334#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5375#5964#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5963#5964#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6006#6535#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6534#6535#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6593#7008#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7007#7008#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7048#7210#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7209#7210#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#21421#21422#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#21490#21491#0" expanded="true" />
|
|
|
|
|
|
|
|
</folding>
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="EditActivity.java" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="327">
|
|
|
|
|
|
|
|
<caret line="270" column="61" selection-start-line="263" selection-start-column="20" selection-end-line="270" selection-end-column="61" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="activity_index.xml" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_index.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="edit_linear_layout.xml" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="225">
|
|
|
|
|
|
|
|
<caret line="188" column="52" selection-start-line="188" selection-start-column="52" selection-end-line="188" selection-end-column="52" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</file>
|
|
|
|
|
|
|
|
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="180">
|
|
|
|
|
|
|
|
<caret line="57" column="15" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="15" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</state>
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</entry>
|
|
|
@ -2295,18 +2426,52 @@
|
|
|
|
</map>
|
|
|
|
</map>
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<component name="ProjectFrameBounds">
|
|
|
|
<component name="ProjectFrameBounds">
|
|
|
|
<option name="x" value="-190" />
|
|
|
|
<option name="x" value="-190" />
|
|
|
|
<option name="y" value="457" />
|
|
|
|
<option name="y" value="457" />
|
|
|
|
<option name="width" value="1750" />
|
|
|
|
<option name="width" value="1750" />
|
|
|
|
<option name="height" value="1005" />
|
|
|
|
<option name="height" value="1005" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<component name="IdeDocumentHistory">
|
|
|
|
|
|
|
|
<option name="CHANGED_PATHS">
|
|
|
|
|
|
|
|
<list>
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/res_password.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/values/mystring.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IssueSubActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/help_contact.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/SubissueActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IssueActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/help_issue.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/issue_sub.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml" />
|
|
|
|
|
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java" />
|
|
|
|
|
|
|
|
</list>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
</component>
|
|
|
|
|
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
|
|
|
|
|
<option name="x" value="355" />
|
|
|
|
|
|
|
|
<option name="y" value="150" />
|
|
|
|
|
|
|
|
<option name="width" value="1260" />
|
|
|
|
|
|
|
|
<option name="height" value="830" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="ProjectView">
|
|
|
|
<component name="ProjectView">
|
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
|
</navigator>
|
|
|
|
</navigator>
|
|
|
|
<panes>
|
|
|
|
<panes>
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<pane id="Scope" />
|
|
|
|
<pane id="Scope" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<pane id="ProjectPane">
|
|
|
|
<pane id="ProjectPane">
|
|
|
|
<subPane>
|
|
|
|
<subPane>
|
|
|
|
<expand>
|
|
|
|
<expand>
|
|
|
@ -2357,6 +2522,7 @@
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="cici" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="cici" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<item name="bean" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="bean" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<path>
|
|
|
@ -2367,6 +2533,8 @@
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="cici" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="cici" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<item name="memoire" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="memoire" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
</path>
|
|
|
|
</expand>
|
|
|
|
</expand>
|
|
|
@ -2377,8 +2545,48 @@
|
|
|
|
<subPane>
|
|
|
|
<subPane>
|
|
|
|
<expand>
|
|
|
|
<expand>
|
|
|
|
<path>
|
|
|
|
<path>
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<item name="v" type="1abcf292:AndroidViewProjectNode" />
|
|
|
|
<item name="v" type="1abcf292:AndroidViewProjectNode" />
|
|
|
|
<item name="v" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="v" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<item name="v" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
|
|
|
|
<item name="v" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="cici" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="voice" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
</path>
|
|
|
|
|
|
|
|
<path>
|
|
|
|
|
|
|
|
<item name="v" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
|
|
|
|
<item name="v" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="res" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
</path>
|
|
|
|
|
|
|
|
<path>
|
|
|
|
|
|
|
|
<item name="v" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
|
|
|
|
<item name="v" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="res" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
<item name="layout" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
|
|
</path>
|
|
|
|
|
|
|
|
</expand>
|
|
|
|
|
|
|
|
<select />
|
|
|
|
|
|
|
|
</subPane>
|
|
|
|
|
|
|
|
</pane>
|
|
|
|
|
|
|
|
<pane id="Scope" />
|
|
|
|
|
|
|
|
<pane id="AndroidView">
|
|
|
|
|
|
|
|
<subPane>
|
|
|
|
|
|
|
|
<expand>
|
|
|
|
|
|
|
|
<path>
|
|
|
|
|
|
|
|
<item name="v" type="1abcf292:AndroidViewProjectNode" />
|
|
|
|
|
|
|
|
<item name="app" type="feadf853:AndroidModuleNode" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</path>
|
|
|
|
</path>
|
|
|
|
</expand>
|
|
|
|
</expand>
|
|
|
|
<select />
|
|
|
|
<select />
|
|
|
@ -2389,6 +2597,10 @@
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
<property name="android.sdk.path" value="D:/SDK" />
|
|
|
|
<property name="android.sdk.path" value="D:/SDK" />
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<property name="device.picker.selection" value="127.0.0.1:62001" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
|
|
|
|
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
@ -2509,17 +2721,26 @@
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="TaskManager">
|
|
|
|
<component name="TaskManager">
|
|
|
|
<task active="true" id="Default" summary="Default task">
|
|
|
|
<task active="true" id="Default" summary="Default task">
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<changelist id="4ec2040d-347e-4090-bf9e-278bd3bdbeda" name="Default" comment="" />
|
|
|
|
<changelist id="4ec2040d-347e-4090-bf9e-278bd3bdbeda" name="Default" comment="" />
|
|
|
|
<created>1547513489236</created>
|
|
|
|
<created>1547513489236</created>
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
<updated>1547513489236</updated>
|
|
|
|
<updated>1547513489236</updated>
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<changelist id="f3a05928-0cfc-47a3-a42a-af2529e2907f" name="Default" comment="" />
|
|
|
|
|
|
|
|
<created>1547616557041</created>
|
|
|
|
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
|
|
|
|
<updated>1547616557041</updated>
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</task>
|
|
|
|
</task>
|
|
|
|
<servers />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<frame x="-152" y="366" width="1400" height="804" extended-state="0" />
|
|
|
|
<frame x="-152" y="366" width="1400" height="804" extended-state="0" />
|
|
|
|
<layout>
|
|
|
|
<layout>
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
|
<window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
|
|
|
|
<window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
|
|
|
|
<window_info anchor="right" id="Palette	" />
|
|
|
|
<window_info anchor="right" id="Palette	" />
|
|
|
@ -2543,22 +2764,384 @@
|
|
|
|
<window_info id="Favorites" side_tool="true" />
|
|
|
|
<window_info id="Favorites" side_tool="true" />
|
|
|
|
<window_info anchor="right" id="Device File Explorer" side_tool="true" />
|
|
|
|
<window_info anchor="right" id="Device File Explorer" side_tool="true" />
|
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Android Profiler" order="7" />
|
|
|
|
|
|
|
|
<window_info id="Build Variants" order="2" side_tool="true" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="DB Execution Console" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Logcat" order="7" />
|
|
|
|
|
|
|
|
<window_info id="Capture Tool" order="2" />
|
|
|
|
|
|
|
|
<window_info id="Designer" order="2" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Build" order="7" visible="true" weight="0.32763532" />
|
|
|
|
|
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
|
|
|
|
|
<window_info id="DB Browser" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
|
|
|
|
|
|
<window_info id="Image Layers" order="2" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Preview" order="4" weight="0.32841823" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Run" order="2" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
|
|
|
|
|
|
<window_info id="Captures" order="2" weight="0.25" />
|
|
|
|
|
|
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24932976" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Gradle" order="3" />
|
|
|
|
|
|
|
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
|
|
|
|
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
|
|
|
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.328877" />
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</layout>
|
|
|
|
</layout>
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="VcsContentAnnotationSettings">
|
|
|
|
<component name="VcsContentAnnotationSettings">
|
|
|
|
<option name="myLimit" value="2678400000" />
|
|
|
|
<option name="myLimit" value="2678400000" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="editorHistoryManager">
|
|
|
|
<component name="editorHistoryManager">
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="-323">
|
|
|
|
<state relative-caret-position="-323">
|
|
|
|
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
|
|
|
|
<caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/help_issue.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1387">
|
|
|
|
|
|
|
|
<caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/HelpActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="874">
|
|
|
|
|
|
|
|
<caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IssueActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="380">
|
|
|
|
|
|
|
|
<caret line="20" selection-start-line="20" selection-end-line="20" selection-end-column="30" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1349">
|
|
|
|
|
|
|
|
<caret line="71" column="76" lean-forward="true" selection-start-line="71" selection-start-column="76" selection-end-line="71" selection-end-column="76" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1653">
|
|
|
|
|
|
|
|
<caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/help_issue.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1387">
|
|
|
|
|
|
|
|
<caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/issue_sub.xml" />
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/SubissueActivity.java" />
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/HelpActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="760">
|
|
|
|
|
|
|
|
<caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IssueActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="266">
|
|
|
|
|
|
|
|
<caret line="20" selection-start-line="20" selection-end-line="20" selection-end-column="67" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1349">
|
|
|
|
|
|
|
|
<caret line="71" column="84" selection-start-line="71" selection-start-column="84" selection-end-line="71" selection-end-column="84" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1653">
|
|
|
|
|
|
|
|
<caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_changedata.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="399">
|
|
|
|
|
|
|
|
<caret line="218" column="8" selection-start-line="218" selection-start-column="8" selection-end-line="218" selection-end-column="38" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/mystring.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="114">
|
|
|
|
|
|
|
|
<caret line="6" column="48" selection-start-line="6" selection-start-column="48" selection-end-line="6" selection-end-column="48" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IndexActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="-65">
|
|
|
|
|
|
|
|
<caret line="100" column="72" selection-start-line="100" selection-start-column="72" selection-end-line="100" selection-end-column="72" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/res_password.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="366">
|
|
|
|
|
|
|
|
<caret line="75" column="8" selection-start-line="75" selection-start-column="8" selection-end-line="75" selection-end-column="38" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/ResPwdActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="437">
|
|
|
|
|
|
|
|
<caret line="44" column="8" selection-start-line="44" selection-start-column="8" selection-end-line="45" selection-end-column="30" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/help_function.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="271">
|
|
|
|
|
|
|
|
<caret line="54" column="8" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/my_help.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="335">
|
|
|
|
|
|
|
|
<caret line="111" column="16" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="43" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/help_contact.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="316">
|
|
|
|
|
|
|
|
<caret line="184" column="43" selection-start-line="184" selection-start-column="43" selection-end-line="184" selection-end-column="43" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/help_issue.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1387">
|
|
|
|
|
|
|
|
<caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/issue_sub.xml" />
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/SubissueActivity.java" />
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/HelpActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="760">
|
|
|
|
|
|
|
|
<caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/Index/IssueActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="551">
|
|
|
|
|
|
|
|
<caret line="35" selection-start-line="35" selection-end-line="35" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="1349">
|
|
|
|
|
|
|
|
<caret line="72" column="76" selection-start-line="72" selection-start-column="76" selection-end-line="72" selection-end-column="76" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-manifest">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_comment.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_record.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/comm_item.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="19">
|
|
|
|
|
|
|
|
<caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/voice/EditActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="209">
|
|
|
|
|
|
|
|
<caret line="142" column="28" selection-start-line="142" selection-start-column="28" selection-end-line="142" selection-end-column="28" />
|
|
|
|
|
|
|
|
<folding>
|
|
|
|
|
|
|
|
<element signature="e#3858#5334#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5333#5334#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5375#5964#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#5963#5964#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6006#6535#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6534#6535#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#6593#7008#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7007#7008#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7048#7210#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#7209#7210#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#21421#21422#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#21490#21491#0" expanded="true" />
|
|
|
|
|
|
|
|
</folding>
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_index.xml">
|
|
|
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/edit_linear_layout.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="225">
|
|
|
|
|
|
|
|
<caret line="188" column="52" selection-start-line="188" selection-start-column="52" selection-end-line="188" selection-end-column="52" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/MainActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="180">
|
|
|
|
|
|
|
|
<caret line="57" column="15" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="15" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/BaseActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="95">
|
|
|
|
|
|
|
|
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/EditActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="327">
|
|
|
|
|
|
|
|
<caret line="270" column="61" selection-start-line="263" selection-start-column="20" selection-end-line="270" selection-end-column="61" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/amend_linear_layout.xml">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="111">
|
|
|
|
|
|
|
|
<caret line="140" column="36" selection-start-line="140" selection-start-column="36" selection-end-line="140" selection-end-column="36" />
|
|
|
|
|
|
|
|
</state>
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
|
|
|
|
|
<state />
|
|
|
|
|
|
|
|
</provider>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/cici/memoire/AmendActivity.java">
|
|
|
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
|
|
|
<state relative-caret-position="285">
|
|
|
|
|
|
|
|
<caret line="290" column="28" lean-forward="true" selection-start-line="290" selection-start-column="28" selection-end-line="290" selection-end-column="28" />
|
|
|
|
|
|
|
|
<folding>
|
|
|
|
|
|
|
|
<element signature="e#18198#18199#0" expanded="true" />
|
|
|
|
|
|
|
|
<element signature="e#18227#18228#0" expanded="true" />
|
|
|
|
|
|
|
|
</folding>
|
|
|
|
|
|
|
|
>>>>>>> 118c6c8c77cd088e0148c8ac5a06e7989604f0d2
|
|
|
|
</state>
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</entry>
|
|
|
|