Version 3.2 release

Spelling mistake is corrected

.idea/compiler.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
@@ -20,4 +20,3 @@
     </annotationProcessing>
   </component>
 </project>
-

.idea/copyright/profiles_settings.xml

@@ -1,5 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="">
+  <settings default="" />
-    <module2copyright />
-  </settings>
 </component>

.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

.idea/gradle.xml

@@ -3,8 +3,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,4 +17,3 @@
     </option>
   </component>
 </project>
-

.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
@@ -16,116 +13,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 22 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="RunManager">
+  <component name="ProjectType">
-    <configuration default="true" type="Remote" factoryName="Remote">
+    <option name="id" value="Android" />
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <list size="0" />
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
   </component>
 </project>
-

.idea/modules.xml

@@ -7,4 +7,3 @@
     </modules>
   </component>
 </project>
-

.idea/scopes/scope_settings.xml

@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
-

README.md

@@ -0,0 +1,27 @@
+# [Traccar Client for Android](https://www.traccar.org/client)
+
+## Contacts
+
+Author - Anton Tananaev ([anton.tananaev@gmail.com](mailto:anton.tananaev@gmail.com))
+
+Website - [https://www.traccar.org/client](https://www.traccar.org/client)
+
+## Overview
+
+Traccar Client is an Android GPS tracking application. It can work with Traccar open source server software.
+
+## License
+
+    Apache License, Version 2.0
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

README.txt

@@ -1,27 +0,0 @@
-    traccar-client
-
-Web page - http://www.traccar.org
-
-Author - Anton Tananaev (anton.tananaev@gmail.com)
-
-SUMMARY:
-
-Traccar Client is Android GPS tracking application. In can work with
-Traccar open source server software.
-
-LICENSE:
-
-Apache License, Version 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
+        classpath 'com.android.tools.build:gradle:1.2.2'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 26 19:02:25 NZDT 2014
+#Fri Feb 06 09:56:43 NZDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

icon.svg

@@ -9,17 +9,14 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
+   width="64px"
-   height="512"
+   height="64px"
-   id="svg4101"
+   id="svg2985"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon.svg"
+   sodipodi:docname="traccar.svg">
-   inkscape:export-filename="/home/user/Documents/traccar-client/res/drawable-xhdpi/ic_launcher.png"
-   inkscape:export-xdpi="16.875"
-   inkscape:export-ydpi="16.875">
   <defs
-     id="defs4103" />
+     id="defs2987" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -27,109 +24,96 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
+     inkscape:zoom="4"
-     inkscape:cx="402.73478"
+     inkscape:cx="-11.637539"
-     inkscape:cy="279.68584"
+     inkscape:cy="7.0291785"
-     inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
-     fit-margin-top="0"
+     inkscape:document-units="px"
-     fit-margin-left="0"
+     inkscape:grid-bbox="true"
-     fit-margin-right="0"
+     inkscape:snap-bbox="true"
-     fit-margin-bottom="0"
+     inkscape:bbox-paths="true"
-     inkscape:window-width="1680"
+     inkscape:bbox-nodes="true"
-     inkscape:window-height="1026"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1176"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     width="512px" />
+     inkscape:snap-global="false" />
   <metadata
-     id="metadata4106">
+     id="metadata2990">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-317.72197,34.03834)">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
     <g
-       id="g3057">
+       id="g2995">
-      <rect
-         ry="99.363052"
-         rx="99.36306"
-         y="-11.541533"
-         x="340.21878"
-         height="467.00638"
-         width="467.00635"
-         id="rect3055"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.99363058999999998" />
-      <g
-         transform="matrix(3.9153612,2.053283,-2.053283,3.9153612,92.187853,-3064.4694)"
-         id="g4068">
-        <g
-           id="g4046"
-           transform="matrix(0.83109018,-0.84335752,0.84335752,0.83109018,-425.72131,478.52845)">
       <path
