Move AffdexMe files up to root

This should make it easier to check out the project in Android Studio and have it be able to build. Having the project files in the AffdexMe subdirectory seems to confuse Studio.
2015-11-16 14:10:32 -05:00 · 2015-11-16 14:10:32 -05:00 · b798154305
parent b65dfe7732
commit b798154305
138 changed files with 5 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,8 @@ proguard/

 # Log Files
 *.log
+
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/captures
--- a/AffdexMe/.idea/.name
+++ b/AffdexMe/.idea/.name
--- a/AffdexMe/.idea/compiler.xml
+++ b/AffdexMe/.idea/compiler.xml
--- a/AffdexMe/.idea/copyright/profiles_settings.xml
+++ b/AffdexMe/.idea/copyright/profiles_settings.xml
--- a/AffdexMe/.idea/gradle.xml
+++ b/AffdexMe/.idea/gradle.xml
--- a/AffdexMe/.idea/misc.xml
+++ b/AffdexMe/.idea/misc.xml
--- a/AffdexMe/.idea/modules.xml
+++ b/AffdexMe/.idea/modules.xml
--- a/AffdexMe/.idea/vcs.xml
+++ b/AffdexMe/.idea/vcs.xml
--- a/AffdexMe/AffdexMe.iml
+++ b/AffdexMe/AffdexMe.iml
--- a/AffdexMe/AffdexMe_original.iml
+++ b/AffdexMe/AffdexMe_original.iml
--- a/AffdexMe/app/.gitignore
+++ b/AffdexMe/app/.gitignore
--- a/AffdexMe/app/app.iml
+++ b/AffdexMe/app/app.iml
--- a/AffdexMe/app/build.gradle
+++ b/AffdexMe/app/build.gradle
--- a/AffdexMe/app/build.xml
+++ b/AffdexMe/app/build.xml
--- a/AffdexMe/app/proguard-rules.pro
+++ b/AffdexMe/app/proguard-rules.pro
--- a/AffdexMe/app/src/main/AndroidManifest.xml
+++ b/AffdexMe/app/src/main/AndroidManifest.xml
--- a/AffdexMe/app/src/main/assets/fonts/Square.ttf
+++ b/AffdexMe/app/src/main/assets/fonts/Square.ttf
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
--- a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java
--- a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
--- a/AffdexMe/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png
--- a/AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
--- a/AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png
--- a/AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button.png
--- a/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button.png
--- a/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg
--- a/AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg
+++ b/AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button.png
--- a/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button.png
--- a/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png
+++ b/AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png
--- a/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml
+++ b/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml
--- a/AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png
+++ b/AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png
--- a/AffdexMe/app/src/main/res/drawable/settings_button.png
+++ b/AffdexMe/app/src/main/res/drawable/settings_button.png
--- a/AffdexMe/app/src/main/res/drawable/settings_button_pressed.png
+++ b/AffdexMe/app/src/main/res/drawable/settings_button_pressed.png
--- a/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml
+++ b/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml
--- a/AffdexMe/app/src/main/res/layout/activity_main.xml
+++ b/AffdexMe/app/src/main/res/layout/activity_main.xml
--- a/AffdexMe/app/src/main/res/layout/error_reporter.xml
+++ b/AffdexMe/app/src/main/res/layout/error_reporter.xml
--- a/AffdexMe/app/src/main/res/layout/grid_header.xml
+++ b/AffdexMe/app/src/main/res/layout/grid_header.xml
--- a/AffdexMe/app/src/main/res/layout/grid_item.xml
+++ b/AffdexMe/app/src/main/res/layout/grid_item.xml
--- a/AffdexMe/app/src/main/res/layout/metric_chooser.xml
+++ b/AffdexMe/app/src/main/res/layout/metric_chooser.xml
--- a/AffdexMe/app/src/main/res/layout/metric_layout.xml
+++ b/AffdexMe/app/src/main/res/layout/metric_layout.xml
--- a/AffdexMe/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/AffdexMe/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/AffdexMe/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/AffdexMe/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/AffdexMe/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/AffdexMe/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/AffdexMe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/AffdexMe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/AffdexMe/app/src/main/res/raw/anger.mp4
+++ b/AffdexMe/app/src/main/res/raw/anger.mp4
--- a/AffdexMe/app/src/main/res/raw/attention.mp4
+++ b/AffdexMe/app/src/main/res/raw/attention.mp4
--- a/AffdexMe/app/src/main/res/raw/brow_furrow.mp4
+++ b/AffdexMe/app/src/main/res/raw/brow_furrow.mp4
--- a/AffdexMe/app/src/main/res/raw/brow_raise.mp4
+++ b/AffdexMe/app/src/main/res/raw/brow_raise.mp4
--- a/AffdexMe/app/src/main/res/raw/chin_raise.mp4
+++ b/AffdexMe/app/src/main/res/raw/chin_raise.mp4
--- a/AffdexMe/app/src/main/res/raw/contempt.mp4
+++ b/AffdexMe/app/src/main/res/raw/contempt.mp4
--- a/AffdexMe/app/src/main/res/raw/disgust.mp4
+++ b/AffdexMe/app/src/main/res/raw/disgust.mp4
--- a/AffdexMe/app/src/main/res/raw/engagement.mp4
+++ b/AffdexMe/app/src/main/res/raw/engagement.mp4
--- a/Show More
+++ b/Show More