From b0bfef5c19689d11b0448779963b37f4c7a69662 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 4 Aug 2016 12:50:34 -0700
Subject: camera2: Fix merge issues

Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
---
 res/layout/camera.xml         |  4 ++--
 res/layout/capture_module.xml | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index a71460066..7ca37e43b 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -13,7 +13,7 @@
      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.CameraRootFrame xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera_root_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -37,4 +37,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
     </com.android.camera.ui.CameraRootView>
-</FrameLayout>
+</com.android.camera.ui.CameraRootFrame>
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 07594cef3..26ac8617d 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -51,6 +51,16 @@
         android:layout_height="match_parent"
         android:background="@android:color/black" />
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.android.camera.ui.focus.FocusRingView
+            android:id="@+id/focus_ring"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-- 
cgit v1.2.3