Manual merge of github pull requests.

    Merge pull request #1 from gonzapico/master
    Added another fields from face object to be shown (happiness level, l…

    Merge pull request #3 from incon/master
    Correct SDK level

Change-Id: Icf8fdbb151125dd47a60b2c210278b3c24960eee

Author: claywilkinson

README.md

@@ -8,7 +8,7 @@ Introduction
 
 Pre-requisites
 --------------
- Android Play Services SDK level 25 or greater.
+ Android Play Services SDK level 26 or greater.
 
 Getting Started
 ---------------

face/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/FaceGraphic.java

@@ -19,8 +19,8 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 
-import com.google.android.gms.vision.face.Face;
 import com.google.android.gms.samples.vision.face.facetracker.ui.camera.GraphicOverlay;
+import com.google.android.gms.vision.face.Face;
 
 /**
  * Graphic instance for rendering face position, orientation, and landmarks within an associated
@@ -50,6 +50,7 @@ class FaceGraphic extends GraphicOverlay.Graphic {
 
     private volatile Face mFace;
     private int mFaceId;
+    private float mFaceHappiness;
 
     FaceGraphic(GraphicOverlay overlay) {
         super(overlay);
@@ -74,6 +75,7 @@ void setId(int id) {
         mFaceId = id;
     }
 
+
     /**
      * Updates the face instance from the detection of the most recent frame.  Invalidates the
      * relevant portions of the overlay to trigger a redraw.
@@ -98,6 +100,9 @@ public void draw(Canvas canvas) {
         float y = translateY(face.getPosition().y + face.getHeight() / 2);
         canvas.drawCircle(x, y, FACE_POSITION_RADIUS, mFacePositionPaint);
         canvas.drawText("id: " + mFaceId, x + ID_X_OFFSET, y + ID_Y_OFFSET, mIdPaint);
+        canvas.drawText("happiness: " + String.format("%.2f", face.getIsSmilingProbability()), x - ID_X_OFFSET, y - ID_Y_OFFSET, mIdPaint);
+        canvas.drawText("right eye: " + String.format("%.2f", face.getIsRightEyeOpenProbability()), x + ID_X_OFFSET * 2, y + ID_Y_OFFSET * 2, mIdPaint);
+        canvas.drawText("left eye: " + String.format("%.2f", face.getIsRightEyeOpenProbability()), x - ID_X_OFFSET*2, y - ID_Y_OFFSET*2, mIdPaint);
 
         // Draws a bounding box around the face.
         float xOffset = scaleX(face.getWidth() / 2.0f);

face/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/FaceTrackerActivity.java

@@ -57,7 +57,9 @@ public void onCreate(Bundle icicle) {
         mGraphicOverlay = (GraphicOverlay) findViewById(R.id.faceOverlay);
 
         Context context = getApplicationContext();
-        FaceDetector detector = new FaceDetector.Builder(context).build();
+        FaceDetector.Builder detectorBuilder = new FaceDetector.Builder(context);
+        detectorBuilder.setClassificationType(FaceDetector.ALL_CLASSIFICATIONS);
+        FaceDetector detector = detectorBuilder.build();
         detector.setProcessor(
                 new MultiProcessor.Builder<>(new GraphicFaceTrackerFactory()).build());