summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera.xml4
-rw-r--r--res/layout/capture_module.xml10
2 files changed, 12 insertions, 2 deletions
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
@@ -55,6 +55,16 @@
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">
+
<com.android.camera.ui.Camera2FaceView
android:id="@+id/face_view"
android:layout_width="match_parent"