summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-18 17:59:15 -0800
committerSteve Kondik <steve@cyngn.com>2016-11-18 18:00:38 -0800
commit00e8c21eda3c2d84f040e513675a1400094536e9 (patch)
treeba4a37d00787bc740141ea1bc3c5da5e41a3f5bb
parentaac246e39ffa5cc70fe9f2669ea55692ef9c41cd (diff)
downloadandroid_packages_apps_Snap-00e8c21eda3c2d84f040e513675a1400094536e9.zip
android_packages_apps_Snap-00e8c21eda3c2d84f040e513675a1400094536e9.tar.gz
android_packages_apps_Snap-00e8c21eda3c2d84f040e513675a1400094536e9.tar.bz2
snap: Fix preview overlays
* Fix Z-order and touch focus Change-Id: I05891f6b6c1c5e9a0a9b1142c0613c08fb451bd1
-rw-r--r--res/layout/capture_module.xml32
-rw-r--r--res/layout/photo_module.xml34
-rw-r--r--res/layout/video_module.xml34
3 files changed, 45 insertions, 55 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index d52a8fa..4ba1818 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 d972989..372596c 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 a6024d5..3091e21 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"