-             inkscape:connector-curvature="0"
+         transform="matrix(11.849785,-6.8414759,4.1048857,7.1098702,-141.6761,-453.06363)"
-             id="path3194"
+         d="m -4.633625,61.745384 a 2.0991254,3.4985423 0 1 1 -4.1982508,0 2.0991254,3.4985423 0 1 1 4.1982508,0 z"
-             d="m 443.65385,563.57293 c -1.05193,-0.0129 -2.10701,0.0598 -3.12744,0.18048 l 0.06,2.75094 c 0.99036,-0.12733 2.00989,-0.19417 3.0337,-0.18162 12.83055,0.15709 23.11001,11.57671 22.93914,25.53274 -0.002,0.17643 -0.001,0.35569 -0.007,0.53121 l 2.50057,-0.0319 c 0.004,-0.15699 0.004,-0.31113 0.006,-0.46872 0.18944,-15.473 -11.18011,-28.13898 -25.40528,-28.31315 z"
+         sodipodi:ry="3.4985423"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+         sodipodi:rx="2.0991254"
+         sodipodi:cy="61.745384"
+         sodipodi:cx="-6.7327504"
+         id="path3038"
+         style="fill:#ffffff"
+         sodipodi:type="arc" />
       <path
-             sodipodi:nodetypes="cccscccccc"
+         transform="matrix(0.98000485,-0.56580602,0.76260819,1.3208761,-13.500496,-10.292296)"
-             inkscape:connector-curvature="0"
+         d="m 16.134891,38.929852 a 1.9927555,1.478496 0 1 1 -3.985511,0 1.9927555,1.478496 0 1 1 3.985511,0 z"
-             id="path3194-4"
+         sodipodi:ry="1.478496"
-             d="m 442.89836,570.53348 c -0.79783,-0.01 -1.59802,0.0454 -2.37195,0.13688 l 0.0455,2.52833 c 0.75111,-0.0966 1.52436,-0.14725 2.30084,-0.13774 9.73108,0.11913 16.95911,8.33817 16.82952,18.92284 -0.002,0.1338 -10e-4,0.26976 -0.005,0.40289 l 2.46472,-0.0242 c 0.003,-0.11907 0.003,-0.23598 0.004,-0.35547 0.14368,-11.73519 -8.47933,-21.34145 -19.26811,-21.47354 z"
+         sodipodi:rx="1.9927555"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
+         sodipodi:cy="38.929852"
+         sodipodi:cx="14.142136"
+         id="path2993"
+         style="fill:#000000"
+         sodipodi:type="arc" />
       <path
-             sodipodi:nodetypes="cccccccccc"
+         id="path3004"
-             inkscape:connector-curvature="0"
+         d="m 36.965211,24.251054 -2.816072,3.57877 c 0.657208,0.517134 1.313001,1.146671 1.756681,1.915146 0.443679,0.768474 0.660975,1.651177 0.780224,2.478901 l 4.507342,-0.649405 C 41.001257,30.166972 40.565802,28.79619 39.81164,27.489944 39.057477,26.183697 38.088074,25.121191 36.965211,24.251054 z"
-             id="path3194-0"
+         style="fill:#000000"
-             d="m 442.20847,576.88946 c -0.56577,-0.007 -1.13323,0.0322 -1.68206,0.0971 l 0.0323,2.42658 c 0.53265,-0.0685 1.081,-0.10442 1.63165,-0.0977 6.90079,0.46331 10.91426,5.09 11.13804,12.78552 -10e-4,0.0949 -7.7e-4,0.19129 -0.003,0.28572 l 2.54446,-0.0171 c 0.002,-0.0845 0.002,-0.16735 0.003,-0.25208 0.10189,-8.32201 -6.01312,-15.13429 -13.66399,-15.22797 z"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        </g>
-        <g
-           id="g4061"
-           transform="translate(4.3272904,0)">
-          <path
-             id="path4401"
-             d="m 428.82958,632.50381 c 1.51739,8.39514 3.18843,16.70366 3.25039,25.86381 13.43389,-7.07008 16.24573,-8.60045 29.67957,-15.67062 -4.84405,-3.37683 -9.59166,-7.39353 -13.56307,-11.22903 -6.14118,1.98174 -12.37667,2.63171 -19.36689,1.03584 z m 3.03559,3.5588 2.90054,0.34654 c 1.65734,7.68989 1.24429,15.11973 -0.19508,18.63703 -0.5999,-6.11993 -0.9108,-10.44519 -2.70546,-18.98357 z"
-             style="fill:#000000;fill-opacity:1;stroke:none"
          inkscape:connector-curvature="0" />
       <path
