diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:34 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-25 21:55:20 -0700 |
| commit | b0bfef5c19689d11b0448779963b37f4c7a69662 (patch) | |
| tree | 756a1e0b2a4f9caff544ab11fa69b6e9079881ff /res/layout/capture_module.xml | |
| parent | 346d14280075daa0625d1f349551a3d13f45c327 (diff) | |
| download | android_packages_apps_Snap-b0bfef5c19689d11b0448779963b37f4c7a69662.tar.gz android_packages_apps_Snap-b0bfef5c19689d11b0448779963b37f4c7a69662.tar.bz2 android_packages_apps_Snap-b0bfef5c19689d11b0448779963b37f4c7a69662.zip | |
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'res/layout/capture_module.xml')
| -rw-r--r-- | res/layout/capture_module.xml | 10 |
1 files changed, 10 insertions, 0 deletions
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" |