Skip to content

Commit 16f2b3a

Browse files
Google ML KitLei Yu
Google ML Kit
authored and
Lei Yu
committed
List of included changes:
 - Remove beta tag for text recognition CDJK. PiperOrigin-RevId: 509330510 Change-Id: I0974a4bd2b1578fe8d78e53fa8708eb773a2817d
1 parent 592c82e commit 16f2b3a

File tree

8 files changed

+46
-34
lines changed

8 files changed

+46
-34
lines changed

‎android/vision-quickstart/app/build.gradle

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,26 @@ dependencies {
7474
// implementation 'com.google.android.gms:play-services-mlkit-face-detection:17.1.0'
7575

7676
// Text features
77-
implementation 'com.google.mlkit:text-recognition:16.0.0-beta6'
77+
implementation 'com.google.mlkit:text-recognition:16.0.0'
7878
// Or comment the dependency above and uncomment the dependency below to
7979
// use unbundled model that depends on Google Play Services
80-
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.2'
81-
implementation 'com.google.mlkit:text-recognition-chinese:16.0.0-beta6'
82-
implementation 'com.google.mlkit:text-recognition-devanagari:16.0.0-beta6'
83-
implementation 'com.google.mlkit:text-recognition-japanese:16.0.0-beta6'
84-
implementation 'com.google.mlkit:text-recognition-korean:16.0.0-beta6'
80+
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition:19.0.0'
81+
implementation 'com.google.mlkit:text-recognition-chinese:16.0.0'
82+
// Or comment the dependency above and uncomment the dependency below to
83+
// use unbundled model that depends on Google Play Services
84+
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition-chinese:16.0.0'
85+
implementation 'com.google.mlkit:text-recognition-devanagari:16.0.0'
86+
// Or comment the dependency above and uncomment the dependency below to
87+
// use unbundled model that depends on Google Play Services
88+
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition-devanagari:16.0.0'
89+
implementation 'com.google.mlkit:text-recognition-japanese:16.0.0'
90+
// Or comment the dependency above and uncomment the dependency below to
91+
// use unbundled model that depends on Google Play Services
92+
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition-japanese:16.0.0'
93+
implementation 'com.google.mlkit:text-recognition-korean:16.0.0'
94+
// Or comment the dependency above and uncomment the dependency below to
95+
// use unbundled model that depends on Google Play Services
96+
// implementation 'com.google.android.gms:play-services-mlkit-text-recognition-korean:16.0.0'
8597

8698
// Image labeling
8799
implementation 'com.google.mlkit:image-labeling:17.0.7'

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/java/CameraXLivePreviewActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public final class CameraXLivePreviewActivity extends AppCompatActivity
9292
private static final String POSE_DETECTION = "Pose Detection";
9393
private static final String SELFIE_SEGMENTATION = "Selfie Segmentation";
9494
private static final String TEXT_RECOGNITION_LATIN = "Text Recognition Latin";
95-
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)";
96-
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)";
97-
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)";
98-
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)";
95+
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese";
96+
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari";
97+
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese";
98+
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean";
9999
private static final String FACE_MESH_DETECTION = "Face Mesh Detection (Beta)";
100100

101101
private static final String STATE_SELECTED_MODEL = "selected_model";

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/java/LivePreviewActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public final class LivePreviewActivity extends AppCompatActivity
7575
private static final String POSE_DETECTION = "Pose Detection";
7676
private static final String SELFIE_SEGMENTATION = "Selfie Segmentation";
7777
private static final String TEXT_RECOGNITION_LATIN = "Text Recognition Latin";
78-
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)";
79-
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)";
80-
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)";
81-
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)";
78+
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese";
79+
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari";
80+
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese";
81+
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean";
8282
private static final String FACE_MESH_DETECTION = "Face Mesh Detection (Beta)";
8383

8484
private static final String TAG = "LivePreviewActivity";

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/java/StillImageActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public final class StillImageActivity extends AppCompatActivity {
8686
private static final String POSE_DETECTION = "Pose Detection";
8787
private static final String SELFIE_SEGMENTATION = "Selfie Segmentation";
8888
private static final String TEXT_RECOGNITION_LATIN = "Text Recognition Latin";
89-
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)";
90-
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)";
91-
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)";
92-
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)";
89+
private static final String TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese";
90+
private static final String TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari";
91+
private static final String TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese";
92+
private static final String TEXT_RECOGNITION_KOREAN = "Text Recognition Korean";
9393
private static final String FACE_MESH_DETECTION = "Face Mesh Detection (Beta)";
9494

