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

Commit 6c8d2760 authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Add focal length and view angle API. 

bug:2375989,2375987
parent 4c4300c7

api/current.xml

+33 −0
Original line number Diff line number Diff line
@@ -70193,6 +70193,17 @@ 
 visibility="public"

>

</method>

<method name="getFocalLength"

 return="float"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFocusMode"

 return="java.lang.String"

 abstract="false"
@@ -70204,6 +70215,17 @@ 
 visibility="public"

>

</method>

<method name="getHorizontalViewAngle"

 return="float"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getInt"

 return="int"

 abstract="false"
@@ -70448,6 +70470,17 @@ 
 visibility="public"

>

</method>

<method name="getVerticalViewAngle"

 return="float"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getWhiteBalance"

 return="java.lang.String"

 abstract="false"

core/java/android/hardware/Camera.java

+33 −0
Original line number Diff line number Diff line
@@ -720,6 +720,9 @@ public class Camera { 
        private static final String KEY_SCENE_MODE = "scene-mode";

        private static final String KEY_FLASH_MODE = "flash-mode";

        private static final String KEY_FOCUS_MODE = "focus-mode";

        private static final String KEY_FOCAL_LENGTH = "focal-length";

        private static final String KEY_HORIZONTAL_VIEW_ANGLE = "horizontal-view-angle";

        private static final String KEY_VERTICAL_VIEW_ANGLE = "vertical-view-angle";

        // Parameter key suffix for supported values.

        private static final String SUPPORTED_VALUES_SUFFIX = "-values";
@@ -1506,6 +1509,36 @@ public class Camera { 
            return split(str);

        }



        /**

         * Gets the focal length (in millimeter) of the camera.

         *

         * @return the focal length. This method will always return a valid

         *         value.

         */

        public float getFocalLength() {

            return Float.parseFloat(get(KEY_FOCAL_LENGTH));

        }



        /**

         * Gets the horizontal angle of view in degrees.

         *

         * @return horizontal angle of view. This method will always return a

         *         valid value.

         */

        public float getHorizontalViewAngle() {

            return Float.parseFloat(get(KEY_HORIZONTAL_VIEW_ANGLE));

        }



        /**

         * Gets the vertical angle of view in degrees.

         *

         * @return vertical angle of view. This method will always return a

         *         valid value.

         */

        public float getVerticalViewAngle() {

            return Float.parseFloat(get(KEY_VERTICAL_VIEW_ANGLE));

        }



        /**

         * Gets current zoom value. This also works when smooth zoom is in

         * progress.

include/ui/CameraParameters.h

+10 −0
Original line number Diff line number Diff line
@@ -176,6 +176,16 @@ public: 
    // Supported focus modes.

    // Example value: "auto,macro,fixed". Read only.

    static const char KEY_SUPPORTED_FOCUS_MODES[];

    // Focal length in millimeter.

    // Example value: "4.31". Read only.

    static const char KEY_FOCAL_LENGTH[];

    // Horizontal angle of view in degrees.

    // Example value: "54.8". Read only.

    static const char KEY_HORIZONTAL_VIEW_ANGLE[];

    // Vertical angle of view in degrees.

    // Example value: "42.5". Read only.

    static const char KEY_VERTICAL_VIEW_ANGLE[];





        // Values for white balance settings.

    static const char WHITE_BALANCE_AUTO[];

libs/ui/CameraParameters.cpp

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ const char CameraParameters::KEY_FLASH_MODE[] = "flash-mode"; 
const char CameraParameters::KEY_SUPPORTED_FLASH_MODES[] = "flash-mode-values";

const char CameraParameters::KEY_FOCUS_MODE[] = "focus-mode";

const char CameraParameters::KEY_SUPPORTED_FOCUS_MODES[] = "focus-mode-values";

const char CameraParameters::KEY_FOCAL_LENGTH[] = "focal-length";

const char CameraParameters::KEY_HORIZONTAL_VIEW_ANGLE[] = "horizontal-view-angle";

const char CameraParameters::KEY_VERTICAL_VIEW_ANGLE[] = "vertical-view-angle";



// Values for white balance settings.

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