Commit graph

24 commits

Author SHA1 Message Date
Abdelrahman Mahmoud
b1b942796d Merge branch 'master' of https://github.com/Affectiva/affdexme-android
Conflicts:
	AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
2015-10-01 21:20:00 -04:00
Abdelrahman Mahmoud
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
Dan Lloyd Jones
e6c51cf0a2 improved instructions on adding the Affectiva SDK 2015-09-24 10:08:24 +10:00
Mostafa Zaher
5a02ecbe93 Remove bad class docs 2015-09-11 21:24:42 +02:00
Mostafa Zaher
dc4f73aee4 Change copyrights year 2015-09-11 21:24:42 +02:00
Mostafa Zaher
84dd7c8c68 Make gradlew excutable 2015-09-11 21:24:42 +02:00
Mostafa Zaher
4177049b06 Organize imports 2015-09-11 21:24:42 +02:00
Mostafa Zaher
f8e9ac906f Change application version number 2015-09-11 21:02:09 +02:00
Abdelrahman Mahmoud
29c0f78773 Add the new affdexme 2015-09-10 13:30:10 -04:00
acasallas
176c013d91 Removed some build artifacts from git repository 2015-08-28 15:30:57 -04:00
acasallas
4e133a4bbd Updated resources to be public-facing 2015-08-28 15:29:40 -04:00
acasallas
da604e5c55 Updated AffdexMe to contain public-facing resource files 2015-08-28 15:22:46 -04:00
acasallas
f7a49be692 Added new image resource files 2015-08-28 15:17:40 -04:00
acasallas
9d71cf0b5e Added image files for UI update and removed unused ones 2015-08-28 15:10:43 -04:00
acasallas
f43d0de100 Revert "-First commit implementing new classifiers"
This reverts commit 35d15089b8.
2015-08-27 13:15:07 -04:00
acasallas
44253cf560 Revert "Modified AffdexMe to use new 2.0 SDK"
This reverts commit 96f9d55ebe.
2015-08-27 13:14:40 -04:00
acasallas
3180d67c77 Revert "Made changes for AffdexMe to work with SDK v2.01"
This reverts commit 301ba88795.
2015-08-27 13:14:17 -04:00
acasallas
d27ec7e560 Revert "Commented out method to allow AffdexMe to use v2.01"
This reverts commit 7081e7fbea.
2015-08-27 13:13:43 -04:00
acasallas
7081e7fbea Commented out method to allow AffdexMe to use v2.01 2015-08-27 13:05:53 -04:00
acasallas
301ba88795 Made changes for AffdexMe to work with SDK v2.01 2015-08-27 12:07:37 -04:00
acasallas
96f9d55ebe Modified AffdexMe to use new 2.0 SDK 2015-08-20 11:24:17 -04:00
acasallas
35d15089b8 -First commit implementing new classifiers 2015-07-20 15:53:09 -04:00
acasallas
734b05c326 Updated project to reflect new capabilities of 1.2 SDK release 2015-07-13 14:17:57 -04:00
acasallas
b27245ea6a -upload AffdexMe folder to GitHub
-upload the AffdexMe project folder and corresponding README.md file
2015-06-23 16:44:24 -04:00