diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-06-04 14:18:16 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-06-11 14:57:07 +0800 |
| commit | 186ff08e71d106e329171055accd4395760495ea (patch) | |
| tree | b5cbb1574e2ee36c0516fc16852dc6c7458ed651 /res | |
| parent | 1c3631accb0068a0a96cfd338820e6a7a61426f9 (diff) | |
| download | LegacyCamera-186ff08e71d106e329171055accd4395760495ea.zip LegacyCamera-186ff08e71d106e329171055accd4395760495ea.tar.gz LegacyCamera-186ff08e71d106e329171055accd4395760495ea.tar.bz2 | |
Add metering mode support.
Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 13 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 6 |
3 files changed, 31 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 2299935..473fb47 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -261,5 +261,18 @@ <string-array name="pref_camera_quickcapture_entryvalues" translatable="false"> <item>off</item> <item>on</item> + </string-array> + + <!-- Camera Preferences metering mode dialog box entries --> + <string-array name="pref_camera_meteringmode_entries" translatable="false"> + <item>@string/pref_camera_meteringmode_entry_center_weighted</item> + <item>@string/pref_camera_meteringmode_entry_spot</item> + <item>@string/pref_camera_meteringmode_entry_frame_average</item> + </string-array> + + <string-array name="pref_camera_meteringmode_entryvalues" translatable="false"> + <item>center-weighted</item> + <item>frame-average</item> + <item>spot</item> </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1bfe813..dea9ea5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -167,7 +167,7 @@ <!-- Settings screen, Flash mode title --> <string name="pref_camera_flashmode_title">Flash mode</string> - <!-- Settings screen, Focue mode dialog radio button choices --> + <!-- Settings screen, Flash mode dialog radio button choices --> <string name="pref_camera_flashmode_entry_auto">Auto</string> <string name="pref_camera_flashmode_entry_on">On</string> <string name="pref_camera_flashmode_entry_off">Off</string> @@ -254,6 +254,17 @@ <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> + <!-- Default metering mode setting.--> + <string name="pref_camera_meteringmode_default" translatable="false">center-weighted</string> + + <!-- Settings screen, Metering mode title --> + <string name="pref_camera_meteringmode_title">Metering mode</string> + + <!-- Settings screen, Metering mode dialog radio button choices --> + <string name="pref_camera_meteringmode_entry_center_weighted">Center Weighted</string> + <string name="pref_camera_meteringmode_entry_frame_average">Frame Average</string> + <string name="pref_camera_meteringmode_entry_spot">Spot</string> + <!-- Framing grid settings in preference --> <!-- Message to show when there's no lat/lng information in the image --> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index c70c253..96eff91 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -81,5 +81,11 @@ camera:title="@string/pref_camera_quickcapture_title" camera:entries="@array/pref_camera_quickcapture_entries" camera:entryValues="@array/pref_camera_quickcapture_entryvalues" /> + <ListPreference + camera:key="pref_camera_meteringmode_key" + camera:defaultValue="@string/pref_camera_meteringmode_default" + camera:title="@string/pref_camera_meteringmode_title" + camera:entries="@array/pref_camera_meteringmode_entries" + camera:entryValues="@array/pref_camera_meteringmode_entryvalues" /> </PreferenceGroup> </PreferenceGroup> |