Skip to content

Commit 46ec1b4

Browse files
committed
Added StringDef annotations to focus and flash mode setters
1 parent 592d492 commit 46ec1b4

File tree

1 file changed

+25
-2
lines changed
  • visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera

1 file changed

+25
-2
lines changed

visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.os.Build;
2626
import android.os.SystemClock;
2727
import android.support.annotation.RequiresPermission;
28+
import android.support.annotation.StringDef;
2829
import android.util.Log;
2930
import android.view.Surface;
3031
import android.view.SurfaceHolder;
@@ -85,6 +86,28 @@ public class CameraSource {
8586
* ratio is less than this tolerance, they are considered to be the same aspect ratio.
8687
*/
8788
private static final float ASPECT_RATIO_TOLERANCE = 0.01f;
89+
90+
@StringDef({
91+
Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE,
92+
Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO,
93+
Camera.Parameters.FOCUS_MODE_AUTO,
94+
Camera.Parameters.FOCUS_MODE_EDOF,
95+
Camera.Parameters.FOCUS_MODE_FIXED,
96+
Camera.Parameters.FOCUS_MODE_INFINITY,
97+
Camera.Parameters.FOCUS_MODE_MACRO
98+
})
99+
@Retention(RetentionPolicy.SOURCE)
100+
private @interface FocusMode {}
101+
102+
@StringDef({
103+
Camera.Parameters.FLASH_MODE_ON,
104+
Camera.Parameters.FLASH_MODE_OFF,
105+
Camera.Parameters.FLASH_MODE_AUTO,
106+
Camera.Parameters.FLASH_MODE_RED_EYE,
107+
Camera.Parameters.FLASH_MODE_TORCH
108+
})
109+
@Retention(RetentionPolicy.SOURCE)
110+
private @interface FlashMode {}
88111

89112
private Context mContext;
90113

@@ -172,12 +195,12 @@ public Builder setRequestedFps(float fps) {
172195
return this;
173196
}
174197

175-
public Builder setFocusMode(String mode) {
198+
public Builder setFocusMode(@FocusMode String mode) {
176199
mCameraSource.mFocusMode = mode;
177200
return this;
178201
}
179202

180-
public Builder setFlashMode(String mode) {
203+
public Builder setFlashMode(@FlashMode String mode) {
181204
mCameraSource.mFlashMode = mode;
182205
return this;
183206
}

0 commit comments

Comments
 (0)