Merge "Added support for time lapse video capture."

11 files changed, 46 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_1080p.png b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_1080p.png
new file mode 100644
index 0000000..d2a39e4
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_1080p.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_720p.png b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_720p.png
new file mode 100644
index 0000000..5567eb0
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_720p.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_high.png b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_high.png
new file mode 100644
index 0000000..ce0cf42
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_high.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_low.png b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_low.png
new file mode 100644
index 0000000..cb66c52
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_time_lapse_quality_low.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_1080p.png b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_1080p.png
new file mode 100644
index 0000000..199e0ef
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_1080p.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_720p.png b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_720p.png
new file mode 100644
index 0000000..1104ce5
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_720p.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_high.png b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_high.png
new file mode 100644
index 0000000..8b99109
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_high.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_low.png b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_low.png
new file mode 100644
index 0000000..36e2c1a
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_time_lapse_quality_low.png
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 473fb47..2e24f5a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -38,6 +38,28 @@
         <item>@drawable/ic_viewfinder_video_quality_youtube</item>
     </array>
 
+    <!-- Camera Preferences Time Lapse Video Quality entries -->
+    <string-array name="pref_video_time_lapse_quality_entries" translatable="false">
+        <item>@string/pref_video_time_lapse_quality_entry_low</item>
+        <item>@string/pref_video_time_lapse_quality_entry_high</item>
+        <item>@string/pref_video_time_lapse_quality_entry_720p</item>
+        <item>@string/pref_video_time_lapse_quality_entry_1080p</item>
+    </string-array>
+
+    <string-array name="pref_video_time_lapse_quality_entryvalues" translatable="false">
+        <item>low</item>
+        <item>high</item>
+        <item>720p</item>
+        <item>1080p</item>
+    </string-array>
+
+    <array name="video_time_lapse_quality_icons" translatable="false">
+        <item>@drawable/ic_viewfinder_video_time_lapse_quality_low</item>
+        <item>@drawable/ic_viewfinder_video_time_lapse_quality_high</item>
+        <item>@drawable/ic_viewfinder_video_time_lapse_quality_720p</item>
+        <item>@drawable/ic_viewfinder_video_time_lapse_quality_1080p</item>
+    </array>
+
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries" translatable="false">
         <!-- TODO: Change to a better name of the preference.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1e4a23..055112d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,6 +105,12 @@
     <!-- Button indicating to switch to another camera -->
     <string name="switch_camera_id">Switch Camera</string>
 
+    <!-- Button indicating to enable the time lapse mode -->
+    <string name="enable_time_lapse_mode">Enable Time Lapse</string>
+
+    <!-- Button indicating to disable the time lapse mode -->
+    <string name="disable_time_lapse_mode">Disable Time Lapse</string>
+
     <!-- Settings screen, setting title text -->
     <string name="pref_camera_recordlocation_title">Store location</string>
 
@@ -122,12 +128,23 @@
     <string name="pref_video_quality_entry_mms">MMS (Low, 30s)</string>
     <string name="pref_video_quality_entry_youtube">YouTube (High, 10m)</string>
 
+    <!-- The Time Lapse Video quality settings in preference -->
+    <string name="pref_video_time_lapse_quality_title">Time lapse video quality</string>
+    <string name="pref_video_time_lapse_quality_default" translatable="false">high</string>
+    <string name="pref_video_time_lapse_quality_entry_low">Low</string>
+    <string name="pref_video_time_lapse_quality_entry_high">High</string>
+    <string name="pref_video_time_lapse_quality_entry_720p">720p</string>
+    <string name="pref_video_time_lapse_quality_entry_1080p">1080p</string>
+
     <!-- Settings screen, Camera setting category title -->
     <string name="pref_camera_settings_category">Camera settings</string>
 
     <!-- Settings screen, Camcorder setting category title -->
     <string name="pref_camcorder_settings_category">Camcorder settings</string>
 
+    <!-- Settings screen, Camcorder Time Lapse setting category title -->
+    <string name="pref_camcorder_time_lapse_settings_category">Camcorder Time Lapse settings</string>
+
     <!-- Settings screen, Picture size title -->
     <string name="pref_camera_picturesize_title">Picture size</string>
 
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index eb8e344..6345351 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -26,6 +26,13 @@
                 camera:entries="@array/pref_video_quality_entries"
                 camera:entryValues="@array/pref_video_quality_entryvalues"/>
         <IconListPreference
+                camera:key="pref_video_time_lapse_quality_key"
+                camera:defaultValue="@string/pref_video_time_lapse_quality_default"
+                camera:title="@string/pref_video_time_lapse_quality_title"
+                camera:largeIcons="@array/video_time_lapse_quality_icons"
+                camera:entries="@array/pref_video_time_lapse_quality_entries"
+                camera:entryValues="@array/pref_video_time_lapse_quality_entryvalues"/>
+        <IconListPreference
                 camera:key="pref_camera_video_flashmode_key"
                 camera:defaultValue="@string/pref_camera_video_flashmode_default"
                 camera:title="@string/pref_camera_flashmode_title"