Merge "fix print code to support landscape" into gb-ub-photos-carlsbad

[android-x86/packages-apps-Gallery2.git] / res / layout / camera.xml

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index b4ec436..9a3a01a 100644 (file)
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -13,15 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.CameraRootView
+    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" >
-    <!-- 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>
+</com.android.camera.ui.CameraRootView>