Keep camera controls on the same physical side

Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a

3 files changed, 34 insertions, 58 deletions

diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index a909c5132..f0f3ecca2 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -13,21 +13,16 @@
      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.RotatableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <com.android.camera.ui.RotatableLayout
-        style="@style/CameraControls"
-        android:id="@+id/menu_button"
-        android:layout_gravity="center" >
+    style="@style/CameraControls"
+    android:layout_gravity="center" >
 
         <View
             android:id="@+id/blocker"
             android:layout_height="match_parent"
             android:layout_width="@dimen/switcher_size"
-            android:background="@drawable/switcher_bg"
             android:clickable="true"
             android:layout_gravity="right" />
 
@@ -44,30 +39,23 @@
             android:contentDescription="@string/accessibility_menu_button"
             android:layout_gravity="right|top"
             android:layout_marginRight="2dip" />
-    </com.android.camera.ui.RotatableLayout>
 
-    <com.android.camera.ui.RotatableLayout
-        style="@style/CameraControls"
-        android:id="@+id/switcher_control"
-        android:layout_gravity="right|center_horizontal" >
         <com.android.camera.ui.CameraSwitcher
             android:id="@+id/camera_switcher"
             style="@style/SwitcherButton"
             android:layout_gravity="right|bottom"
             android:layout_marginRight="2dip"
             android:contentDescription="@string/accessibility_mode_picker" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|center_vertical"
-        android:layout_marginRight="@dimen/shutter_offset"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="center"
-        android:src="@drawable/btn_new_shutter" />
 
-</FrameLayout>
\ No newline at end of file
+        <com.android.camera.ShutterButton
+            android:id="@+id/shutter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginRight="@dimen/shutter_offset"
+            android:clickable="true"
+            android:contentDescription="@string/accessibility_shutter_button"
+            android:focusable="true"
+            android:scaleType="center"
+            android:src="@drawable/btn_new_shutter" />
+</com.android.camera.ui.RotatableLayout>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index caad86860..7108b3c16 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -13,22 +13,17 @@
      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.RotatableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-   <com.android.camera.ui.RotatableLayout
-        style="@style/CameraControls"
-        android:id="@+id/menu_button"
-        android:layout_gravity="center" >
+    style="@style/CameraControls"
+    android:layout_gravity="center" >
 
         <View
             android:id="@+id/blocker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/switcher_size"
             android:layout_gravity="bottom"
-            android:background="@drawable/switcher_bg"
             android:clickable="true" />
 
         <include layout="@layout/menu_indicators"
@@ -45,31 +40,23 @@
             android:layout_marginBottom="2dip"
             android:contentDescription="@string/accessibility_menu_button" />
 
-    </com.android.camera.ui.RotatableLayout>
-
-   <com.android.camera.ui.RotatableLayout
-        style="@style/CameraControls"
-        android:id="@+id/switcher_control"
-        android:layout_gravity="bottom|center_horizontal">
-
        <com.android.camera.ui.CameraSwitcher
            android:id="@+id/camera_switcher"
            style="@style/SwitcherButton"
            android:layout_gravity="bottom|left"
            android:layout_marginBottom="2dip"
            android:contentDescription="@string/accessibility_mode_picker" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="@dimen/shutter_offset"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="center"
-        android:src="@drawable/btn_new_shutter" />
 
-</FrameLayout>
\ No newline at end of file
+        <com.android.camera.ShutterButton
+            android:id="@+id/shutter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginBottom="@dimen/shutter_offset"
+            android:clickable="true"
+            android:contentDescription="@string/accessibility_shutter_button"
+            android:focusable="true"
+            android:scaleType="center"
+            android:src="@drawable/btn_new_shutter" />
+
+</com.android.camera.ui.RotatableLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 581c76173..c51b8375a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,4 +91,5 @@
     <dimen name="margin_systemui_offset">6dip</dimen>
     <dimen name="size_thumbnail">200dip</dimen>
     <dimen name="size_preview">600dip</dimen>
+    <dimen name="navigation_bar_height">48dip</dimen>
 </resources>