1、计步00:00点重置时，运动检测也重置

2、移动判定公式改为当前计步数-上次计步数 >=0, 防止00:00问题造成判定失败
3、默认音量15，震动1秒

diff --git a/app/app.iml b/app/app.iml
deleted file mode 100644 (file)
index 497b2ac..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
-  <component name="FacetManager">\r
-    <facet type="android-gradle" name="Android-Gradle">\r
-      <configuration>\r
-        <option name="GRADLE_PROJECT_PATH" value=":app"/>\r
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3"/>\r
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3"/>\r
-      </configuration>\r
-    </facet>\r
-    <facet type="android" name="Android">\r
-      <configuration>\r
-        <option name="SELECTED_BUILD_VARIANT" value="debug"/>\r
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug"/>\r
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources"/>\r
-        <afterSyncTasks>\r
-          <task>generateDebugSources</task>\r
-        </afterSyncTasks>\r
-        <option name="ALLOW_USER_CONFIGURATION" value="false"/>\r
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>\r
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>\r
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug"/>\r
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>\r
-      </configuration>\r
-    </facet>\r
-  </component>\r
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">\r
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes"/>\r
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
-    <exclude-output/>\r
-    <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true"/>\r
-      <excludeFolder url="file://$MODULE_DIR$/build"/>\r
-    </content>\r
-    <orderEntry type="sourceFolder" forTests="false"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="core"/>\r
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
-  </component>\r
-</module>\r

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index a098a70..dab0a41 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -33,9 +33,6 @@ public class Config {
   public static boolean forceMoveCheck=true;\r
   public static boolean forceWearCheck=true;\r
 \r
-  private static int DurationOfVibration = 10;\r
-  private static int MasterVolume = 10;\r
-\r
   private static final String KEYDurationOfVibration = "DurationVib";\r
   private static final String KeyMasterVolume = "MasterVolume";\r
 \r
@@ -172,7 +169,7 @@ public class Config {
   }\r
 \r
   public static int getDurationOfVibration(Context context){\r
-    return SharPreferenceUtil.getPrefInt(context,KEYDurationOfVibration,1000);\r
+    return SharPreferenceUtil.getPrefInt(context,KEYDurationOfVibration,1);\r
   }\r
 \r
   public static void setMasterVolume(Context context, int cycle){\r
@@ -180,7 +177,7 @@ public class Config {
   }\r
 \r
   public static int getMasterVolume(Context context){\r
-    return SharPreferenceUtil.getPrefInt(context,KeyMasterVolume,0);\r
+    return SharPreferenceUtil.getPrefInt(context,KeyMasterVolume,15);\r
   }\r
 \r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 45e0aa7..9ae656f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1268,11 +1268,18 @@ public class CoreService extends Service {
                 this.locationClient.updateStepCount(); //先记录下最后一次步数\r
                 runtime.getContextProxy().brodcastResetStepCount(runtime.getTotalStepCount());\r
                 updateSleepDate();//更新睡眠信息\r
-                resetStepCount();\r
+\r
+                //更新 运动控制的上次步数 然后再resetstecount\r
+                //runtime.setLastStepCount(runtime.getTotalStepCount()-runtime.getLastStepCount());\r
+                //runtime.setLastStepCountForBT(runtime.getTotalStepCount()-runtime.getLastStepCountForBT());\r
+                 resetStepCount();\r
+                //此处本来应该把刚刚reset前运动的步数设置到计步器里，继续开始计步。\r
+                // 由于计步接口没有提供设置步数。所以暂时只能清零，不能解决午夜还在运动的情况，会丢失一两次的数据。但是影响不大\r
+                runtime.setLastStepCountForBT(0);\r
+                runtime.setLastStepCount(0);\r
                 this.locationClient.updateStepCount(); //重置后马上跟新当前步数为0， 以便及时更新睡眠信息 一分钟内更新的步数可以忽略不记，从而平滑切换 0点reset 计步数据的计算问题\r
                 updateSleepDate();//更新睡眠信息\r
                 setCleanStepCountAlarm();\r
-\r
                 Config.logBootDate(this);//重置步数的时候，要把开机时间也更新一下，否则第二天 任意时间重启都会造成计步数据清零\r
                 return Service.START_STICKY;\r
             } else if (ACTION_HEATR_RATE_START.equals(paramIntent.getAction())) {\r

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index c9aadbc..9074ea4 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -839,7 +839,7 @@ public void updateCellInfo() {
    * else return false\r
    */\r
   private boolean checkNoMoveTimeoutForBT(){\r
-    noMove=runtime.getLastStepCountForBT() == runtime.getTotalStepCount();\r
+    noMove= (( runtime.getTotalStepCount() - runtime.getLastStepCountForBT())<=0) ;\r
     runtime.updateFZDDevStatusMoving(!noMove); //设置当前运动状态\r
     ICLogger.i("BT checkNoMoveTimeout last_noMoveForBT "+last_noMoveForBT+" noMove "+noMove+ " lastStepCountForBT "+runtime.getLastStepCountForBT()+" StepCount "+runtime.getTotalStepCount());\r
     if (last_noMoveForBT==false&& noMove==true){\r
@@ -864,7 +864,7 @@ public void updateCellInfo() {
    * else return false\r
    */\r
   private boolean checkNoMoveTimeout(){\r
-    noMove=runtime.getLastStepCount() == runtime.getTotalStepCount();\r
+    noMove=(runtime.getTotalStepCount() - runtime.getLastStepCount() <=0);\r
     runtime.updateFZDDevStatusMoving(!noMove); //设置当前运动状态\r
     ICLogger.i("checkNoMoveTimeout last_noMove "+last_noMove+" noMove "+noMove+ " lastStepCount "+runtime.getLastStepCount()+" StepCount "+runtime.getTotalStepCount());\r
     if (last_noMove==false&& noMove==true){\r

diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
deleted file mode 100644 (file)
index 8d78d7a..0000000
--- a/dNSCache/dNSCache.iml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id=":dNSCache" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
-  <component name="FacetManager">\r
-    <facet type="android-gradle" name="Android-Gradle">\r
-      <configuration>\r
-        <option name="GRADLE_PROJECT_PATH" value=":dNSCache" />\r
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />\r
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />\r
-      </configuration>\r
-    </facet>\r
-    <facet type="android" name="Android">\r
-      <configuration>\r
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />\r
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />\r
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />\r
-        <afterSyncTasks>\r
-          <task>generateDebugSources</task>\r
-        </afterSyncTasks>\r
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />\r
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />\r
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />\r
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />\r
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />\r
-        <option name="PROJECT_TYPE" value="1" />\r
-      </configuration>\r
-    </facet>\r
-  </component>\r
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">\r
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />\r
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />\r
-    <exclude-output />\r
-    <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />\r
-      <excludeFolder url="file://$MODULE_DIR$/build" />\r
-    </content>\r
-    <orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />\r
-    <orderEntry type="sourceFolder" forTests="false" />\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:18.0.0@jar" level="project" />\r
-  </component>\r
-</module>
\ No newline at end of file

diff --git a/icsupport.iml b/icsupport.iml
index b525d96..30277a3 100644 (file)
--- a/icsupport.iml
+++ b/icsupport.iml
@@ -8,10 +8,11 @@
       </configuration>\r
     </facet>\r
   </component>\r
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">\r
+  <component name="NewModuleRootManager" inherit-compiler-output="true">\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />\r
+      <excludeFolder url="file://$MODULE_DIR$/build" />\r
     </content>\r
     <orderEntry type="inheritedJdk" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r