summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/video_module.xml10
-rw-r--r--res/xml/video_preferences.xml7
2 files changed, 17 insertions, 0 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 561539e08..c6a9d7e80 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -28,6 +28,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
+ <FrameLayout
+ 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"/>
+ </FrameLayout>
<View
android:id="@+id/preview_cover"
android:layout_width="match_parent"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index dc3790162..00b55c6e6 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -124,6 +124,13 @@
camera:singleIcon="@drawable/ic_settings_filter"
camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
<IconListPreference
+ camera:key="pref_camera_facedetection_key"
+ camera:defaultValue="@string/pref_camera_facedetection_default"
+ camera:title="@string/pref_camera_facedetection_title"
+ camera:entries="@array/pref_camera_facedetection_entries"
+ camera:singleIcon="@drawable/ic_settings_facerec"
+ camera:entryValues="@array/pref_camera_facedetection_entryvalues" />
+ <IconListPreference
camera:key="pref_camera_hfr_key"
camera:defaultValue="@string/pref_camera_hfr_default"
camera:title="@string/pref_camera_hfr_title"