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

Commit 48a2ba56 authored by Steve Kondik's avatar Steve Kondik
Browse files

camera: Use int values instead of floats where applicable 

Settings for brightness/contrast/saturation/sharpness are integers, not
floats. Update API to reflect this.
parent 2a1b7ec9

api/current.xml

+16 −16
Original line number Diff line number Diff line
@@ -71977,7 +71977,7 @@ 
>

</method>

<method name="getBrightness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -71999,7 +71999,7 @@ 
>

</method>

<method name="getContrast"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72010,7 +72010,7 @@ 
>

</method>

<method name="getDefaultBrightness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72021,7 +72021,7 @@ 
>

</method>

<method name="getDefaultContrast"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72032,7 +72032,7 @@ 
>

</method>

<method name="getDefaultSaturation"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72043,7 +72043,7 @@ 
>

</method>

<method name="getDefaultSharpness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72188,7 +72188,7 @@ 
>

</method>

<method name="getMaxBrightness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72199,7 +72199,7 @@ 
>

</method>

<method name="getMaxContrast"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72221,7 +72221,7 @@ 
>

</method>

<method name="getMaxSaturation"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72232,7 +72232,7 @@ 
>

</method>

<method name="getMaxSharpness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72320,7 +72320,7 @@ 
>

</method>

<method name="getSaturation"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72342,7 +72342,7 @@ 
>

</method>

<method name="getSharpness"

 return="float"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -72684,7 +72684,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="brightness" type="float">

<parameter name="brightness" type="int">

</parameter>

</method>

<method name="setColorEffect"
@@ -72710,7 +72710,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="contrast" type="float">

<parameter name="contrast" type="int">

</parameter>

</method>

<method name="setExposureCompensation"
@@ -72976,7 +72976,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="saturation" type="float">

<parameter name="saturation" type="int">

</parameter>

</method>

<method name="setSceneMode"
@@ -73002,7 +73002,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="sharpness" type="float">

<parameter name="sharpness" type="int">

</parameter>

</method>

<method name="setSmartContrastEnabled"

core/java/android/hardware/Camera.java

+35 −35
Original line number Diff line number Diff line
@@ -1687,8 +1687,8 @@ public class Camera { 
         *

         * @return sharpness level

         */

        public float getSharpness(){

            return getFloat(KEY_SHARPNESS, 0.0f);

        public int getSharpness(){

            return getInt(KEY_SHARPNESS, 0);

        }



        /**
@@ -1696,7 +1696,7 @@ public class Camera { 
         *

         * @param sharpness level

         */

        public void setSharpness(float sharpness){

        public void setSharpness(int sharpness){

            if((sharpness < 0) || (sharpness > getMaxSharpness()) )

                throw new IllegalArgumentException(

                        "Invalid Sharpness " + sharpness);
@@ -1709,8 +1709,8 @@ public class Camera { 
         *

         * @return max sharpness level

         */

        public float getMaxSharpness(){

            return getFloat(KEY_MAX_SHARPNESS, 0.0f);

        public int getMaxSharpness(){

            return getInt(KEY_MAX_SHARPNESS, 0);

        }



        /**
@@ -1718,8 +1718,8 @@ public class Camera { 
         * 

         * @return default sharpness level

         */

        public float getDefaultSharpness() {

            return getFloat(KEY_DEFAULT_SHARPNESS, 0.0f);

        public int getDefaultSharpness() {

            return getInt(KEY_DEFAULT_SHARPNESS, 0);

        }



        /**
@@ -1727,8 +1727,8 @@ public class Camera { 
         *

         * @return contrast level

         */

        public float getContrast(){

            return getFloat(KEY_CONTRAST, 0.0f);

        public int getContrast(){

            return getInt(KEY_CONTRAST, 0);

        }



        /**
@@ -1736,7 +1736,7 @@ public class Camera { 
         *

         * @param contrast level

         */

        public void setContrast(float contrast){

        public void setContrast(int contrast){

            if((contrast < 0 ) || (contrast > getMaxContrast()))

                throw new IllegalArgumentException(

                        "Invalid Contrast " + contrast);
@@ -1749,8 +1749,8 @@ public class Camera { 
         *

         * @return max contrast level

         */

        public float getMaxContrast(){

            return getFloat(KEY_MAX_CONTRAST, 0.0f);

        public int getMaxContrast(){

            return getInt(KEY_MAX_CONTRAST, 0);

        }



        /**
@@ -1758,8 +1758,8 @@ public class Camera { 
         * 

         * @return default contrast level

         */

        public float getDefaultContrast() {

            return getFloat(KEY_DEFAULT_CONTRAST, 0.0f);

        public int getDefaultContrast() {

            return getInt(KEY_DEFAULT_CONTRAST, 0);

        }



        /**
@@ -1767,8 +1767,8 @@ public class Camera { 
         *

         * @return saturation level

         */

        public float getSaturation(){

            return getFloat(KEY_SATURATION, 0.0f);

        public int getSaturation(){

            return getInt(KEY_SATURATION, 0);

        }



        /**
@@ -1776,7 +1776,7 @@ public class Camera { 
         *

         * @param saturation level

         */

        public void setSaturation(float saturation){

        public void setSaturation(int saturation){

            if((saturation < 0 ) || (saturation > getMaxSaturation()))

                throw new IllegalArgumentException(

                        "Invalid Saturation " + saturation);
@@ -1789,8 +1789,8 @@ public class Camera { 
         *

         * @return max contrast level

         */

        public float getMaxSaturation(){

            return getFloat(KEY_MAX_SATURATION, 0.0f);

        public int getMaxSaturation(){

            return getInt(KEY_MAX_SATURATION, 0);

        }



        /**
@@ -1798,8 +1798,8 @@ public class Camera { 
         * 

         * @return default saturation level

         */

        public float getDefaultSaturation() {

            return getFloat(KEY_DEFAULT_SATURATION, 0.0f);

        public int getDefaultSaturation() {

            return getInt(KEY_DEFAULT_SATURATION, 0);

        }



        /**
@@ -1807,8 +1807,8 @@ public class Camera { 
         *

         * @return brightness level

         */

        public float getBrightness(){

            return getFloat(KEY_BRIGHTNESS, 0.0f);

        public int getBrightness(){

            return getInt(KEY_BRIGHTNESS, 0);

        }



        /**
@@ -1816,7 +1816,7 @@ public class Camera { 
         *

         * @param brightness level

         */

        public void setBrightness(float brightness){

        public void setBrightness(int brightness){

            if((brightness < 0 ) || (brightness > getMaxBrightness()))

                throw new IllegalArgumentException(

                        "Invalid Brightness " + brightness);
@@ -1829,8 +1829,8 @@ public class Camera { 
         *

         * @return max brightness level

         */

        public float getMaxBrightness(){

            return getFloat(KEY_MAX_BRIGHTNESS, 0.0f);

        public int getMaxBrightness(){

            return getInt(KEY_MAX_BRIGHTNESS, 0);

        }



        /**
@@ -1838,8 +1838,8 @@ public class Camera { 
         * 

         * @return default brightness level

         */

        public float getDefaultBrightness() {

            return getFloat(KEY_DEFAULT_BRIGHTNESS, 0.0f);

        public int getDefaultBrightness() {

            return getInt(KEY_DEFAULT_BRIGHTNESS, 0);

        }



        /**