Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca317764 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch 'stability-oreo' into 'v1-oreo' 

Port stability improvement to Oreo

See merge request e/apps/eDrive!65
parents 7695ed90 6d1653df

.gitignore

+0 −3
Original line number Diff line number Diff line 
*.iml

.gradle

/local.properties

/.idea/workspace.xml

/.idea/libraries

/.idea/codeStyles/

.idea

.DS_Store

/build

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ test: 
build:

  stage: build

  script:

  - ./gradlew build -x test

  - ./gradlew assemble

  artifacts:

    paths:

    - app/build/outputs/apk/

.idea/caches/build_file_checksums.ser

deleted100644 → 0
−602 B

File deleted.

View file

.idea/caches/gradle_models.ser

deleted100644 → 0
−111 KiB

File deleted.

View file

.idea/codeStyles/Project.xml

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
<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