Merge branch 'dlib-opencv-tf' of https://github.com/sweetdream779/FR-android-dlib-opencv into dlib-opencv-tf

Author: sweetdream779

.travis.yml

@@ -26,6 +26,11 @@ android:
     - android-23
     - extra-android-m2repository
     - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
+    
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
 
 before_install:
   - echo $(ant -version)
@@ -34,6 +39,8 @@ before_script:
   - wget https://github.com/opencv/opencv/releases/download/3.4.1/opencv-3.4.1-android-sdk.zip
   - unzip -q opencv-3.4.1-android-sdk.zip
   - export OPENCV_ANDROID_SDK=$(pwd)/OpenCV-android-sdk
+  - git clone https://github.com/tensorflow/tensorflow.git
+  - export TF_SRC_ROOT=$(pwd)/tensorflow
 
 script:
 - cd FaceTracker

FaceTracker/app/src/main/java/org/opencv/android/facetracker/OpenCvActivity.java

@@ -9,6 +9,7 @@
 import com.google.android.gms.samples.vision.face.facetracker.FaceTrackerActivity;
 import com.google.android.gms.samples.vision.face.facetracker.R;
 
+
 import tensorflow.detector.spc.CameraActivityMain;
 
 public class OpenCvActivity extends AppCompatActivity {
@@ -25,7 +26,9 @@ public void onCreate(Bundle icicle) {
         mBtnDetect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+
                 Intent myIntent = new Intent(OpenCvActivity.this, CameraActivityMain.class);
+
                 OpenCvActivity.this.startActivity(myIntent);
             }
         });