No major changes

dkt01 · Apr 22, 2015 · 590a9ab · 590a9ab
1 parent 7a4a875
commit 590a9ab
Show file tree

Hide file tree

Showing 76 changed files with 0 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/NextStop.iml b/NextStop.iml
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/NextStop.iml b/app/NextStop.iml
@@ -8,8 +8,6 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/..">
       <excludeFolder url="file://$MODULE_DIR$/../.gradle" />

diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
diff --git a/app/libs/dropbox-android-sdk-1.6.3.jar b/app/libs/dropbox-android-sdk-1.6.3.jar
diff --git a/app/libs/json_simple-1.1.jar b/app/libs/json_simple-1.1.jar
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/trajectoryapp/cjmaier2_dkturne2/nextstop/ApplicationTest.java b/app/src/androidTest/java/trajectoryapp/cjmaier2_dkturne2/nextstop/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
diff --git a/app/src/main/icon_launcher-web.png b/app/src/main/icon_launcher-web.png
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/AccelTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/AccelTest.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/DropboxSetup.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/DropboxSetup.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/GyroTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/GyroTest.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/LightTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/LightTest.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/Logger.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/Logger.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/MagTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/MagTest.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/MainActivity.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/MainActivity.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/MicTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/MicTest.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/StepCount.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/StepCount.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/UploadDropbox.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/UploadDropbox.java
diff --git a/app/src/main/java/cjmaier2_dkturne2/nextstop/WiFiTest.java b/app/src/main/java/cjmaier2_dkturne2/nextstop/WiFiTest.java
diff --git a/app/src/main/res/drawable/buttonshape.xml b/app/src/main/res/drawable/buttonshape.xml
diff --git a/app/src/main/res/drawable/buttonshape0.xml b/app/src/main/res/drawable/buttonshape0.xml
diff --git a/app/src/main/res/layout/activity_accel_test.xml b/app/src/main/res/layout/activity_accel_test.xml
diff --git a/app/src/main/res/layout/activity_dropbox_setup.xml b/app/src/main/res/layout/activity_dropbox_setup.xml
diff --git a/app/src/main/res/layout/activity_gyro_test.xml b/app/src/main/res/layout/activity_gyro_test.xml
diff --git a/app/src/main/res/layout/activity_light_test.xml b/app/src/main/res/layout/activity_light_test.xml
diff --git a/app/src/main/res/layout/activity_logger.xml b/app/src/main/res/layout/activity_logger.xml
diff --git a/app/src/main/res/layout/activity_mag_test.xml b/app/src/main/res/layout/activity_mag_test.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_mic_test.xml b/app/src/main/res/layout/activity_mic_test.xml
diff --git a/app/src/main/res/layout/activity_step_count.xml b/app/src/main/res/layout/activity_step_count.xml
diff --git a/app/src/main/res/layout/activity_wifi_test.xml b/app/src/main/res/layout/activity_wifi_test.xml
diff --git a/app/src/main/res/menu/menu_accel_test.xml b/app/src/main/res/menu/menu_accel_test.xml
diff --git a/app/src/main/res/menu/menu_dropbox_setup.xml b/app/src/main/res/menu/menu_dropbox_setup.xml
diff --git a/app/src/main/res/menu/menu_gyro_test.xml b/app/src/main/res/menu/menu_gyro_test.xml
diff --git a/app/src/main/res/menu/menu_light_test.xml b/app/src/main/res/menu/menu_light_test.xml
diff --git a/app/src/main/res/menu/menu_logger.xml b/app/src/main/res/menu/menu_logger.xml
diff --git a/app/src/main/res/menu/menu_mag_test.xml b/app/src/main/res/menu/menu_mag_test.xml
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
diff --git a/app/src/main/res/menu/menu_mic_test.xml b/app/src/main/res/menu/menu_mic_test.xml
diff --git a/app/src/main/res/menu/menu_step_count.xml b/app/src/main/res/menu/menu_step_count.xml
diff --git a/app/src/main/res/menu/menu_wifi_test.xml b/app/src/main/res/menu/menu_wifi_test.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/logo.png b/logo.png
diff --git a/logo.pptx b/logo.pptx
diff --git a/phone axes.PNG b/phone axes.PNG
diff --git a/settings.gradle b/settings.gradle