Skip to content

Commit 92217cf

Browse files
minosktminoskt
committed
Update for Android Studio 1.2
1 parent 6256bff commit 92217cf

File tree

9 files changed

+38
-34
lines changed

9 files changed

+38
-34
lines changed

‎SensingKit-Android.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<module external.linked.project.id="SensingKit-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">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
@@ -15,5 +16,4 @@
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

‎SensingKitLib/SensingKitLib.iml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SensingKit-Android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":SensingKitLib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SensingKit-Android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -69,6 +70,10 @@
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7172
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/7.3.0/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/7.3.0/jars" />
7277
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7378
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7479
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,11 +93,10 @@
8893
</content>
8994
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9095
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="play-services-maps-7.0.0" level="project" />
9296
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
93-
<orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
97+
<orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" />
9498
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
99+
<orderEntry type="library" exported="" name="play-services-maps-7.3.0" level="project" />
100+
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
96101
</component>
97-
</module>
98-
102+
</module>

‎SensingKitLib/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ android {
2020

2121
dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.google.android.gms:play-services-location:7.0.0'
23+
compile 'com.google.android.gms:play-services-location:7.3.0'
2424
}

‎SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SKSensorDataListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626

2727
public interface SKSensorDataListener {
2828

29-
public void onDataReceived(final SensorModuleType moduleType, final DataInterface moduleData);
29+
void onDataReceived(final SensorModuleType moduleType, final DataInterface moduleData);
3030

3131
}

‎SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SensingKitLibInterface.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,39 @@ public interface SensingKitLibInterface {
2929

3030
/** Sensor Registration */
3131

32-
public void registerSensorModule(SensorModuleType moduleType) throws SKException;
32+
void registerSensorModule(SensorModuleType moduleType) throws SKException;
3333

34-
public void deregisterSensorModule(SensorModuleType moduleType) throws SKException;
34+
void deregisterSensorModule(SensorModuleType moduleType) throws SKException;
3535

36-
public boolean isSensorModuleRegistered(SensorModuleType moduleType) throws SKException;
36+
boolean isSensorModuleRegistered(SensorModuleType moduleType) throws SKException;
3737

3838
/** Configuration */
3939
// TODO: Add Configuration
4040

4141

4242
/** One Shot Sensing */
4343

44-
public DataInterface getDataFromSensor(SensorModuleType moduleType) throws SKException;
44+
DataInterface getDataFromSensor(SensorModuleType moduleType) throws SKException;
4545

4646

4747
/** Continuous Sensing */
4848

49-
public void subscribeSensorDataListener(SensorModuleType moduleType, SKSensorDataListener dataListener) throws SKException;
49+
void subscribeSensorDataListener(SensorModuleType moduleType, SKSensorDataListener dataListener) throws SKException;
5050

51-
public void unsubscribeSensorDataListener(SensorModuleType moduleType, SKSensorDataListener dataListener) throws SKException;
51+
void unsubscribeSensorDataListener(SensorModuleType moduleType, SKSensorDataListener dataListener) throws SKException;
5252

53-
public void unsubscribeAllSensorDataListeners(SensorModuleType moduleType) throws SKException;
53+
void unsubscribeAllSensorDataListeners(SensorModuleType moduleType) throws SKException;
5454

55-
public void startContinuousSensingWithSensor(SensorModuleType moduleType) throws SKException;
55+
void startContinuousSensingWithSensor(SensorModuleType moduleType) throws SKException;
5656

57-
public void stopContinuousSensingWithSensor(SensorModuleType moduleType) throws SKException;
57+
void stopContinuousSensingWithSensor(SensorModuleType moduleType) throws SKException;
5858

59-
public boolean isSensorModuleSensing(SensorModuleType moduleType) throws SKException;
59+
boolean isSensorModuleSensing(SensorModuleType moduleType) throws SKException;
6060

6161
/** Time */
6262

63-
public long getCurrentTimeMillis();
63+
long getCurrentTimeMillis();
6464

65-
public long getNanoTime();
65+
long getNanoTime();
6666

6767
}

‎SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/model/data/DataInterface.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323

2424
public interface DataInterface {
2525

26-
public String getDataInString();
26+
String getDataInString();
2727

2828
}

‎SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/AbstractNativeSensorModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void startSensing() throws SKException {
7272

7373
this.isSensing = true;
7474

75-
boolean status = mSensorManager.registerListener(mSensorEventListener, mSensor, SensorManager.SENSOR_DELAY_NORMAL);
75+
boolean status = mSensorManager.registerListener(mSensorEventListener, mSensor, SensorManager.SENSOR_DELAY_FASTEST);
7676

7777
if (!status) {
7878
throw new SKException(TAG, "SensorModule '" + getSensorName() + "' could not be started.", SKExceptionErrorCode.UNKNOWN_ERROR);

‎SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SensorModuleInterface.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
@SuppressWarnings("unused")
2828
public interface SensorModuleInterface {
2929

30-
public SensorModuleType getSensorType();
30+
SensorModuleType getSensorType();
3131

32-
public void startSensing() throws SKException;
33-
public void stopSensing();
34-
public boolean isSensing();
32+
void startSensing() throws SKException;
33+
void stopSensing();
34+
boolean isSensing();
3535

36-
public void subscribeSensorDataListener(SKSensorDataListener callback) throws SKException;
37-
public void unsubscribeSensorDataListener(SKSensorDataListener callback) throws SKException;
38-
public void unsubscribeAllSensorDataListeners() throws SKException;
36+
void subscribeSensorDataListener(SKSensorDataListener callback) throws SKException;
37+
void unsubscribeSensorDataListener(SKSensorDataListener callback) throws SKException;
38+
void unsubscribeAllSensorDataListeners() throws SKException;
3939

4040
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.1.0'
8+
classpath 'com.android.tools.build:gradle:1.2.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

0 commit comments

Comments
 (0)