r/weknowhowyoufeel
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move AffdexMe files up to root

Browse source 
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.
This commit is contained in:
toby cabot 2015-11-16 14:10:32 -05:00
parent b65dfe7732
commit b798154305
138 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -25,3 +25,8 @@ proguard/
# Log Files
*.log
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/captures

0
AffdexMe/.idea/.name → .idea/.name
View file

0
AffdexMe/.idea/compiler.xml → .idea/compiler.xml
View file

0
AffdexMe/.idea/copyright/profiles_settings.xml → .idea/copyright/profiles_settings.xml
View file

0
AffdexMe/.idea/gradle.xml → .idea/gradle.xml
View file

0
AffdexMe/.idea/misc.xml → .idea/misc.xml
View file

0
AffdexMe/.idea/modules.xml → .idea/modules.xml
View file

0
AffdexMe/.idea/vcs.xml → .idea/vcs.xml
View file

0
AffdexMe/AffdexMe.iml → AffdexMe.iml
View file

0
AffdexMe/AffdexMe_original.iml → AffdexMe_original.iml
View file

0
AffdexMe/app/.gitignore → app/.gitignore vendored
View file

0
AffdexMe/app/app.iml → app/app.iml
View file

0
AffdexMe/app/build.gradle → app/build.gradle
View file

0
AffdexMe/app/build.xml → app/build.xml
View file

0
AffdexMe/app/proguard-rules.pro → app/proguard-rules.pro vendored
View file

0
AffdexMe/app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
View file

0
AffdexMe/app/src/main/assets/fonts/Square.ttf → app/src/main/assets/fonts/Square.ttf
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java → app/src/main/java/com/affectiva/affdexme/DrawingView.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java → app/src/main/java/com/affectiva/affdexme/MainActivity.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java → app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java → app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java → app/src/main/java/com/affectiva/affdexme/MetricSelector.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java → app/src/main/java/com/affectiva/affdexme/MetricsManager.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java → app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java → app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java → app/src/main/java/com/affectiva/errorreporting/CustomApplication.java
View file

0
AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java → app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
View file

0
AffdexMe/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png → app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png → app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 250 B

0
AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png → app/src/main/res/drawable-hdpi/settings_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png → app/src/main/res/drawable-hdpi/settings_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button.png → app/src/main/res/drawable-hdpi/switch_camera_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png → app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
AffdexMe/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png → app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png → app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 201 B

0
AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png → app/src/main/res/drawable-mdpi/settings_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png → app/src/main/res/drawable-mdpi/settings_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button.png → app/src/main/res/drawable-mdpi/switch_camera_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png → app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg → app/src/main/res/drawable-nodpi/anger.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg → app/src/main/res/drawable-nodpi/attention.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg → app/src/main/res/drawable-nodpi/brow_furrow.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg → app/src/main/res/drawable-nodpi/brow_raise.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg → app/src/main/res/drawable-nodpi/chin_raise.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg → app/src/main/res/drawable-nodpi/contempt.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg → app/src/main/res/drawable-nodpi/disgust.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg → app/src/main/res/drawable-nodpi/engagement.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg → app/src/main/res/drawable-nodpi/eye_closure.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg → app/src/main/res/drawable-nodpi/fear.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 6 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg → app/src/main/res/drawable-nodpi/inner_brow_raise.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg → app/src/main/res/drawable-nodpi/joy.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg → app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg → app/src/main/res/drawable-nodpi/lip_press.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg → app/src/main/res/drawable-nodpi/lip_pucker.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg → app/src/main/res/drawable-nodpi/lip_suck.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg → app/src/main/res/drawable-nodpi/mouth_open.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg → app/src/main/res/drawable-nodpi/negative_valence.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg → app/src/main/res/drawable-nodpi/nose_wrinkle.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg → app/src/main/res/drawable-nodpi/sadness.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg → app/src/main/res/drawable-nodpi/smile.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg → app/src/main/res/drawable-nodpi/smirk.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg → app/src/main/res/drawable-nodpi/surprise.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg → app/src/main/res/drawable-nodpi/upper_lip_raise.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg → app/src/main/res/drawable-nodpi/valence.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
AffdexMe/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png → app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png → app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

0
AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png → app/src/main/res/drawable-xhdpi/settings_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png → app/src/main/res/drawable-xhdpi/settings_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button.png → app/src/main/res/drawable-xhdpi/switch_camera_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

0
AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png → app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

0
AffdexMe/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png → app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png → app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

0
AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png → app/src/main/res/drawable-xxhdpi/settings_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png → app/src/main/res/drawable-xxhdpi/settings_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button.png → app/src/main/res/drawable-xxhdpi/switch_camera_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png → app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png → app/src/main/res/drawable/affectiva_logo_clear_background.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
AffdexMe/app/src/main/res/drawable/camera_button_selector.xml → app/src/main/res/drawable/camera_button_selector.xml
View file

0
AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png → app/src/main/res/drawable/ic_arrow_back_white_24dp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

0
AffdexMe/app/src/main/res/drawable/settings_button.png → app/src/main/res/drawable/settings_button.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
AffdexMe/app/src/main/res/drawable/settings_button_pressed.png → app/src/main/res/drawable/settings_button_pressed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
AffdexMe/app/src/main/res/drawable/settings_button_selector.xml → app/src/main/res/drawable/settings_button_selector.xml
View file

0
AffdexMe/app/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml
View file

0
AffdexMe/app/src/main/res/layout/error_reporter.xml → app/src/main/res/layout/error_reporter.xml
View file

0
AffdexMe/app/src/main/res/layout/grid_header.xml → app/src/main/res/layout/grid_header.xml
View file

0
AffdexMe/app/src/main/res/layout/grid_item.xml → app/src/main/res/layout/grid_item.xml
View file

0
AffdexMe/app/src/main/res/layout/metric_chooser.xml → app/src/main/res/layout/metric_chooser.xml
View file

0
AffdexMe/app/src/main/res/layout/metric_layout.xml → app/src/main/res/layout/metric_layout.xml
View file

0
AffdexMe/app/src/main/res/mipmap-hdpi/ic_launcher.png → app/src/main/res/mipmap-hdpi/ic_launcher.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
AffdexMe/app/src/main/res/mipmap-mdpi/ic_launcher.png → app/src/main/res/mipmap-mdpi/ic_launcher.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
AffdexMe/app/src/main/res/mipmap-xhdpi/ic_launcher.png → app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
AffdexMe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png → app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

0
AffdexMe/app/src/main/res/raw/anger.mp4 → app/src/main/res/raw/anger.mp4
View file

0
AffdexMe/app/src/main/res/raw/attention.mp4 → app/src/main/res/raw/attention.mp4
View file

0
AffdexMe/app/src/main/res/raw/brow_furrow.mp4 → app/src/main/res/raw/brow_furrow.mp4
View file

0
AffdexMe/app/src/main/res/raw/brow_raise.mp4 → app/src/main/res/raw/brow_raise.mp4
View file

0
AffdexMe/app/src/main/res/raw/chin_raise.mp4 → app/src/main/res/raw/chin_raise.mp4
View file

0
AffdexMe/app/src/main/res/raw/contempt.mp4 → app/src/main/res/raw/contempt.mp4
View file

0
AffdexMe/app/src/main/res/raw/disgust.mp4 → app/src/main/res/raw/disgust.mp4
View file

0
AffdexMe/app/src/main/res/raw/engagement.mp4 → app/src/main/res/raw/engagement.mp4
View file

Some files were not shown because too many files have changed in this diff Show more