OSDN Git Service

camera_metadata: Change android.lens.focusRange typedef to a float pair
authorIgor Murashkin <iam@google.com>
Fri, 30 May 2014 17:51:40 +0000 (10:51 -0700)
committerIgor Murashkin <iam@google.com>
Fri, 30 May 2014 18:23:43 +0000 (11:23 -0700)
Bug: 15335269
Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40

camera/docs/docs.html
camera/docs/metadata_properties.xml

index ff4728c..29a1503 100644 (file)
@@ -10458,7 +10458,7 @@ measured from frontmost surface of the lens</p>
                 <span class="entry_type_array">
                   2
                 </span>
-              <span class="entry_type_visibility"> [public as rangeFloat]</span>
+              <span class="entry_type_visibility"> [public as pairFloatFloat]</span>
 
 
 
index 9ce7294..1f3cb8c 100644 (file)
@@ -40,6 +40,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
   </tags>
 
   <types>
+    <typedef name="pairFloatFloat">
+      <language name="java">android.util.Pair&lt;Float,Float&gt;</language>
+    </typedef>
     <typedef name="rectangle">
       <language name="java">android.graphics.Rect</language>
     </typedef>
@@ -2573,7 +2576,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         </clone>
         <entry name="focusRange" type="float" visibility="public"
         type_notes="Range of scene distances that are in focus"
-        container="array" typedef="rangeFloat">
+        container="array" typedef="pairFloatFloat">
           <array>
             <size>2</size>
           </array>