summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2011-09-23 18:08:00 +0800
committerAngus Kong <shkong@google.com>2011-09-23 20:25:41 +0800
commit05999715cc38365aa4751a2a355eb1af284573ab (patch)
tree8fbafe767f4d64bfb57f62feec5b72eaf8b21295 /res
parent022d6d7e809fcd47ebc751deaea84e2d3639069a (diff)
downloadLegacyCamera-05999715cc38365aa4751a2a355eb1af284573ab.zip
LegacyCamera-05999715cc38365aa4751a2a355eb1af284573ab.tar.gz
LegacyCamera-05999715cc38365aa4751a2a355eb1af284573ab.tar.bz2
Show the real resolution for quality settings.
1. Change the assets. 2. Change the strings from high/low/mms to 1080p/720p/480p. 3. Change the preference from customized string to the real values of CamcorderProfile.QUALITY_[1080|720|480]P bug:5141068 Change-Id: I294799bda8e873f828bbf4bd21330591f0859632
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_1080p.pngbin0 -> 561 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_480p.pngbin0 -> 659 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_720p.pngbin0 -> 553 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_high.pngbin1464 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_low.pngbin1318 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_mms.pngbin1449 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_viewfinder_video_quality_youtube.pngbin2289 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_1080p.pngbin0 -> 871 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_480p.pngbin0 -> 981 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_720p.pngbin0 -> 972 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_high.pngbin988 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_low.pngbin842 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_mms.pngbin741 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_viewfinder_video_quality_youtube.pngbin1415 -> 0 bytes
-rw-r--r--res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.pngbin629 -> 0 bytes
-rw-r--r--res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.pngbin793 -> 0 bytes
-rw-r--r--res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.pngbin1435 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.pngbin0 -> 1132 bytes
-rw-r--r--res/drawable-xhdpi/ic_viewfinder_video_quality_480p.pngbin0 -> 1324 bytes
-rw-r--r--res/drawable-xhdpi/ic_viewfinder_video_quality_720p.pngbin0 -> 1224 bytes
-rw-r--r--res/values/arrays.xml21
-rw-r--r--res/values/strings.xml22
22 files changed, 20 insertions, 23 deletions
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png
new file mode 100644
index 0000000..d2a39e4
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png
new file mode 100644
index 0000000..398a4b9
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png
new file mode 100644
index 0000000..5567eb0
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_high.png b/res/drawable-hdpi/ic_viewfinder_video_quality_high.png
deleted file mode 100644
index 432cb4a..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_high.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_low.png b/res/drawable-hdpi/ic_viewfinder_video_quality_low.png
deleted file mode 100644
index 45ada04..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_low.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png b/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png
deleted file mode 100644
index 9e517df..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png
deleted file mode 100644
index 296ee75..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png
new file mode 100644
index 0000000..199e0ef
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png
new file mode 100644
index 0000000..e0b4974
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png
new file mode 100644
index 0000000..1104ce5
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_high.png b/res/drawable-mdpi/ic_viewfinder_video_quality_high.png
deleted file mode 100644
index 2841baa..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_high.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_low.png b/res/drawable-mdpi/ic_viewfinder_video_quality_low.png
deleted file mode 100644
index ca67404..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_low.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png b/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png
deleted file mode 100644
index 437e412..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png
deleted file mode 100644
index c29a444..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.png
deleted file mode 100644
index 2fcbd8b..0000000
--- a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.png
deleted file mode 100644
index 9158059..0000000
--- a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.png
deleted file mode 100644
index 7d279af..0000000
--- a/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png
new file mode 100644
index 0000000..606e66d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png
new file mode 100644
index 0000000..3dd4fb2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png
new file mode 100644
index 0000000..c4e08d9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png
Binary files differ
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8ad433e..854bc22 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -18,21 +18,24 @@
<resources>
<!-- Camera Preferences Video Quality entries -->
<string-array name="pref_video_quality_entries" translatable="false">
- <item>@string/pref_video_quality_entry_high</item>
- <item>@string/pref_video_quality_entry_low</item>
- <item>@string/pref_video_quality_entry_youtube</item>
+ <item>@string/pref_video_quality_entry_1080p</item>
+ <item>@string/pref_video_quality_entry_720p</item>
+ <item>@string/pref_video_quality_entry_480p</item>
</string-array>
<string-array name="pref_video_quality_entryvalues" translatable="false">
- <item>@string/pref_video_quality_high</item>
- <item>@string/pref_video_quality_low</item>
- <item>@string/pref_video_quality_youtube</item>
+ <!-- The integer value of CamcorderProfile.QUALITY_1080P -->
+ <item>6</item>
+ <!-- The integer value of CamcorderProfile.QUALITY_720P -->
+ <item>@string/pref_video_quality_default</item>
+ <!-- The integer value of CamcorderProfile.QUALITY_480P -->
+ <item>4</item>
</string-array>
<array name="video_quality_largeicons" translatable="false">
- <item>@drawable/ic_viewfinder_video_quality_high</item>
- <item>@drawable/ic_viewfinder_video_quality_low</item>
- <item>@drawable/ic_viewfinder_video_quality_youtube</item>
+ <item>@drawable/ic_viewfinder_video_quality_1080p</item>
+ <item>@drawable/ic_viewfinder_video_quality_720p</item>
+ <item>@drawable/ic_viewfinder_video_quality_480p</item>
</array>
<!-- Camera Preferences Time Lapse Frame Interval entries -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ec1baf..4db1938 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -106,20 +106,14 @@
<!-- The Video quality settings in preference [CHAR LIMIT=21] -->
<string name="pref_video_quality_title">Video quality</string>
- <string name="pref_video_quality_default" translatable="false">high</string>
- <!-- Video quality setting entry. Videos will be recorded in high quality. [CHAR LIMIT=24] -->
- <string name="pref_video_quality_entry_high">High</string>
- <!-- Video quality setting entry. Videos will be recorded in low quality. [CHAR LIMIT=24] -->
- <string name="pref_video_quality_entry_low">Low</string>
- <!-- Video quality setting entry. Videos will be recorded in low quality and the length is at most 30 seconds. [CHAR LIMIT=24] -->
- <string name="pref_video_quality_entry_mms">MMS (Low, 30s)</string>
- <!-- Video quality setting entry. Videos will be recorded in high quality and the length is at most 15 minutes. [CHAR LIMIT=24] -->
- <string name="pref_video_quality_entry_youtube">YouTube (High, 15m)</string>
-
- <string name="pref_video_quality_high" translatable="false">high</string>
- <string name="pref_video_quality_low" translatable="false">low</string>
- <string name="pref_video_quality_mms" translatable="false">mms</string>
- <string name="pref_video_quality_youtube" translatable="false">youtube</string>
+ <!-- The default quality value is 5 (720p) -->
+ <string name="pref_video_quality_default" translatable="false">5</string>
+ <!-- Video quality setting entry. Videos will be recorded in 1080p quality. [CHAR LIMIT=24] -->
+ <string name="pref_video_quality_entry_1080p" translatable="false">HD</string>
+ <!-- Video quality setting entry. Videos will be recorded in 720p quality. [CHAR LIMIT=24] -->
+ <string name="pref_video_quality_entry_720p" translatable="false">HD</string>
+ <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
+ <string name="pref_video_quality_entry_480p" translatable="false">SD</string>
<!-- Describes the preference dialog for choosing interval between frame capture for
time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->