diff options
| author | Owen Lin <owenlin@google.com> | 2009-11-26 19:41:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-26 19:41:24 -0800 |
| commit | 4660f40661d073bcc800fd1aced8e1114306773f (patch) | |
| tree | f810e76c30f2e835a22a374162ecc26dbf1d03ce /res | |
| parent | 8542ee0a2dfaa5626de6a6b1dbcf5ce096426c13 (diff) | |
| parent | dd6bc422dd745c436df2e216693531275a807e0c (diff) | |
| download | LegacyCamera-4660f40661d073bcc800fd1aced8e1114306773f.zip LegacyCamera-4660f40661d073bcc800fd1aced8e1114306773f.tar.gz LegacyCamera-4660f40661d073bcc800fd1aced8e1114306773f.tar.bz2 | |
am dd6bc422: am 4ddee78a: Add one more picture size settings.
Merge commit 'dd6bc422dd745c436df2e216693531275a807e0c'
* commit 'dd6bc422dd745c436df2e216693531275a807e0c':
Add one more picture size settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index fd613ba..fe07fba 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -54,6 +54,7 @@ <item>@string/pref_camera_picturesize_entry_2048x1536</item> <item>@string/pref_camera_picturesize_entry_1600x1200</item> <item>@string/pref_camera_picturesize_entry_1024x768</item> + <item>@string/pref_camera_picturesize_entry_320x240</item> </string-array> <!-- When launching the camera app first time, we will set the picture @@ -65,6 +66,7 @@ <item>2048x1536</item> <item>1600x1200</item> <item>1024x768</item> + <item>320x240</item> </string-array> <!-- Camera Preferences JPEG quality dialog box entries --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1f4d122..de74e1e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -178,6 +178,7 @@ <string name="pref_camera_picturesize_entry_2048x1536">3M Pixels</string> <string name="pref_camera_picturesize_entry_1600x1200">2M Pixels</string> <string name="pref_camera_picturesize_entry_1024x768">1M Pixels</string> + <string name="pref_camera_picturesize_entry_320x240">QVGA</string> <!-- Settings screen, picture size dialog title --> <string name="pref_camera_picturesize_dialogtitle">Picture size</string> |