Add new camera activity back and fix build errors

Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0

1 files changed, 27 insertions, 0 deletions

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
new file mode 100644
index 000000000..b4ec436c6
--- /dev/null
+++ b/res/layout/camera.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    <!-- NewCameraRootView needs to be in a FrameLayout to set margins
+         in the layout parameters. -->
+    <com.android.camera.ui.NewCameraRootView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/camera_app_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+    </com.android.camera.ui.NewCameraRootView>
+</FrameLayout>