diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-02-25 14:23:02 -0800 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2016-03-02 18:41:20 -0700 |
| commit | 7252fd0c4d3597a51d51f2e0bb554f0406628fb6 (patch) | |
| tree | 7571e3bd9a819a0557f5c9ae69b20d99218d2df4 /res | |
| parent | 39abf394c32f731ebaa8d1dcac25cdefea91a248 (diff) | |
| download | android_packages_apps_Snap-7252fd0c4d3597a51d51f2e0bb554f0406628fb6.tar.gz android_packages_apps_Snap-7252fd0c4d3597a51d51f2e0bb554f0406628fb6.tar.bz2 android_packages_apps_Snap-7252fd0c4d3597a51d51f2e0bb554f0406628fb6.zip | |
SnapdragonCamera: Add face detection icon to video
Add video face detection to developer option
CRs-Fixed: 978207
Change-Id: I9308573a5a1004fc3803a955bc96f495ecbfc6c7
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/video_module.xml | 10 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 54ba72ebe..1c1db4444 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -29,6 +29,16 @@ android:layout_height="match_parent" android:visibility="gone" /> </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 0184bad1a..2d9e2fbc8 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -136,6 +136,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" |