diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-11-09 16:12:27 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-11-10 14:08:02 +0100 |
| commit | 9788fa4b5752b0bd5cf740995d2b05161b748096 (patch) | |
| tree | cb2fa6b58f147ef815be8c552ae8d60aacb7ab9b | |
| parent | 739175de13b3f4d4b628803fdf36bcf3b4b01bfa (diff) | |
janitorial: adapt to newer version of android studio
Change-Id: I543f766ae22d9b3feb160136f73e6aca6bfc52b4
| -rw-r--r-- | android/sdremote/.gitignore | 2 | ||||
| -rw-r--r-- | android/sdremote/.idea/codeStyles/Project.xml | 116 | ||||
| -rw-r--r-- | android/sdremote/.idea/gradle.xml | 12 | ||||
| -rw-r--r-- | android/sdremote/sdremote.iml | 2 |
4 files changed, 124 insertions, 8 deletions
diff --git a/android/sdremote/.gitignore b/android/sdremote/.gitignore index 18abeca..9477344 100644 --- a/android/sdremote/.gitignore +++ b/android/sdremote/.gitignore @@ -1,6 +1,8 @@ /.gradle/ /**/build/ /local.properties +/.idea/caches +/captures/ ## https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # user specifc /.idea/workspace.xml diff --git a/android/sdremote/.idea/codeStyles/Project.xml b/android/sdremote/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/android/sdremote/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ +<component name="ProjectCodeStyleConfiguration"> + <code_scheme name="Project" version="173"> + <codeStyleSettings language="XML"> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + <arrangement> + <rules> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:android</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:id</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:name</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>name</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>style</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>ANDROID_ATTRIBUTE_ORDER</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>.*</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + </rules> + </arrangement> + </codeStyleSettings> + </code_scheme> +</component>
\ No newline at end of file diff --git a/android/sdremote/.idea/gradle.xml b/android/sdremote/.idea/gradle.xml index 70c2cf3..1e31df1 100644 --- a/android/sdremote/.idea/gradle.xml +++ b/android/sdremote/.idea/gradle.xml @@ -3,6 +3,9 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> + <compositeConfiguration> + <compositeBuild compositeDefinitionSource="SCRIPT" /> + </compositeConfiguration> <option name="distributionType" value="LOCAL" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" /> @@ -13,13 +16,8 @@ <option value="$PROJECT_DIR$/wear" /> </set> </option> - <option name="myModules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/mobile" /> - <option value="$PROJECT_DIR$/wear" /> - </set> - </option> + <option name="resolveModulePerSourceSet" value="false" /> + <option name="testRunner" value="PLATFORM" /> </GradleProjectSettings> </option> </component> diff --git a/android/sdremote/sdremote.iml b/android/sdremote/sdremote.iml index 9ba5f7c..705da87 100644 --- a/android/sdremote/sdremote.iml +++ b/android/sdremote/sdremote.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="sdremote" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id="sdremote" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> |