Merge pull request #9 from googlesamples/caren/merge_android_snippet_…

…improvements Android code snippets: Update examples to show how to use default options
googlesamples · Jun 8, 2020 · 734af50 · 734af50
2 parents 61a4fe7 + 2c3370b
commit 734af50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...id/android-snippets/app/src/main/java/com/google/example/mlkit/FaceDetectionActivity.java b/...id/android-snippets/app/src/main/java/com/google/example/mlkit/FaceDetectionActivity.java
@@ -56,6 +56,8 @@ private void detectFaces(InputImage image) {
 
         // [START get_detector]
         FaceDetector detector = FaceDetection.getClient(options);
+        // Or, to use the default option:
+        // FaceDetector detector = FaceDetection.getClient();
         // [END get_detector]
 
         // [START run_detector]

diff --git a/...id/android-snippets/app/src/main/java/com/google/example/mlkit/ImageLabelingActivity.java b/...id/android-snippets/app/src/main/java/com/google/example/mlkit/ImageLabelingActivity.java
@@ -86,12 +86,9 @@ public void onFailure(@NonNull Exception e) {
     }
 
     private void configureAndRunImageLabeler(InputImage image) {
-        ImageLabelerOptions options =
-                new ImageLabelerOptions.Builder()
-                        .build();
-
         // [START on_device_image_labeler]
-        ImageLabeler labeler = ImageLabeling.getClient(options);
+        // To use default options:
+        ImageLabeler labeler = ImageLabeling.getClient(ImageLabelerOptions.DEFAULT_OPTIONS);
 
         // Or, to set the minimum confidence required:
         // ImageLabelerOptions options =

diff --git a/...droid-snippets/app/src/main/java/com/google/example/mlkit/kotlin/FaceDetectionActivity.kt b/...droid-snippets/app/src/main/java/com/google/example/mlkit/kotlin/FaceDetectionActivity.kt
@@ -35,6 +35,8 @@ class FaceDetectionActivity : AppCompatActivity() {
 
         // [START get_detector]
         val detector = FaceDetection.getClient(options)
+        // Or, to use the default option:
+        // val detector = FaceDetection.getClient();
         // [END get_detector]
 
         // [START run_detector]

diff --git a/...droid-snippets/app/src/main/java/com/google/example/mlkit/kotlin/ImageLabelingActivity.kt b/...droid-snippets/app/src/main/java/com/google/example/mlkit/kotlin/ImageLabelingActivity.kt
@@ -52,11 +52,9 @@ class ImageLabelingActivity : AppCompatActivity() {
     }
 
     private fun configureAndRunImageLabeler(image: InputImage) {
-        val options = ImageLabelerOptions.Builder()
-                .build()
-
         // [START on_device_image_labeler]
-        val labeler = ImageLabeling.getClient(options)
+        // To use default options:
+        val labeler = ImageLabeling.getClient(ImageLabelerOptions.DEFAULT_OPTIONS)
 
         // Or, to set the minimum confidence required:
         // val options = ImageLabelerOptions.Builder()