Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a46c372a authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."

parents 7f76a3cf af4f6580

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9365,6 +9365,7 @@ package android.hardware { 
    field public static final int FOCUS_DISTANCE_NEAR_INDEX = 0; // 0x0

    field public static final int FOCUS_DISTANCE_OPTIMAL_INDEX = 1; // 0x1

    field public static final java.lang.String FOCUS_MODE_AUTO = "auto";

    field public static final java.lang.String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";

    field public static final java.lang.String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video";

    field public static final java.lang.String FOCUS_MODE_EDOF = "edof";

    field public static final java.lang.String FOCUS_MODE_FIXED = "fixed";

core/java/android/hardware/Camera.java

+0 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,6 @@ public class Camera { 
         * the focus mode to other modes.

         *

         * @see #FOCUS_MODE_CONTINUOUS_VIDEO

         * @hide

         */

        public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";