From 62c2ed606197c8d8e99367f099ac4c30c6015364 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Tue, 2 Apr 2013 17:48:56 -0700
Subject: Improve black bar to keep camera controls in place

Bug: 8340996

Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
---
 res/layout-land/camera_controls.xml | 6 +++---
 res/layout-port/camera_controls.xml | 6 +++---
 res/layout/camera_main.xml          | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index f090e3d54..59a83e008 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -13,13 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.camera.ui.RotatableLayout
+<com.android.camera.ui.CameraControls
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera_controls"
     style="@style/CameraControls"
     android:layout_gravity="center" >
 
-        <com.android.camera.ui.SwitcherBackgroundView
+        <View
             android:id="@+id/blocker"
             android:layout_height="match_parent"
             android:layout_width="@dimen/switcher_size"
@@ -58,4 +58,4 @@
             android:focusable="true"
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
-</com.android.camera.ui.RotatableLayout>
+</com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 7a1221782..e3fdce88a 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -13,13 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.camera.ui.RotatableLayout
+<com.android.camera.ui.CameraControls
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera_controls"
     style="@style/CameraControls"
     android:layout_gravity="center" >
 
-        <com.android.camera.ui.SwitcherBackgroundView
+        <View
             android:id="@+id/blocker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/switcher_size"
@@ -59,4 +59,4 @@
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
 
-</com.android.camera.ui.RotatableLayout>
\ No newline at end of file
+</com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml
index 710e69dbf..fe5913427 100644
--- a/res/layout/camera_main.xml
+++ b/res/layout/camera_main.xml
@@ -13,7 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout 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/content"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -29,4 +30,4 @@
         style="@style/CameraControls"
         android:layout_centerInParent="true" />
 
-</RelativeLayout>
\ No newline at end of file
+</com.android.camera.ui.CameraRootView>
\ No newline at end of file
-- 
cgit v1.2.3