b798154305
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
11408d5a70
Merge branch 'master' into two_oh_one
...
Conflicts:
AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
AffdexMe/app/src/main/res/drawable/camera_button_selector.xml
AffdexMe/app/src/main/res/drawable/settings_button_selector.xml
2015-10-01 21:12:00 -04:00
29c0f78773
Add the new affdexme
2015-09-10 13:30:10 -04:00
f43d0de100
Revert "-First commit implementing new classifiers"
...
This reverts commit 35d15089b8
2015-08-27 13:15:07 -04:00
44253cf560
Revert "Modified AffdexMe to use new 2.0 SDK"
...
This reverts commit 96f9d55ebe
2015-08-27 13:14:40 -04:00
3180d67c77
Revert "Made changes for AffdexMe to work with SDK v2.01"
...
This reverts commit 301ba88795
2015-08-27 13:14:17 -04:00
301ba88795
Made changes for AffdexMe to work with SDK v2.01
2015-08-27 12:07:37 -04:00
96f9d55ebe
Modified AffdexMe to use new 2.0 SDK
2015-08-20 11:24:17 -04:00
35d15089b8
-First commit implementing new classifiers
2015-07-20 15:53:09 -04:00
734b05c326
Updated project to reflect new capabilities of 1.2 SDK release
2015-07-13 14:17:57 -04:00
b27245ea6a
-upload AffdexMe folder to GitHub
...
-upload the AffdexMe project folder and corresponding README.md file
2015-06-23 16:44:24 -04:00
toby cabot