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

Commit 75a9cbae authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android Git Automerger
Browse files

am 3f4639a6: Update API and javadoc according to API review. 

Merge commit '3f4639a6' into froyo-plus-aosp

* commit '3f4639a6':
  Update API and javadoc according to API review.
parents a599469f 3f4639a6

api/current.xml

+27 −27
Original line number Diff line number Diff line
@@ -71656,7 +71656,7 @@ 
<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setZoomCallback"

<method name="setZoomChangeListener"

 return="void"

 abstract="false"

 native="false"
@@ -71666,7 +71666,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cb" type="android.hardware.Camera.ZoomCallback">

<parameter name="listener" type="android.hardware.Camera.OnZoomChangeListener">

</parameter>

</method>

<method name="startPreview"
@@ -71831,6 +71831,31 @@ 
</parameter>

</method>

</interface>

<interface name="Camera.OnZoomChangeListener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onZoomChange"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="stopped" type="boolean">

</parameter>

<parameter name="camera" type="android.hardware.Camera">

</parameter>

</method>

</interface>

<class name="Camera.Parameters"

 extends="java.lang.Object"

 abstract="false"
@@ -73255,31 +73280,6 @@ 
>

</field>

</class>

<interface name="Camera.ZoomCallback"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onZoomUpdate"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="stopped" type="boolean">

</parameter>

<parameter name="camera" type="android.hardware.Camera">

</parameter>

</method>

</interface>

<class name="GeomagneticField"

 extends="java.lang.Object"

 abstract="false"

core/java/android/hardware/Camera.java

+139 −77

File changed.

Preview size limit exceeded, changes collapsed.