diff options
| -rw-r--r-- | res/values/arrays.xml | 35 | ||||
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 40 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 9 |
4 files changed, 83 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index fb3200391..57da3cb97 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -195,6 +195,12 @@ <item>macro</item> </string-array> + <string-array name="pref_camera_focusmode_labels" translatable="false"> + <item>@string/pref_camera_focusmode_label_auto</item> + <item>@string/pref_camera_focusmode_label_infinity</item> + <item>@string/pref_camera_focusmode_label_macro</item> + </string-array> + <!-- Camera Preferences flash mode dialog box entries --> <string-array name="pref_camera_flashmode_entries" translatable="false"> <item>@string/pref_camera_flashmode_entry_off</item> @@ -202,6 +208,12 @@ <item>@string/pref_camera_flashmode_entry_on</item> </string-array> + <string-array name="pref_camera_flashmode_labels" translatable="false"> + <item>@string/pref_camera_flashmode_label_off</item> + <item>@string/pref_camera_flashmode_label_auto</item> + <item>@string/pref_camera_flashmode_label_on</item> + </string-array> + <string-array name="pref_camera_flashmode_entryvalues" translatable="false"> <item>off</item> <item>auto</item> @@ -226,6 +238,11 @@ <item>@string/pref_camera_flashmode_entry_off</item> </string-array> + <string-array name="pref_camera_video_flashmode_labels" translatable="false"> + <item>@string/pref_camera_flashmode_label_on</item> + <item>@string/pref_camera_flashmode_label_off</item> + </string-array> + <string-array name="pref_camera_video_flashmode_entryvalues" translatable="false"> <item>torch</item> <item>off</item> @@ -270,6 +287,14 @@ <item>@string/pref_camera_whitebalance_entry_cloudy</item> </string-array> + <string-array name="pref_camera_whitebalance_labels" translatable="false"> + <item>@string/pref_camera_whitebalance_label_incandescent</item> + <item>@string/pref_camera_whitebalance_label_fluorescent</item> + <item>@string/pref_camera_whitebalance_label_auto</item> + <item>@string/pref_camera_whitebalance_label_daylight</item> + <item>@string/pref_camera_whitebalance_label_cloudy</item> + </string-array> + <string-array name="pref_camera_whitebalance_entryvalues" translatable="false"> <item>incandescent</item> <item>fluorescent</item> @@ -316,6 +341,11 @@ <item>@string/pref_camera_id_entry_front</item> </array> + <array name="camera_id_labels" translatable="false"> + <item>@string/pref_camera_id_label_back</item> + <item>@string/pref_camera_id_label_front</item> + </array> + <array name="camera_id_icons" translatable="false"> <item>@drawable/ic_menuselect_camera_facing_back</item> <item>@drawable/ic_menuselect_camera_facing_front</item> @@ -370,6 +400,11 @@ <item>@string/setting_on</item> </string-array> + <string-array name="pref_camera_hdr_labels" translatable="false"> + <item>@string/pref_camera_hdr_label_off</item> + <item>@string/pref_camera_hdr_label_on</item> + </string-array> + <string-array name="pref_camera_hdr_entryvalues" translatable="false"> <item>@string/setting_off_value</item> <item>@string/setting_on_value</item> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b901db770..cd849b62a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -32,6 +32,7 @@ <attr name="defaultValue" format="string|reference" /> <attr name="entryValues" format="reference" /> <attr name="entries" format="reference" /> + <attr name="labels" format="reference" /> </declare-styleable> <declare-styleable name="IconIndicator"> <attr name="icons" format="reference" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 27663c946..7f8e083f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -694,6 +694,11 @@ <string name="pref_camera_focusmode_entry_infinity">Infinity</string> <string name="pref_camera_focusmode_entry_macro">Macro</string> + <!-- Menu, focus mode labels [CHAR LIMIT=50] --> + <string name="pref_camera_focusmode_label_auto">AUTO</string> + <string name="pref_camera_focusmode_label_infinity">INFINITY</string> + <string name="pref_camera_focusmode_label_macro">MACRO</string> + <!-- Default flash mode setting.--> <string name="pref_camera_flashmode_default" translatable="false">auto</string> @@ -702,12 +707,19 @@ <!-- Settings screen, Flash mode title --> <string name="pref_camera_flashmode_title">Flash mode</string> + <!-- flash label [CHAR LIMIT=50] --> + <string name="pref_camera_flashmode_label">FLASH MODE</string> <!-- 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> + <!-- Menu, flash mode labels [CHAR LIMIT=50] --> + <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string> + <string name="pref_camera_flashmode_label_on">FLASH ON</string> + <string name="pref_camera_flashmode_label_off">FLASH OFF</string> + <!-- Default videocamera flash mode setting.--> <string name="pref_camera_video_flashmode_default" translatable="false">off</string> @@ -716,6 +728,8 @@ <!-- Settings screen, white balance title --> <string name="pref_camera_whitebalance_title">White balance</string> + <!-- Menu, white balance label --> + <string name="pref_camera_whitebalance_label">WHITE BALANCE</string> <!-- Settings screen, White balance dialog radio button choices --> <string name="pref_camera_whitebalance_entry_auto">Auto</string> @@ -724,6 +738,13 @@ <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string> <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string> + <!-- Menu, White balance labels [CHAR LIMIT=50] --> + <string name="pref_camera_whitebalance_label_auto">AUTO</string> + <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string> + <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string> + <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string> + <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string> + <!-- Default scene mode setting. --> <string name="pref_camera_scenemode_default" translatable="false">auto</string> @@ -749,10 +770,22 @@ <!-- Exposure settings in preference --> <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> + <!-- menu label exposure compensation [CHAR LIMIT=50] --> + <string name="pref_exposure_label">EXPOSURE</string> <!-- Default HDR entry value --> <string name="pref_camera_hdr_default">@string/setting_off_value</string> + <!-- HDR label ON [CHAR LIMIT=60] --> + <string name="pref_camera_hdr_label_on">HDR OFF</string> + <!-- HDR label OFF [CHAR LIMIT=60] --> + <string name="pref_camera_hdr_label_off">HDR ON</string> + + <!-- switch camera label back [CHAR LIMIT=60] --> + <string name="pref_camera_id_label_back">FRONT CAMERA</string> + <!-- switch camera label front [CHAR LIMIT=60] --> + <string name="pref_camera_id_label_front">BACK CAMERA</string> + <!-- Dialog "OK" button. Dismisses dialog. --> <string name="dialog_ok">OK</string> @@ -1015,6 +1048,13 @@ CHAR LIMIT = NONE] --> <!-- Title for the albums tab [CHAR LIMIT=25] --> <string name="tab_albums">Albums</string> + <!-- Camera menu labels --> + + <!-- more options label [CHAR LIMIT=50] --> + <string name="camera_menu_more_label">MORE OPTIONS</string> + <!-- settings label [CHAR LIMIT=50] --> + <string name="camera_menu_settings_label">SETTINGS</string> + <!-- String indicating how many photos are in an album [CHAR LIMIT=15] --> <plurals name="number_of_photos"> <item quantity="one">%1$d photo</item> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 741fb1f8c..a08dfa98a 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -24,7 +24,8 @@ camera:icons="@array/camera_flashmode_icons" camera:largeIcons="@array/camera_flashmode_largeicons" camera:entries="@array/pref_camera_flashmode_entries" - camera:entryValues="@array/pref_camera_flashmode_entryvalues" /> + camera:entryValues="@array/pref_camera_flashmode_entryvalues" + camera:labels="@array/pref_camera_flashmode_labels" /> <IconListPreference camera:key="pref_camera_exposure_key" camera:defaultValue="@string/pref_exposure_default" @@ -44,7 +45,8 @@ camera:icons="@array/whitebalance_icons" camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" - camera:entryValues="@array/pref_camera_whitebalance_entryvalues" /> + camera:entryValues="@array/pref_camera_whitebalance_entryvalues" + camera:labels="@array/pref_camera_whitebalance_labels" /> <RecordLocationPreference camera:key="pref_camera_recordlocation_key" camera:defaultValue="@string/pref_camera_recordlocation_default" @@ -63,6 +65,7 @@ camera:defaultValue="@array/pref_camera_focusmode_default_array" camera:title="@string/pref_camera_focusmode_title" camera:entries="@array/pref_camera_focusmode_entries" + camera:labels="@array/pref_camera_focusmode_labels" camera:entryValues="@array/pref_camera_focusmode_entryvalues" /> <IconListPreference camera:key="pref_camera_id_key" @@ -70,12 +73,14 @@ camera:title="@string/pref_camera_id_title" camera:icons="@array/camera_id_icons" camera:entries="@array/camera_id_entries" + camera:labels="@array/camera_id_labels" camera:largeIcons="@array/camera_id_largeicons" /> <ListPreference camera:key="pref_camera_hdr_key" camera:defaultValue="@string/pref_camera_hdr_default" camera:title="@string/pref_camera_scenemode_entry_hdr" camera:entries="@array/pref_camera_hdr_entries" + camera:labels="@array/pref_camera_hdr_labels" camera:entryValues="@array/pref_camera_hdr_entryvalues" /> <CountDownTimerPreference camera:key="pref_camera_timer_key" |