Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf

6 files changed, 33 insertions, 89 deletions

diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml
index f5240feed..657c06c1a 100644
--- a/res/layout/camera_main.xml
+++ b/res/layout/camera_main.xml
@@ -21,10 +21,10 @@
     <include layout="@layout/gl_root_group" />
 
     <FrameLayout
-        android:id="@+id/main_content"
+        android:id="@+id/camera_app_root"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <include layout="@layout/camera_shutter_switcher" />
+    <include layout="@layout/camera_controls" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
index 901bb6b7a..9ecbd07f7 100644
--- a/res/layout/panorama_module.xml
+++ b/res/layout/panorama_module.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pano_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <include layout="@layout/pano_module_capture" />
     <include layout="@layout/pano_review" />
-</RelativeLayout>
+</merge>
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index b2ad7028f..abf094e27 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -20,10 +20,20 @@
  need to be recreated in onConfigurationChanged from old photo_module to this
  layout. -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/camera_app_root"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_gravity="center">
     <include layout="@layout/count_down_to_capture"/>
-    <include layout="@layout/photo_module_content"/>
-</FrameLayout>
\ No newline at end of file
+
+    <ViewStub android:id="@+id/face_view_stub"
+        android:inflatedId="@+id/face_view"
+        android:layout="@layout/face_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"/>
+    <com.android.camera.ui.RenderOverlay
+        android:id="@+id/render_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</merge>
\ No newline at end of file
diff --git a/res/layout/preview_module_frame.xml b/res/layout/preview_module_frame.xml
deleted file mode 100644
index 66094c9b7..000000000
--- a/res/layout/preview_module_frame.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-    <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
-            android:layout_centerInParent="true"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-        <include layout="@layout/preview_surface_view"/>
-        <ViewStub android:id="@+id/face_view_stub"
-                android:inflatedId="@+id/face_view"
-                android:layout="@layout/face_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"/>
-        <com.android.camera.ui.RenderOverlay
-            android:id="@+id/render_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </com.android.camera.PreviewFrameLayout>
-    <ImageView android:id="@+id/capture_anim_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layerType="hardware"
-            android:visibility="gone"/>
-</RelativeLayout>
diff --git a/res/layout/preview_surface_view.xml b/res/layout/preview_surface_view.xml
deleted file mode 100644
index cdaf0eea9..000000000
--- a/res/layout/preview_surface_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2012, 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.
--->
-<com.android.camera.ui.PreviewSurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/preview_surface_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"/>
diff --git a/res/layout/preview_module_frame_video.xml b/res/layout/video_module.xml
index 3418faf19..790f3eb91 100644
--- a/res/layout/preview_module_frame_video.xml
+++ b/res/layout/video_module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -13,16 +13,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/frame_layout"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_weight="1">
+<!-- This layout is shared by phone and tablet in landscape orientation. -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_app_root"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
     <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
-            android:layout_centerInParent="true">
-        <include layout="@layout/preview_surface_view"/>
+            android:layout_gravity="center">
+        <com.android.camera.ui.PreviewSurfaceView
+                android:id="@+id/preview_surface_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
         <FrameLayout android:id="@+id/preview_border"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -41,7 +45,7 @@
                 android:layout_width="match_parent"
                 android:visibility="gone"
                 android:background="@android:color/black"/>
-        <com.android.camera.ui.RotateImageView
+        <ImageView
                 android:id="@+id/btn_play"
                 style="@style/ReviewControlIcon"
                 android:layout_centerInParent="true"
@@ -50,11 +54,4 @@
                 android:onClick="onReviewPlayClicked"/>
     </com.android.camera.PreviewFrameLayout>
 
-    <ImageView android:id="@+id/capture_anim_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layerType="hardware"
-            android:visibility="gone"/>
-
-</RelativeLayout>
-
+</merge>