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

Commit 6de26075 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

squash apps branch

parent 3e6e9bae

.idea/caches/build_file_checksums.ser

0 → 100644
+539 B

File added.

No diff preview for this file type.

View file

.idea/codeStyles/Project.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

  <code_scheme name="Project" version="173">

    <Objective-C-extensions>

      <file>

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />

      </file>

      <class>

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />

      </class>

      <extensions>

        <pair source="cpp" header="h" fileNamingConvention="NONE" />

        <pair source="c" header="h" fileNamingConvention="NONE" />

      </extensions>

    </Objective-C-extensions>

  </code_scheme>

</component>
 
 No newline at end of file

.idea/dictionaries/Vincent.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<component name="ProjectDictionaryState">

  <dictionary name="Vincent">

    <words>

      <w>eelo</w>

      <w>etag</w>

    </words>

  </dictionary>

</component>
 
 No newline at end of file

.idea/misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
      </value>

    </option>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/build/classes" />

  </component>

  <component name="ProjectType">

app/src/main/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- needed for PersistedJob -->

    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>



    <application

        android:allowBackup="true"
@@ -25,12 +26,12 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <activity android:name=".ui.SettingsActivity" android:label="Settings">

        <!--<activity android:name=".ui.SettingsActivity" android:label="Settings">

            <intent-filter>

                <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>

                <category android:name="android.intent.category.PREFERENCE"/>

            </intent-filter>

        </activity>

        </activity>-->

        <service android:name=".jobs.ScannerJob"

            android:permission="android.permission.BIND_JOB_SERVICE" />

        <service android:name=".services.ObserverService"/>