diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-06-07 09:57:52 -0700 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2016-07-07 09:40:37 -0700 |
| commit | 12d17d80e1227e9164e7e0aa7524cd39d23bf124 (patch) | |
| tree | 500f05111774dc3b7ad0b2f05a328149cd9f9a48 /res | |
| parent | de98a47425d6f9b1ee017829f99d61ad0620266f (diff) | |
| download | android_packages_apps_Snap-12d17d80e1227e9164e7e0aa7524cd39d23bf124.tar.gz android_packages_apps_Snap-12d17d80e1227e9164e7e0aa7524cd39d23bf124.tar.bz2 android_packages_apps_Snap-12d17d80e1227e9164e7e0aa7524cd39d23bf124.zip | |
SnapdragonCamera: FrameListener and Video frame processor
Adding FrameListener with TrackingFocus
Adding VideoFrameProcessor with beautification
Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43
CRs-Fixed: 1035245
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 6 |
4 files changed, 18 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 089838405..c991dbf92 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -70,6 +70,16 @@ <item>off</item> </string-array> + <string-array name="pref_camera2_trackingfocus_entries" translatable="true"> + <item>On</item> + <item>Off</item> + </string-array> + + <string-array name="pref_camera2_trackingfocus_entryvalues" translatable="false"> + <item>on</item> + <item>off</item> + </string-array> + <string-array name="pref_camera2_mono_preview_entries" translatable="true"> <item>@string/pref_camera2_mono_preview_entry_on</item> <item>@string/pref_camera2_mono_preview_entry_off</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 6d1ec7862..e8917f3ee 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1003,5 +1003,6 @@ <string name="pref_camera2_videosnap_entry_enable" translatable="true">Enable</string> <string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string> + <string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 898329a7f..775aeb60d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -748,4 +748,5 @@ CHAR LIMIT = NONE] --> <string name="remaining_photos_format">%d left</string> <string name="initial_recording_seconds">00:00</string> + <string name="makeup_video_size_limit">Makeup works only under VGA size in video recording.</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index d7d478d0a..c5aab1a7d 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -273,4 +273,10 @@ camera:entryValues="@array/pref_camera2_videosnap_entryvalues" camera:key="pref_camera2_videosnap_key" camera:title="@string/pref_camera2_videosnap_title" /> + <ListPreference + camera:defaultValue="off" + camera:key="pref_camera2_trackingfocus_key" + camera:entries="@array/pref_camera2_trackingfocus_entries" + camera:entryValues="@array/pref_camera2_trackingfocus_entryvalues" + camera:title="@string/pref_camera2_trackingfocus_title"/> </PreferenceGroup> |