Camera: Rename photography -> camera2

Change-Id: I3d7235b9a82bd5b5c32dab5c9c0bf0718ebf0447

diff --git a/camera/docs/CameraMetadataKeys.mako b/camera/docs/CameraMetadataKeys.mako
index 2879d83..0ba54b3 100644 (file)
--- a/camera/docs/CameraMetadataKeys.mako
+++ b/camera/docs/CameraMetadataKeys.mako
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package android.hardware.photography;
+package android.hardware.camera2;
 
-import static android.hardware.photography.CameraMetadata.Key;
+import static android.hardware.camera2.CameraMetadata.Key;
 
 /**
  * ! Do not edit this file directly !

diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index ef19343..6f8b0c5 100755 (executable)
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -29,7 +29,7 @@ if [[ -z $ANDROID_BUILD_TOP ]]; then
 fi
 
 thisdir=$(cd "$(dirname "$0")"; pwd)
-fwkdir="$ANDROID_BUILD_TOP/frameworks/base/core/java/android/hardware/photography/"
+fwkdir="$ANDROID_BUILD_TOP/frameworks/base/core/java/android/hardware/camera2/"
 out_files=()
 
 function relpath() {

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 1e4fc17..31b07cc 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -46,7 +46,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
       <language name="java">android.graphics.Rect</language>
     </typedef>
     <typedef name="size">
-      <language name="java">android.hardware.photography.Size</language>
+      <language name="java">android.hardware.camera2.Size</language>
     </typedef>
     <typedef name="string">
       <language name="java">String</language>