summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-08 18:48:57 +0800
committerWu-cheng Li <wuchengli@google.com>2010-12-10 13:06:17 +0800
commitac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c (patch)
treebe2e4e6d6b3bc0e9fa3d0afe0ac0f46ebd82b710 /res/values
parent587ed2356a337e809095ae44f22b5e85aad54583 (diff)
downloadpackages_apps_LegacyCamera-ac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c.zip
packages_apps_LegacyCamera-ac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c.tar.gz
packages_apps_LegacyCamera-ac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c.tar.bz2
Add time lapse recording code.
UI is not enabled because time lapse recording still has some problems. bug:2901600 Change-Id: I1d60be9b11f8b98928dd5acacb79c70a3c2330e9
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml31
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/strings.xml15
-rw-r--r--res/values/styles.xml16
4 files changed, 26 insertions, 38 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ce2e085..b5d4d98 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -38,27 +38,10 @@
<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_480p</item>
- <item>@string/pref_video_time_lapse_quality_entry_720p</item>
- <item>@string/pref_video_time_lapse_quality_entry_1080p</item>
- </string-array>
-
- <!-- These values correspond to the quality level integers defined
- in CamcorderProfile.java. E.g. QUALITY_TIME_LAPSE_480P = 1004 -->
- <string-array name="pref_video_time_lapse_quality_entryvalues" translatable="false">
- <item>1000</item>
- <item>1001</item>
- <item>1004</item>
- <item>1005</item>
- <item>1006</item>
- </string-array>
-
<!-- Camera Preferences Time Lapse Frame Interval entries -->
<string-array name="pref_video_time_lapse_frame_interval_entries" translatable="false">
+ <item>@string/pref_camera_recordlocation_entry_off</item>
+ <item>@string/pref_video_time_lapse_frame_interval_entry_250</item>
<item>@string/pref_video_time_lapse_frame_interval_entry_500</item>
<item>@string/pref_video_time_lapse_frame_interval_entry_1000</item>
<item>@string/pref_video_time_lapse_frame_interval_entry_1500</item>
@@ -72,6 +55,8 @@
<!-- These values correspond to the time interval between frame capture in millseconds
for time lapse recording -->
<string-array name="pref_video_time_lapse_frame_interval_entryvalues" translatable="false">
+ <item>0</item>
+ <item>250</item>
<item>500</item>
<item>1000</item>
<item>1500</item>
@@ -82,14 +67,6 @@
<item>10000</item>
</string-array>
- <array name="video_time_lapse_quality_largeicons" 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_480p</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/colors.xml b/res/values/colors.xml
index 2d5286b..1306c47 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,5 +21,5 @@
<color name="recording_time_elapsed_text">#FFFFFFFF</color>
<color name="recording_time_remaining_text">#FFFF0033</color>
<color name="zoom_picker_btn_pressed">#FFFFAD00</color>
- <color name="zoom_text_background_color">#77333333</color>
+ <color name="on_viewfinder_label_background_color">#77333333</color>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3616c27..6800f29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,9 @@
Camcorder mode. [CHAR LIMIT=20] -->
<string name="disable_time_lapse_mode">Disable Time Lapse</string>
+ <!-- A lable that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+ <string name="time_lapse_title">Time Lapse</string>
+
<!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
<string name="pref_camera_id_title">Select camera</string>
@@ -152,23 +155,17 @@
<!-- Describes the preference dialog for choosing quality for time lapse video.
Appears at top of the dialog. [CHAR LIMIT=30] -->
<string name="pref_video_time_lapse_quality_title">Time lapse video quality</string>
- <string name="pref_video_time_lapse_quality_default" translatable="false">1001</string>
<!-- Refers to the video quality [CHAR LIMIT=8] -->
<string name="pref_video_time_lapse_quality_entry_low">Low</string>
<!-- Refers to the video quality [CHAR LIMIT=8] -->
<string name="pref_video_time_lapse_quality_entry_high">High</string>
- <!-- Refers to the video quality -->
- <string name="pref_video_time_lapse_quality_entry_480p" translatable="false">480p</string>
- <!-- Refers to the video quality -->
- <string name="pref_video_time_lapse_quality_entry_720p" translatable="false">720p</string>
- <!-- Refers to the video quality -->
- <string name="pref_video_time_lapse_quality_entry_1080p" translatable="false">1080p</string>
<!-- Describes the preference dialog for choosing interval between frame capture for
time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
- <string name="pref_video_time_lapse_frame_interval_title">Frame capture interval</string>
- <string name="pref_video_time_lapse_frame_interval_default" translatable="false">2000</string>
+ <string name="pref_video_time_lapse_frame_interval_title">Time lapse interval</string>
+ <string name="pref_video_time_lapse_frame_interval_default" translatable="false">0</string>
<!-- The time interval between frame capture for time lapse recording -->
+ <string name="pref_video_time_lapse_frame_interval_entry_250" translatable="false">0.25s</string>
<string name="pref_video_time_lapse_frame_interval_entry_500" translatable="false">0.5s</string>
<string name="pref_video_time_lapse_frame_interval_entry_1000" translatable="false">1s</string>
<string name="pref_video_time_lapse_frame_interval_entry_1500" translatable="false">1.5s</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a545454..ef7d199 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,7 +61,7 @@
<item name="android:layout_width">match_parent</item>
</style>
<style name="RecordingTime">
- <item name="android:layout_width">100dp</item>
+ <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">26dp</item>
<item name="android:shadowColor">#c0000000</item>
<item name="android:shadowDx">1</item>
@@ -90,4 +90,18 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:focusable">false</item>
</style>
+ <style name="OnViewfinderLabel">
+ <item name="android:gravity">center</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:layout_margin">20dp</item>
+ <item name="android:paddingLeft">15dp</item>
+ <item name="android:paddingRight">15dp</item>
+ <item name="android:paddingTop">3dp</item>
+ <item name="android:paddingBottom">3dp</item>
+ <item name="android:textColor">@android:color/white</item>
+ <item name="android:textSize">16dp</item>
+ <item name="android:background">@color/on_viewfinder_label_background_color</item>
+ </style>
</resources>