-             id="path3423-9-5"
+         id="path3014"
-             d="m 398.11826,602.8218 c 5.46403,15.3042 20.05405,26.26585 37.2409,26.32057 17.18753,0.0547 31.81943,-10.80285 37.38029,-26.07291 l -74.62119,-0.24766 z m 6.11343,4.37701 6.55964,0.18844 c 4.52018,8.23085 9.05564,11.77782 15.40988,16.82483 -9.13544,-2.75636 -16.94711,-7.80772 -21.96952,-17.01327 z"
+         d="m 42.404828,17.041928 -2.816072,3.578769 c 1.591875,1.223919 3.062315,2.767181 4.128704,4.614221 1.066388,1.847038 1.667671,3.892108 1.931679,5.882671 l 4.507341,-0.649405 c -0.336471,-2.571017 -1.155959,-5.102841 -2.5332,-7.488294 -1.377241,-2.385452 -3.160122,-4.36106 -5.218452,-5.937962 z"
-             style="fill:#000000;fill-opacity:1;stroke:none"
+         style="fill:#000000"
          inkscape:connector-curvature="0" />
-          <g
-             transform="translate(2.1996971,2)"
-             id="g4055">
-            <rect
-               style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               id="rect4051"
-               width="3.2829957"
-               height="8.0812206"
-               x="431.58765"
-               y="594.76306" />
       <path
-               sodipodi:type="arc"
+         sodipodi:end="4.712389"
-               style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:start="1.5707963"
-               id="path4053"
+         transform="matrix(3.9507144,-2.2809459,1.4097023,2.4416757,-59.699972,-127.24372)"
-               sodipodi:cx="433.22916"
+         d="m -2.0227272,68.375862 a 1.9772727,3.1992946 0 1 1 0,-6.398589 l -1e-7,3.199294 z"
-               sodipodi:cy="594.00549"
+         sodipodi:ry="3.1992946"
-               sodipodi:rx="3.4092648"
+         sodipodi:rx="1.9772727"
-               sodipodi:ry="3.7880721"
+         sodipodi:cy="65.176567"
-               d="m 436.63842,594.00549 c 0,2.0921 -1.52638,3.78808 -3.40926,3.78808 -1.88289,0 -3.40927,-1.69598 -3.40927,-3.78808 0,-2.09209 1.52638,-3.78807 3.40927,-3.78807 1.88288,0 3.40926,1.69598 3.40926,3.78807 z" />
+         sodipodi:cx="-2.0227273"
-          </g>
+         id="path3036"
-        </g>
+         style="fill:#000000"
-      </g>
+         sodipodi:type="arc" />
+      <path
+         id="path3038-8"
+         d="M 17.638883,7.1258129 C 3.9012503,15.057239 -0.80560983,32.62348 7.1258152,46.361111 15.057241,60.098742 32.623482,64.805603 46.361115,56.874177 60.098748,48.942752 64.805608,31.37651 56.874183,17.63888 48.942758,3.9012493 31.376516,-0.80561226 17.638883,7.1258129 z m 1.689543,2.9263741 C 31.449867,3.0538711 46.949491,7.2069826 53.947808,19.328422 60.946126,31.449863 56.793012,46.949488 44.671573,53.947803 32.550132,60.94612 17.050507,56.793009 10.05219,44.671568 3.0538724,32.550127 7.2069849,17.050503 19.328426,10.052187 z"
+         style="fill:#000000"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>

traccar-client-android.iml

@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module 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="traccar-client-android" 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">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
-

traccar-client/build.gradle

