diff options
author | junjiez <junjiez@codeaurora.org> | 2017-02-07 10:13:36 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2017-03-14 15:42:54 +0800 |
commit | 271a754c8ea933f981e2d9145647c6205bd56bbe (patch) | |
tree | 4c4bae1ef575b79f37ffbf066e768edd3566dc43 /res | |
parent | a68765fb88ee78d86490f8987f3f46ff4bb4a266 (diff) | |
download | android_packages_apps_Snap-271a754c8ea933f981e2d9145647c6205bd56bbe.tar.gz android_packages_apps_Snap-271a754c8ea933f981e2d9145647c6205bd56bbe.tar.bz2 android_packages_apps_Snap-271a754c8ea933f981e2d9145647c6205bd56bbe.zip |
SnapdragonCamera: Smile/blink/gaze detection
Implement Smile/blink/gaze detection feature and
add option to enable it in develop options.
CRs-Fixed: 1087487
Change-Id: I3005ca9767fbe38323e86255238cd4f96f34fbe5
Diffstat (limited to 'res')
-rwxr-xr-x[-rw-r--r--] | res/values/camera2arrays.xml | 11 | ||||
-rwxr-xr-x | res/values/qcomstrings.xml | 6 | ||||
-rwxr-xr-x | res/xml/capture_preferences.xml | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | res/xml/setting_menu_preferences.xml | 10 |
4 files changed, 33 insertions, 3 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index efa9b2015..8242b9c2e 100644..100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. +<!-- Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -1041,4 +1041,13 @@ for time lapse recording --> <item>@string/pref_camera2_saveraw_value_enable</item> </string-array> + <string-array name="pref_camera2_bsgc_entryvalues" translatable="false"> + <item>@string/pref_camera2_bsgc_entry_value_disable</item> + <item>@string/pref_camera2_bsgc_entry_value_enable</item> + </string-array> + + <string-array name="pref_camera2_bsgc_entries" translatable="false"> + <item>@string/pref_camera2_bsgc_entry_disable</item> + <item>@string/pref_camera2_bsgc_entry_enable</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 5dcd4b5cb..db0edac57 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1162,5 +1162,11 @@ <string name="pref_camera_zoom_entry_8x">8x</string> <string name="pref_camera_zoom_entry_9x">9x</string> <string name="pref_camera_zoom_entry_10x">10x</string> + <string name="pref_camera2_bsgc_title" translatable="true">Smile/blink/gaze Detection</string> + <string name="pref_camera2_bsgc_default" translatable="false">disable</string> + <string name="pref_camera2_bsgc_entry_enable" translatable="true">Enable</string> + <string name="pref_camera2_bsgc_entry_disable" translatable="true">Disable</string> + <string name="pref_camera2_bsgc_entry_value_enable" translatable="false">enable</string> + <string name="pref_camera2_bsgc_entry_value_disable" translatable="false">disable</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index a92f8490e..e1146b55d 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. +<!-- Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -356,4 +356,11 @@ camera:title="@string/pref_camera_zoom_title" camera:entries="@array/pref_camera_zoom_entries" camera:entryValues="@array/pref_camera_zoom_entryvalues" /> + + <ListPreference + camera:key="pref_camera2_bsgc_key" + camera:defaultValue="@string/pref_camera2_bsgc_default" + camera:title="@string/pref_camera2_bsgc_title" + camera:entries="@array/pref_camera2_bsgc_entries" + camera:entryValues="@array/pref_camera2_bsgc_entryvalues" /> </PreferenceGroup> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 3c311245b..a8361c201 100644..100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. +<!-- Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -347,5 +347,13 @@ android:entries="@array/pref_camera_zoom_entries" android:entryValues="@array/pref_camera_zoom_entryvalues" /> + <ListPreference + android:defaultValue="@string/pref_camera2_bsgc_default" + android:entries="@array/pref_camera2_bsgc_entries" + android:entryValues="@array/pref_camera2_bsgc_entryvalues" + android:key="pref_camera2_bsgc_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera2_bsgc_title" /> </PreferenceCategory> </PreferenceScreen> |