From 00e8c21eda3c2d84f040e513675a1400094536e9 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Fri, 18 Nov 2016 17:59:15 -0800
Subject: snap: Fix preview overlays

 * Fix Z-order and touch focus

Change-Id: I05891f6b6c1c5e9a0a9b1142c0613c08fb451bd1
---
 res/layout/capture_module.xml | 32 +++++++++++++-------------------
 res/layout/photo_module.xml   | 34 ++++++++++++++++------------------
 res/layout/video_module.xml   | 34 ++++++++++++++++------------------
 3 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index d52a8fa5b..4ba1818fc 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -50,28 +50,22 @@
         android:layout_height="match_parent"
         android:background="@android:color/black" />
 
-    <FrameLayout
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.android.camera.ui.Camera2FaceView
-            android:id="@+id/face_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"/>
-
-		<com.android.camera.ui.focus.FocusRingView
-			android:id="@+id/focus_ring"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent" />
+        android:layout_height="match_parent" />
 
-		<com.android.camera.ui.CaptureAnimationOverlay
-			android:id="@+id/capture_overlay"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:visibility="gone" />
+    <com.android.camera.ui.CaptureAnimationOverlay
+        android:id="@+id/capture_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 
-	</FrameLayout>
+    <com.android.camera.ui.Camera2FaceView
+        android:id="@+id/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"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index d97298909..372596c3a 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -44,25 +44,23 @@
         android:layout_height="match_parent"
         android:background="@android:color/black" />
 
-    <FrameLayout
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <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.focus.FocusRingView
-            android:id="@+id/focus_ring"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-        <com.android.camera.ui.CaptureAnimationOverlay
-            android:id="@+id/capture_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone" />
-    </FrameLayout>
+        android:layout_height="match_parent" />
+
+    <com.android.camera.ui.CaptureAnimationOverlay
+        android:id="@+id/capture_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <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"
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index a6024d5d5..3091e2155 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -36,25 +36,23 @@
         android:layout_height="match_parent"
         android:background="@android:color/black" />
 
-    <FrameLayout
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <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.focus.FocusRingView
-            android:id="@+id/focus_ring"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-        <com.android.camera.ui.CaptureAnimationOverlay
-            android:id="@+id/capture_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone" />
-    </FrameLayout>
+        android:layout_height="match_parent" />
+
+    <com.android.camera.ui.CaptureAnimationOverlay
+        android:id="@+id/capture_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <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"
-- 
cgit v1.2.3