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

Commit 63e97ef8 authored by Srinivasan Kannan's avatar Srinivasan Kannan Committed by Steve Kondik
Browse files

Camera: Adding normal and macro auto focus modes

parent acd962f5

api/current.xml

100755 → 100644
+11 −0
Original line number Diff line number Diff line
@@ -68919,6 +68919,17 @@ 
 visibility="public"

>

</field>

<field name="FOCUS_MODE_NORMAL"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;normal&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SCENE_MODE_ACTION"

 type="java.lang.String"

 transient="false"

core/java/android/hardware/Camera.java

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ public class Camera { 
         * {@link #autoFocus(AutoFocusCallback)} in this mode.

         */

        public static final String FOCUS_MODE_INFINITY = "infinity";

        public static final String FOCUS_MODE_NORMAL = "normal";

        public static final String FOCUS_MODE_MACRO = "macro";



        /**

include/ui/CameraParameters.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ public: 
    // Focus is set at infinity. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_INFINITY[];

    static const char FOCUS_MODE_NORMAL[];

    static const char FOCUS_MODE_MACRO[];

    // Focus is fixed. The camera is always in this mode if the focus is not

    // adjustable. If the camera has auto-focus, this mode can fix the

libs/ui/CameraParameters.cpp

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg"; 
// Values for focus mode settings.

const char CameraParameters::FOCUS_MODE_AUTO[] = "auto";

const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity";

const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal";

const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";

const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";