@@ -1,30 +1,36 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 22
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 3
-        targetSdkVersion 19
+        targetSdkVersion 22
-        versionCode 18
+        versionCode 22
-        versionName "2.11"
+        versionName "3.2"
     }
 
     signingConfigs {
         release {
             storeFile file('/home/user/Documents/android.keystore')
             keyAlias "tananaev"
+            storePassword ""
+            keyPassword ""
         }
     }
 
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             signingConfig signingConfigs.release
         }
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

traccar-client/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true" android:theme="@style/TraccarTheme">
         
         <activity android:name="TraccarActivity">
             <intent-filter>

traccar-client/src/main/java/org/traccar/client/PositionProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import android.location.LocationManager;
 import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Handler;
+import android.widget.Toast;
 
 public class PositionProvider {
 
@@ -39,6 +40,7 @@ public class PositionProvider {
     private final LocationManager locationManager;
     private final long period;
     private final PositionListener listener;
+    private final Context context;
 
     private boolean useFine;
     private boolean useCoarse;
@@ -48,6 +50,7 @@ public class PositionProvider {
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
         this.period = period;
         this.listener = listener;
+        this.context = context;
 
         // Determine providers
         if (type.equals(PROVIDER_MIXED)) {
@@ -62,10 +65,18 @@ public class PositionProvider {
 
     public void startUpdates() {
         if (useFine) {
+            try {
                 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, fineLocationListener);
+            } catch (Exception e) {
+                StatusActivity.addMessage(context.getString(R.string.status_provider_missing));
+            }
         }
         if (useCoarse) {
+            try {
                 locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, period, 0, coarseLocationListener);
+            } catch (Exception e) {
+                StatusActivity.addMessage(context.getString(R.string.status_provider_missing));
+            }
         }
         handler.postDelayed(updateTask, period);
     }
@@ -78,10 +89,19 @@ public class PositionProvider {
 
     private final Runnable updateTask = new Runnable() {
 
+        private long lastTime;
+
         private boolean tryProvider(String provider) {
             Location location = locationManager.getLastKnownLocation(provider);
 
-            if (location != null && new Date().getTime() - location.getTime() <= period + PERIOD_DELTA) {
+            /*if (location != null) {
+                Toast.makeText(context, "phone: " + new Date() + "\ngps: " + new Date(location.getTime()), Toast.LENGTH_LONG).show();
+            } else {
+                Toast.makeText(context, "no location", Toast.LENGTH_LONG).show();
+            }*/
+            
+            if (location != null && location.getTime() != lastTime) {
+                lastTime = location.getTime();
                 listener.onPositionUpdate(location);
                 return true;
             } else {

traccar-client/src/main/java/org/traccar/client/StatusActivity.java

@@ -19,7 +19,6 @@ import java.text.DateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 
 import android.app.ListActivity;
@@ -32,7 +31,9 @@ import android.widget.ArrayAdapter;
 
 public class StatusActivity extends ListActivity {
 
-    private static final List<String> messages = new LinkedList<String>();
+    private static final int LIMIT = 20;
+
+    private static final LinkedList<String> messages = new LinkedList<String>();
     private static final Set<ArrayAdapter<String>> adapters = new HashSet<ArrayAdapter<String>>();
 
     private static void notifyAdapters() {
@@ -46,6 +47,9 @@ public class StatusActivity extends ListActivity {
         DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT);
         message = format.format(new Date()) + " - " + message;
         messages.add(message);
+        while (messages.size() > LIMIT) {
+            messages.removeFirst();
+        }
         notifyAdapters();
     }
 

traccar-client/src/main/java/org/traccar/client/TraccarActivity.java

@@ -50,6 +50,9 @@ public class TraccarActivity extends PreferenceActivity {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+        if (sharedPreferences.getBoolean(KEY_STATUS, false))
+            startService(new Intent(this, TraccarService.class));
     }
 
     @Override
@@ -122,8 +125,6 @@ public class TraccarActivity extends PreferenceActivity {
             sharedPreferences.edit().putString(KEY_ID, id).commit();
         }
         findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, id));
-
-        sharedPreferences.edit().putBoolean(KEY_STATUS, isServiceRunning()).commit();
     }
 
 }

traccar-client/src/main/java/org/traccar/client/TraccarService.java

@@ -58,10 +58,6 @@ public class TraccarService extends Service {
         PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
         wakeLock.acquire();
-    }
-    
-    public void onStart(Intent intent, int startId) {
-        StatusActivity.addMessage(getString(R.string.status_service_start));
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
@@ -85,13 +81,6 @@ public class TraccarService extends Service {
         sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
     }
 
-    @TargetApi(Build.VERSION_CODES.ECLAIR)
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-    	onStart(intent, startId);
-        return START_STICKY;
-    }
-
     @Override
     public IBinder onBind(Intent intent) {
         return null;

traccar-client/src/main/res/layout/about.xml

@@ -8,8 +8,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/about_margin"
+        android:layout_marginStart="@dimen/about_margin"
         android:layout_marginTop="@dimen/about_margin"
         android:src="@drawable/ic_launcher"
         android:contentDescription="@string/app_logo" />
@@ -19,6 +21,7 @@
         android:layout_height="fill_parent"
         android:layout_margin="@dimen/about_margin"
         android:layout_toRightOf="@+id/logo"
+        android:layout_toEndOf="@+id/logo"
         android:orientation="vertical" >
 
         <TextView

traccar-client/src/main/res/values-cs/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Služba vytvořena</string>
-    <string name="status_service_start">Služba spuštěna</string>
     <string name="status_service_destroy">Služba zastavena</string>
     <string name="status_connection_success">Spojení se zdařilo</string>
     <string name="status_connection_fail">Spojení selhalo</string>

traccar-client/src/main/res/values-da/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Service oprettet</string>
-    <string name="status_service_start">Service startet</string>
     <string name="status_service_destroy">Service ødelagt</string>
     <string name="status_connection_success">Forbindelse lykkedes</string>
     <string name="status_connection_fail">Forbindelse fejlet</string>

traccar-client/src/main/res/values-de/strings.xml

@@ -16,8 +16,8 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Dienst inaktiv</string>
     <string name="settings_status_on_summary">Dienst aktiv</string>
-    <string name="settings_extended_title">Erweiterte Format</string>
+    <string name="settings_extended_title">Erweitertes Format</string>
-    <string name="settings_extended_summary">Verwenden Sie neue Nachrichtenformat</string>
+    <string name="settings_extended_summary">Verwenden Sie das neue Nachrichtenformat</string>
     <string name="settings_provider_title">Datenherkunft</string>
     <string name="settings_provider_summary">Quelle der Positionen</string>
     <string-array name="settings_provider_names">
@@ -35,7 +35,6 @@
     <string name="about_web">Für weitere Informationen besuche uns auf \nwww.traccar.org/client</string>
 
     <string name="status_service_create">Dienst installiert</string>
-    <string name="status_service_start">Dienst gestartet</string>
     <string name="status_service_destroy">Dienst zerstört</string>
     <string name="status_connection_success">Verbindung erfolgreich</string>
     <string name="status_connection_fail">Verbindung fehlerhaft</string>

traccar-client/src/main/res/values-es/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">Para más información visite\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Servicio creado</string>
-    <string name="status_service_start">Service arrancado</string>
     <string name="status_service_destroy">Servicio destruído</string>
     <string name="status_connection_success">Conexión realizada</string>
     <string name="status_connection_fail">Fallo en la conexión</string>

traccar-client/src/main/res/values-fr/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
 
     <string name="status_service_create">Service créé</string>
-    <string name="status_service_start">Service démarré</string>
     <string name="status_service_destroy">Service supprimé</string>
     <string name="status_connection_success">Connexion établie avec le serveur</string>
     <string name="status_connection_fail">Echec de la connexion au serveur</string>

traccar-client/src/main/res/values-nb/strings.xml

@@ -8,14 +8,14 @@
     <string name="settings_address_title">Tjeneradresse</string>
     <string name="settings_address_summary">Domenenavn eller IP-adresse</string>
     <string name="settings_port_title">Tjenerport</string>
-    <string name="settings_port_summary">TCP-port til sproingstjener</string>
+    <string name="settings_port_summary">TCP-port til sporingstjener</string>
     <string name="settings_interval_title">Frekvens</string>
-    <string name="settings_interval_summary">Beskjedinterval i sekunder</string>
+    <string name="settings_interval_summary">Beskjedintervall i sekunder</string>
-    <string name="settings_status_title">Tjeneste status</string>
+    <string name="settings_status_title">Tjeneste-status</string>
     <string name="settings_status_off">Start</string>
     <string name="settings_status_on">Stopp</string>
-    <string name="settings_status_off_summary">Tjeneste stoppet</string>
+    <string name="settings_status_off_summary">Tjenesten stoppet</string>
-    <string name="settings_status_on_summary">Tjeneste kjører</string>
+    <string name="settings_status_on_summary">Tjenesten kjører</string>
     <string name="settings_extended_title">Utvidet format</string>
     <string name="settings_extended_summary">Bruk det nye utvidede formatet</string>
     <string name="settings_provider_title">Lokaliseringsleverandør</string>
@@ -32,16 +32,15 @@
     
     <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible med Traccar Server og andre sporingssystemer.</string>
     <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengelig på GitHub.</string>
-    <string name="about_web">For mor informasjon besøk\nwww.traccar.org/client</string>
+    <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Tjeneste opprettet</string>
-    <string name="status_service_start">Tjeneste startet</string>
     <string name="status_service_destroy">Tjeneste ødelagt</string>
     <string name="status_connection_success">Tilkobling var vellykket</string>
     <string name="status_connection_fail">Tilkobling mislyktes</string>
     <string name="status_send_fail">Sending mislyktes</string>
     <string name="status_location_update">Plassering oppdatert</string>
     <string name="status_preference_update">Innstillinger oppdatert</string>
-    <string name="status_connectivity_change">tilkobling forandret</string>
+    <string name="status_connectivity_change">Tilkobling forandret</string>
 
 </resources>

traccar-client/src/main/res/values-pt/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">Para mais informações visite\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Serviço criado</string>
-    <string name="status_service_start">Serviço iniciado</string>
     <string name="status_service_destroy">Serviço destruído</string>
     <string name="status_connection_success">Sucesso na conexão</string>
     <string name="status_connection_fail">Falha na conexão</string>

traccar-client/src/main/res/values-ru/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">Для получения дополнительной информации посетите\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Сервис создан</string>
-    <string name="status_service_start">Сервис запущен</string>
     <string name="status_service_destroy">Сервис удален</string>
     <string name="status_connection_success">Соедниение установлено</string>
     <string name="status_connection_fail">Ошибка установки соединения</string>

traccar-client/src/main/res/values-sr/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">"Za više informacija www.traccar.org/client "</string>
 
     <string name="status_service_create">Servis kreiran</string>
-    <string name="status_service_start">Servis pokrenut</string>
     <string name="status_service_destroy">Servis uništen</string>
     <string name="status_connection_success">Konekcija uspešna</string>
     <string name="status_connection_fail">Konekcija neuspešna</string>

traccar-client/src/main/res/values-v11/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Holo.Light">
+    </style>
+
+</resources>

traccar-client/src/main/res/values-v21/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Material.Light">
+    </style>
+
+</resources>

traccar-client/src/main/res/values/strings.xml

@@ -35,7 +35,6 @@
     <string name="about_web">For more information visit\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Service created</string>
-    <string name="status_service_start">Service started</string>
     <string name="status_service_destroy">Service destroyed</string>
     <string name="status_connection_success">Connection succeeded</string>
     <string name="status_connection_fail">Connection failed</string>
@@ -43,5 +42,6 @@
     <string name="status_location_update">Location update</string>
     <string name="status_preference_update">Preference update</string>
     <string name="status_connectivity_change">Connectivity change</string>
+    <string name="status_provider_missing">Missing location provider</string>
 
 </resources>

traccar-client/src/main/res/values/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Light">
+    </style>
+
+</resources>

traccar-client/traccar-client.iml

@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="traccar-client-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":traccar-client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="traccar-client-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":traccar-client" />
+      </configuration>
+    </facet>
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -15,61 +23,68 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":traccar-client" />
-      </configuration>
-    </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
-