9595
private static final String SIZE_SCREEN = "w:screen"; // Match screen width

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/kotlin/CameraXLivePreviewActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ import com.google.mlkit.vision.demo.R
5050
import com.google.mlkit.vision.demo.VisionImageProcessor
5151
import com.google.mlkit.vision.demo.kotlin.barcodescanner.BarcodeScannerProcessor
5252
import com.google.mlkit.vision.demo.kotlin.facedetector.FaceDetectorProcessor
53+
import com.google.mlkit.vision.demo.kotlin.facemeshdetector.FaceMeshDetectorProcessor
5354
import com.google.mlkit.vision.demo.kotlin.labeldetector.LabelDetectorProcessor
5455
import com.google.mlkit.vision.demo.kotlin.objectdetector.ObjectDetectorProcessor
5556
import com.google.mlkit.vision.demo.kotlin.posedetector.PoseDetectorProcessor
5657
import com.google.mlkit.vision.demo.kotlin.segmenter.SegmenterProcessor
57-
import com.google.mlkit.vision.demo.kotlin.facemeshdetector.FaceMeshDetectorProcessor;
5858
import com.google.mlkit.vision.demo.kotlin.textdetector.TextRecognitionProcessor
5959
import com.google.mlkit.vision.demo.preference.PreferenceUtils
6060
import com.google.mlkit.vision.demo.preference.SettingsActivity
@@ -404,10 +404,10 @@ class CameraXLivePreviewActivity :
404404
private const val CUSTOM_AUTOML_OBJECT_DETECTION = "Custom AutoML Object Detection (Flower)"
405405
private const val FACE_DETECTION = "Face Detection"
406406
private const val TEXT_RECOGNITION_LATIN = "Text Recognition Latin"
407-
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)"
408-
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)"
409-
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)"
410-
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)"
407+
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese"
408+
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari"
409+
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese"
410+
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean"
411411
private const val BARCODE_SCANNING = "Barcode Scanning"
412412
private const val IMAGE_LABELING = "Image Labeling"
413413
private const val IMAGE_LABELING_CUSTOM = "Custom Image Labeling (Birds)"

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/kotlin/LivePreviewActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import com.google.mlkit.vision.demo.GraphicOverlay
3737
import com.google.mlkit.vision.demo.R
3838
import com.google.mlkit.vision.demo.kotlin.barcodescanner.BarcodeScannerProcessor
3939
import com.google.mlkit.vision.demo.kotlin.facedetector.FaceDetectorProcessor
40+
import com.google.mlkit.vision.demo.kotlin.facemeshdetector.FaceMeshDetectorProcessor
4041
import com.google.mlkit.vision.demo.kotlin.labeldetector.LabelDetectorProcessor
4142
import com.google.mlkit.vision.demo.kotlin.objectdetector.ObjectDetectorProcessor
4243
import com.google.mlkit.vision.demo.kotlin.posedetector.PoseDetectorProcessor
4344
import com.google.mlkit.vision.demo.kotlin.segmenter.SegmenterProcessor
44-
import com.google.mlkit.vision.demo.kotlin.facemeshdetector.FaceMeshDetectorProcessor;
4545
import com.google.mlkit.vision.demo.kotlin.textdetector.TextRecognitionProcessor
4646
import com.google.mlkit.vision.demo.preference.PreferenceUtils
4747
import com.google.mlkit.vision.demo.preference.SettingsActivity
@@ -343,10 +343,10 @@ class LivePreviewActivity :
343343
private const val CUSTOM_AUTOML_OBJECT_DETECTION = "Custom AutoML Object Detection (Flower)"
344344
private const val FACE_DETECTION = "Face Detection"
345345
private const val TEXT_RECOGNITION_LATIN = "Text Recognition Latin"
346-
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)"
347-
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)"
348-
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)"
349-
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)"
346+
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese"
347+
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari"
348+
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese"
349+
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean"
350350
private const val BARCODE_SCANNING = "Barcode Scanning"
351351
private const val IMAGE_LABELING = "Image Labeling"
352352
private const val IMAGE_LABELING_CUSTOM = "Custom Image Labeling (Birds)"

‎android/vision-quickstart/app/src/main/java/com/google/mlkit/vision/demo/kotlin/StillImageActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,10 @@ class StillImageActivity : AppCompatActivity() {
556556
private const val FACE_DETECTION = "Face Detection"
557557
private const val BARCODE_SCANNING = "Barcode Scanning"
558558
private const val TEXT_RECOGNITION_LATIN = "Text Recognition Latin"
559-
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese (Beta)"
560-
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari (Beta)"
561-
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese (Beta)"
562-
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean (Beta)"
559+
private const val TEXT_RECOGNITION_CHINESE = "Text Recognition Chinese"
560+
private const val TEXT_RECOGNITION_DEVANAGARI = "Text Recognition Devanagari"
561+
private const val TEXT_RECOGNITION_JAPANESE = "Text Recognition Japanese"
562+
private const val TEXT_RECOGNITION_KOREAN = "Text Recognition Korean"
563563
private const val IMAGE_LABELING = "Image Labeling"
564564
private const val IMAGE_LABELING_CUSTOM = "Custom Image Labeling (Birds)"
565565
private const val CUSTOM_AUTOML_LABELING = "Custom AutoML Image Labeling (Flower)"

‎android/vision-quickstart/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
buildscript {
44

55
repositories {
6-
google()
76
mavenCentral()
87
mavenLocal()
8+
google()
99
}
1010
dependencies {
1111
classpath 'com.android.tools.build:gradle:7.0.3'
@@ -18,9 +18,9 @@ buildscript {
1818

1919
allprojects {
2020
repositories {
21-
google()
2221
mavenCentral()
2322
mavenLocal()
23+
google()
2424
}
2525
}
2626

0 commit comments

Comments
 (0)