diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-07 00:25:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-07 00:25:36 -0800 |
| commit | 376879d59ad50116904c440caf96e2c25d79ceaa (patch) | |
| tree | 6866038d9dcf3860765f17065249b280e5f44d15 /res/values/arrays.xml | |
| parent | b755c62979355e5259cb394ef660cc257de4db0b (diff) | |
| parent | dbdb7620da136374eea95170261032f910015db0 (diff) | |
| download | android_packages_apps_Snap-376879d59ad50116904c440caf96e2c25d79ceaa.tar.gz android_packages_apps_Snap-376879d59ad50116904c440caf96e2c25d79ceaa.tar.bz2 android_packages_apps_Snap-376879d59ad50116904c440caf96e2c25d79ceaa.zip | |
Merge "Merge remote-tracking branch into merge_branch"
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index c600cffd7..c740d26be 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -187,12 +187,15 @@ <item>@string/pref_camera_picturesize_entry_1920x1080</item> <item>@string/pref_camera_picturesize_entry_2mp</item> <item>@string/pref_camera_picturesize_entry_2mp_wide</item> + <item>@string/pref_camera_picturesize_entry_1_5mp</item> <item>@string/pref_camera_picturesize_entry_1_3mp</item> <item>@string/pref_camera_picturesize_entry_1280x768</item> <item>@string/pref_camera_picturesize_entry_1280x720</item> <item>@string/pref_camera_picturesize_entry_1mp</item> <item>@string/pref_camera_picturesize_entry_800x600</item> <item>@string/pref_camera_picturesize_entry_800x480</item> + <item>960 x 720</item> + <item>720 x 480</item> <item>@string/pref_camera_picturesize_entry_vga</item> <item>@string/pref_camera_picturesize_entry_352x288</item> <item>@string/pref_camera_picturesize_entry_qvga</item> @@ -214,12 +217,15 @@ <item>1920x1080</item> <item>1600x1200</item> <item>1920x1088</item> + <item>1440x1080</item> <item>1280x960</item> <item>1280x768</item> <item>1280x720</item> <item>1024x768</item> <item>800x600</item> <item>800x480</item> + <item>960x720</item> + <item>720x480</item> <item>640x480</item> <item>352x288</item> <item>320x240</item> @@ -506,8 +512,8 @@ </string-array> <string-array name="pref_camera_hdr_plus_labels" translatable="false"> - <item>@string/pref_camera_scenemode_entry_hdr_plus</item> - <item>@string/pref_camera_scenemode_entry_hdr_plus</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_on</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_off</item> </string-array> <string-array name="pref_camera_hdr_plus_icons" translatable="false"> @@ -527,8 +533,8 @@ </string-array> <string-array name="pref_camera_hdr_labels" translatable="false"> - <item>@string/pref_camera_hdr_label</item> - <item>@string/pref_camera_hdr_label</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_on</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_off</item> </string-array> <string-array name="pref_camera_hdr_icons" translatable="false"> |