From 44253cf560de6226f6bf6456cd15e88dd1cde172 Mon Sep 17 00:00:00 2001 From: acasallas Date: Thu, 27 Aug 2015 13:14:40 -0400 Subject: [PATCH] Revert "Modified AffdexMe to use new 2.0 SDK" This reverts commit 96f9d55ebe0cdae9138fe658b0d574b520b5765e. --- .gitignore | 8 - AffdexMe/.idea/gradle.xml | 2 +- AffdexMe/.idea/misc.xml | 24 - AffdexMe/AffdexMe.iml | 2 +- AffdexMe/app/app.iml | 16 +- AffdexMe/app/build.gradle | 19 +- .../libs/affdex-sdk-1.2-SNAPSHOT-javadoc.jar | Bin 0 -> 179816 bytes AffdexMe/app/libs/affdex-sdk-1.2-SNAPSHOT.jar | Bin 0 -> 130890 bytes AffdexMe/app/libs/flurry-analytics-4.1.0.jar | Bin 0 -> 119449 bytes AffdexMe/app/libs/gson-2.2.4.jar | Bin 0 -> 190432 bytes AffdexMe/app/proguard-rules.pro | 33 +- AffdexMe/app/src/main/AndroidManifest.xml | 17 +- .../v_6/CT_pack/au01ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au02ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au04ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au09ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au10ct_raw_linear.pbin | Bin 0 -> 2727 bytes .../v_6/CT_pack/au17ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au18ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au24ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au25ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/au28ct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/disgustct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/eye_closurect_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/genderct_raw_linear.pbin | Bin 0 -> 3975 bytes .../v_6/CT_pack/smilect_raw_linear.pbin | Bin 0 -> 9735 bytes .../v_6/CT_pack/smirkct_raw_linear.pbin | Bin 0 -> 9735 bytes .../Classifiers/v_6/MO_pack/au02mo.pbin | Bin 0 -> 8775 bytes .../Classifiers/v_6/MO_pack/au04mo.pbin | Bin 0 -> 7335 bytes .../Classifiers/v_6/MO_pack/au15mo.pbin | Bin 0 -> 8055 bytes .../Classifiers/v_6/MO_pack/disgustmo.pbin | Bin 0 -> 46791 bytes .../Classifiers/v_6/MO_pack/smilemo.pbin | Bin 0 -> 14535 bytes .../Classifiers/v_6/PA_pack/au15pa_raw.pbin | Bin 0 -> 9735 bytes .../v_6/config_mo/postprocess/causal.conf | 102 + .../v_6/config_mo/postprocess/static.conf | 38 + .../Classifiers/v_6/config_mo/raw/linear.conf | 55 + .../v_6/config_mo/tracker/facedet_0.1.conf | 3 + .../config_mo/tracker/multi_noctali0.83.conf | 5 + .../v_6/config_mo/tracker/noctali0.81.conf | 7 + .../config_mo/tracker/single_noctali0.81.conf | 7 + .../config_mo/tracker/single_noctali0.83.conf | 7 + .../tracker/single_noctali0.83_emoto.conf | 4 + .../Affdex/Classifiers/v_6/face_model_3d.bin | Bin 0 -> 71741 bytes .../haarcascade_frontalface_alt2.xml | 23550 ++++++++++++++++ .../Classifiers/v_6/noctali0.83/Detector.conf | 84 + .../v_6/noctali0.83/classifier_22.arc | Bin 0 -> 2234 bytes .../v_6/noctali0.83/classifier_5.arc | Bin 0 -> 325 bytes .../Classifiers/v_6/noctali0.83/pca_lr_12.arc | Bin 0 -> 592189 bytes .../Classifiers/v_6/noctali0.83/pca_lr_15.arc | Bin 0 -> 592189 bytes .../Classifiers/v_6/noctali0.83/pca_lr_18.arc | Bin 0 -> 592189 bytes .../Classifiers/v_6/noctali0.83/pca_lr_9.arc | Bin 0 -> 592189 bytes .../v_6/production_config/emotion/disney.conf | 34 + .../production_config/emotion/emotion.conf | 276 + .../postprocess/acausal.conf | 998 + .../production_config/postprocess/causal.conf | 952 + .../production_config/postprocess/static.conf | 252 + .../v_6/production_config/raw/linear.conf | 144 + .../v_6/production_config/raw/nonlinear.conf | 53 + .../tracker/facedet_0.1.conf | 3 + .../tracker/multi_noctali0.83.conf | 5 + .../tracker/noctali0.81.conf | 7 + .../tracker/single_noctali0.81.conf | 7 + .../tracker/single_noctali0.83.conf | 7 + .../tracker/single_noctali0.83_emoto.conf | 4 + .../app/src/main/assets/gifs/alan_smile.gif | Bin 0 -> 56899 bytes .../com/affectiva/affdexme/DrawingView.java | 79 +- .../affectiva/affdexme/EditPreferences.java | 50 + .../affdexme/GradientMetricView.java | 35 + .../com/affectiva/affdexme/MainActivity.java | 429 +- .../affdexme/MetricChooserActivity.java | 346 + .../affdexme/MetricSelectionFragment.java | 599 - .../affectiva/affdexme/MetricSelector.java | 172 - .../{MetricDisplay.java => MetricView.java} | 23 +- .../affectiva/affdexme/MetricsManager.java | 184 +- .../affectiva/affdexme/PreferencesUtils.java | 95 - .../affectiva/affdexme/SettingsActivity.java | 72 - .../com/affectiva/affdexme/SquareLayout.java | 28 + .../jniLibs/armeabi-v7a/libaffdexface_jni.so | Bin 9089992 -> 8933400 bytes .../src/main/res/drawable-hdpi/checkbox.png | Bin 0 -> 1003 bytes .../ic_arrow_back_white_24dp.png | Bin 250 -> 0 bytes .../res/drawable-hdpi/settings_button.png | Bin 1675 -> 802 bytes .../drawable-hdpi/settings_button_orange.png | Bin 0 -> 787 bytes .../drawable-hdpi/settings_button_pressed.png | Bin 1684 -> 0 bytes .../src/main/res/drawable-mdpi/checkbox.png | Bin 0 -> 961 bytes .../ic_arrow_back_white_24dp.png | Bin 201 -> 0 bytes .../res/drawable-mdpi/settings_button.png | Bin 1159 -> 802 bytes .../drawable-mdpi/settings_button_orange.png | Bin 0 -> 787 bytes .../drawable-mdpi/settings_button_pressed.png | Bin 1151 -> 0 bytes .../app/src/main/res/drawable-nodpi/anger.jpg | Bin 6359 -> 0 bytes .../src/main/res/drawable-nodpi/attention.jpg | Bin 6520 -> 0 bytes .../main/res/drawable-nodpi/brow_furrow.jpg | Bin 6462 -> 0 bytes .../main/res/drawable-nodpi/brow_raise.jpg | Bin 5874 -> 0 bytes .../main/res/drawable-nodpi/chin_raise.jpg | Bin 7186 -> 0 bytes .../src/main/res/drawable-nodpi/contempt.jpg | Bin 6251 -> 0 bytes .../src/main/res/drawable-nodpi/disgust.jpg | Bin 5775 -> 0 bytes .../main/res/drawable-nodpi/engagement.jpg | Bin 5786 -> 0 bytes .../main/res/drawable-nodpi/eye_closure.jpg | Bin 5833 -> 0 bytes .../app/src/main/res/drawable-nodpi/fear.jpg | Bin 6148 -> 0 bytes .../res/drawable-nodpi/inner_brow_raise.jpg | Bin 6013 -> 0 bytes .../app/src/main/res/drawable-nodpi/joy.jpg | Bin 7205 -> 0 bytes .../drawable-nodpi/lip_corner_depressor.jpg | Bin 5873 -> 0 bytes .../src/main/res/drawable-nodpi/lip_press.jpg | Bin 6549 -> 0 bytes .../main/res/drawable-nodpi/lip_pucker.jpg | Bin 5725 -> 0 bytes .../src/main/res/drawable-nodpi/lip_suck.jpg | Bin 5293 -> 0 bytes .../main/res/drawable-nodpi/mouth_open.jpg | Bin 5457 -> 0 bytes .../res/drawable-nodpi/negative_valence.jpg | Bin 5162 -> 0 bytes .../main/res/drawable-nodpi/nose_wrinkle.jpg | Bin 6377 -> 0 bytes .../src/main/res/drawable-nodpi/sadness.jpg | Bin 5835 -> 0 bytes .../app/src/main/res/drawable-nodpi/smile.jpg | Bin 7240 -> 0 bytes .../app/src/main/res/drawable-nodpi/smirk.jpg | Bin 6251 -> 0 bytes .../src/main/res/drawable-nodpi/surprise.jpg | Bin 6199 -> 0 bytes .../res/drawable-nodpi/upper_lip_raise.jpg | Bin 5671 -> 0 bytes .../src/main/res/drawable-nodpi/valence.jpg | Bin 5003 -> 0 bytes .../src/main/res/drawable-xhdpi/checkbox.png | Bin 0 -> 1554 bytes .../ic_arrow_back_white_24dp.png | Bin 232 -> 0 bytes .../res/drawable-xhdpi/settings_button.png | Bin 2449 -> 802 bytes .../drawable-xhdpi/settings_button_orange.png | Bin 0 -> 787 bytes .../settings_button_pressed.png | Bin 2519 -> 0 bytes .../src/main/res/drawable-xxhdpi/checkbox.png | Bin 0 -> 2564 bytes .../ic_arrow_back_white_24dp.png | Bin 290 -> 0 bytes .../res/drawable-xxhdpi/settings_button.png | Bin 2897 -> 802 bytes .../settings_button_orange.png | Bin 0 -> 787 bytes .../settings_button_pressed.png | Bin 2943 -> 0 bytes .../affectiva_logo_clear_background.png | Bin 12893 -> 0 bytes AffdexMe/app/src/main/res/drawable/anger.jpg | Bin 0 -> 16695 bytes .../app/src/main/res/drawable/attention.jpg | Bin 0 -> 17597 bytes AffdexMe/app/src/main/res/drawable/au20.jpg | Bin 0 -> 16511 bytes .../app/src/main/res/drawable/brow_furrow.jpg | Bin 0 -> 17400 bytes .../app/src/main/res/drawable/brow_raise.jpg | Bin 0 -> 17643 bytes .../app/src/main/res/drawable/chin_raise.jpg | Bin 0 -> 16363 bytes .../app/src/main/res/drawable/contempt.jpg | Bin 0 -> 16133 bytes .../app/src/main/res/drawable/disgust.jpg | Bin 0 -> 16629 bytes .../app/src/main/res/drawable/engagement.jpg | Bin 0 -> 16528 bytes .../app/src/main/res/drawable/eye_closure.jpg | Bin 0 -> 16450 bytes AffdexMe/app/src/main/res/drawable/fear.jpg | Bin 0 -> 12067 bytes .../res/drawable/ic_arrow_back_white_24dp.png | Bin 232 -> 0 bytes .../main/res/drawable/inner_brow_raise.jpg | Bin 0 -> 17913 bytes AffdexMe/app/src/main/res/drawable/joy.jpg | Bin 0 -> 17222 bytes .../src/main/res/drawable/lip_depressor.jpg | Bin 0 -> 16284 bytes .../app/src/main/res/drawable/lip_press.jpg | Bin 0 -> 11824 bytes .../app/src/main/res/drawable/lip_pucker.jpg | Bin 0 -> 16539 bytes .../app/src/main/res/drawable/lip_suck.jpg | Bin 0 -> 16505 bytes .../app/src/main/res/drawable/mouth_open.jpg | Bin 0 -> 16532 bytes .../src/main/res/drawable/nose_wrinkle.jpg | Bin 0 -> 17348 bytes .../app/src/main/res/drawable/occlusion.jpg | Bin 0 -> 16771 bytes .../app/src/main/res/drawable/sadness.jpg | Bin 0 -> 16284 bytes .../src/main/res/drawable/settings_button.png | Bin 1675 -> 0 bytes .../res/drawable/settings_button_pressed.png | Bin 1684 -> 0 bytes .../res/drawable/settings_button_selector.xml | 3 +- AffdexMe/app/src/main/res/drawable/smile.jpg | Bin 0 -> 16710 bytes AffdexMe/app/src/main/res/drawable/smile2.jpg | Bin 0 -> 17439 bytes .../app/src/main/res/drawable/smile_0.jpg | Bin 0 -> 9050 bytes .../app/src/main/res/drawable/smile_1.jpg | Bin 0 -> 9069 bytes .../app/src/main/res/drawable/smile_2.jpg | Bin 0 -> 9065 bytes .../app/src/main/res/drawable/smile_3.jpg | Bin 0 -> 9118 bytes .../app/src/main/res/drawable/smile_4.jpg | Bin 0 -> 9171 bytes AffdexMe/app/src/main/res/drawable/smirk.jpg | Bin 0 -> 16387 bytes .../app/src/main/res/drawable/surprise.jpg | Bin 0 -> 16482 bytes .../src/main/res/drawable/upper_lip_raise.jpg | Bin 0 -> 16639 bytes .../app/src/main/res/drawable/valence.jpg | Bin 0 -> 16942 bytes .../app/src/main/res/layout/activity_main.xml | 29 +- .../app/src/main/res/layout/grid_header.xml | 2 +- .../app/src/main/res/layout/grid_item.xml | 75 +- .../src/main/res/layout/metric_chooser.xml | 54 +- .../app/src/main/res/layout/metric_layout.xml | 40 +- AffdexMe/app/src/main/res/raw/anger.mp4 | Bin 12269 -> 0 bytes AffdexMe/app/src/main/res/raw/attention.mp4 | Bin 18972 -> 0 bytes AffdexMe/app/src/main/res/raw/brow_furrow.mp4 | Bin 19513 -> 0 bytes AffdexMe/app/src/main/res/raw/brow_raise.mp4 | Bin 12661 -> 0 bytes AffdexMe/app/src/main/res/raw/chin_raise.mp4 | Bin 21734 -> 0 bytes AffdexMe/app/src/main/res/raw/contempt.mp4 | Bin 23980 -> 0 bytes AffdexMe/app/src/main/res/raw/disgust.mp4 | Bin 15453 -> 0 bytes AffdexMe/app/src/main/res/raw/engagement.mp4 | Bin 48905 -> 0 bytes AffdexMe/app/src/main/res/raw/eye_closure.mp4 | Bin 8282 -> 0 bytes AffdexMe/app/src/main/res/raw/fear.mp4 | Bin 22588 -> 0 bytes .../app/src/main/res/raw/inner_brow_raise.mp4 | Bin 18627 -> 0 bytes AffdexMe/app/src/main/res/raw/joy.mp4 | Bin 27042 -> 0 bytes .../src/main/res/raw/lip_corner_depressor.mp4 | Bin 21359 -> 0 bytes AffdexMe/app/src/main/res/raw/lip_press.mp4 | Bin 20948 -> 0 bytes AffdexMe/app/src/main/res/raw/lip_pucker.mp4 | Bin 15858 -> 0 bytes AffdexMe/app/src/main/res/raw/lip_suck.mp4 | Bin 21071 -> 0 bytes AffdexMe/app/src/main/res/raw/mouth_open.mp4 | Bin 12883 -> 0 bytes .../app/src/main/res/raw/nose_wrinkle.mp4 | Bin 15524 -> 0 bytes AffdexMe/app/src/main/res/raw/sadness.mp4 | Bin 11868 -> 0 bytes AffdexMe/app/src/main/res/raw/smile.mp4 | Bin 22108 -> 0 bytes AffdexMe/app/src/main/res/raw/smirk.mp4 | Bin 23980 -> 0 bytes AffdexMe/app/src/main/res/raw/surprise.mp4 | Bin 23111 -> 0 bytes .../app/src/main/res/raw/upper_lip_raise.mp4 | Bin 17259 -> 0 bytes AffdexMe/app/src/main/res/raw/valence.mp4 | Bin 35652 -> 0 bytes AffdexMe/app/src/main/res/raw/valence0.mp4 | Bin 75113 -> 0 bytes .../app/src/main/res/values-large/dimens.xml | 26 +- .../app/src/main/res/values-normal/dimens.xml | 22 +- .../app/src/main/res/values-small/dimens.xml | 17 +- .../app/src/main/res/values-xlarge/dimens.xml | 26 +- AffdexMe/app/src/main/res/values/colors.xml | 5 - AffdexMe/app/src/main/res/values/dimens.xml | 23 +- AffdexMe/app/src/main/res/values/strings.xml | 38 +- AffdexMe/app/src/main/res/values/styles.xml | 9 +- .../src/main/res/xml/preference_headers.xml | 16 +- .../src/main/res/xml/settings_preferences.xml | 18 +- 200 files changed, 27700 insertions(+), 1540 deletions(-) create mode 100644 AffdexMe/app/libs/affdex-sdk-1.2-SNAPSHOT-javadoc.jar create mode 100644 AffdexMe/app/libs/affdex-sdk-1.2-SNAPSHOT.jar create mode 100644 AffdexMe/app/libs/flurry-analytics-4.1.0.jar create mode 100644 AffdexMe/app/libs/gson-2.2.4.jar create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au01ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au02ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au04ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au09ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au10ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au17ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au18ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au24ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au25ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/au28ct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/disgustct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/eye_closurect_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/genderct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/smilect_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/CT_pack/smirkct_raw_linear.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/MO_pack/au02mo.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/MO_pack/au04mo.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/MO_pack/au15mo.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/MO_pack/disgustmo.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/MO_pack/smilemo.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/PA_pack/au15pa_raw.pbin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/postprocess/causal.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/postprocess/static.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/raw/linear.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/facedet_0.1.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/multi_noctali0.83.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/noctali0.81.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/single_noctali0.81.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/single_noctali0.83.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/config_mo/tracker/single_noctali0.83_emoto.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/face_model_3d.bin create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/haarcascade/haarcascade_frontalface_alt2.xml create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/Detector.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/classifier_22.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/classifier_5.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/pca_lr_12.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/pca_lr_15.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/pca_lr_18.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/noctali0.83/pca_lr_9.arc create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/emotion/disney.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/emotion/emotion.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/postprocess/acausal.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/postprocess/causal.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/postprocess/static.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/raw/linear.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/raw/nonlinear.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/facedet_0.1.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/multi_noctali0.83.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/noctali0.81.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/single_noctali0.81.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/single_noctali0.83.conf create mode 100644 AffdexMe/app/src/main/assets/Affdex/Classifiers/v_6/production_config/tracker/single_noctali0.83_emoto.conf create mode 100644 AffdexMe/app/src/main/assets/gifs/alan_smile.gif create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/EditPreferences.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/GradientMetricView.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricChooserActivity.java delete mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java delete mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java rename AffdexMe/app/src/main/java/com/affectiva/affdexme/{MetricDisplay.java => MetricView.java} (84%) delete mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java delete mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/SquareLayout.java create mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/checkbox.png delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/settings_button_orange.png delete mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/checkbox.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/settings_button_orange.png delete mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/checkbox.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_orange.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/checkbox.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_orange.png delete mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png delete mode 100644 AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png create mode 100644 AffdexMe/app/src/main/res/drawable/anger.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/attention.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/au20.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/brow_furrow.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/brow_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/chin_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/contempt.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/disgust.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/engagement.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/eye_closure.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/fear.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable/inner_brow_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/joy.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/lip_depressor.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/lip_press.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/lip_pucker.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/lip_suck.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/mouth_open.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/nose_wrinkle.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/occlusion.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/sadness.jpg delete mode 100644 AffdexMe/app/src/main/res/drawable/settings_button.png delete mode 100644 AffdexMe/app/src/main/res/drawable/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable/smile.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile2.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile_0.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile_1.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile_2.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile_3.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smile_4.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/smirk.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/surprise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/upper_lip_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable/valence.jpg delete mode 100644 AffdexMe/app/src/main/res/raw/anger.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/attention.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/brow_furrow.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/brow_raise.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/chin_raise.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/contempt.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/disgust.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/engagement.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/eye_closure.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/fear.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/inner_brow_raise.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/joy.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/lip_corner_depressor.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/lip_press.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/lip_pucker.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/lip_suck.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/mouth_open.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/nose_wrinkle.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/sadness.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/smile.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/smirk.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/surprise.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/upper_lip_raise.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/valence.mp4 delete mode 100644 AffdexMe/app/src/main/res/raw/valence0.mp4 diff --git a/.gitignore b/.gitignore index de604c0..ccf2efe 100644 --- a/.gitignore +++ b/.gitignore @@ -25,11 +25,3 @@ proguard/ # Log Files *.log - -#Affectiva SDK files -AffdexMe/app/libs/* -AffdexMe/app/src/main/jniLibs/* -AffdexMe/app/src/main/assets/Affdex - - - diff --git a/AffdexMe/.idea/gradle.xml b/AffdexMe/.idea/gradle.xml index 7d80135..3ed2e6c 100644 --- a/AffdexMe/.idea/gradle.xml +++ b/AffdexMe/.idea/gradle.xml @@ -5,7 +5,7 @@