diff options
41 files changed, 6 insertions, 6 deletions
diff --git a/res/drawable-hdpi/ic_scene_mode_auto.png b/res/drawable-hdpi/ic_scene_mode_auto.png Binary files differindex c9142c947..7ab84a749 100644 --- a/res/drawable-hdpi/ic_scene_mode_auto.png +++ b/res/drawable-hdpi/ic_scene_mode_auto.png diff --git a/res/drawable-hdpi/ic_scene_mode_backlight.png b/res/drawable-hdpi/ic_scene_mode_backlight.png Binary files differindex 92d053ce2..08b1e4307 100644 --- a/res/drawable-hdpi/ic_scene_mode_backlight.png +++ b/res/drawable-hdpi/ic_scene_mode_backlight.png diff --git a/res/drawable-hdpi/ic_scene_mode_beach.png b/res/drawable-hdpi/ic_scene_mode_beach.png Binary files differindex 8bf453a86..be3c41acb 100644 --- a/res/drawable-hdpi/ic_scene_mode_beach.png +++ b/res/drawable-hdpi/ic_scene_mode_beach.png diff --git a/res/drawable-hdpi/ic_scene_mode_candlelight.png b/res/drawable-hdpi/ic_scene_mode_candlelight.png Binary files differindex 5bea8ae92..71abea0be 100644 --- a/res/drawable-hdpi/ic_scene_mode_candlelight.png +++ b/res/drawable-hdpi/ic_scene_mode_candlelight.png diff --git a/res/drawable-hdpi/ic_scene_mode_flower.png b/res/drawable-hdpi/ic_scene_mode_flower.png Binary files differindex 2a4172378..08b21dd1b 100644 --- a/res/drawable-hdpi/ic_scene_mode_flower.png +++ b/res/drawable-hdpi/ic_scene_mode_flower.png diff --git a/res/drawable-hdpi/ic_scene_mode_hdr.png b/res/drawable-hdpi/ic_scene_mode_hdr.png Binary files differindex d6b10af27..d24107512 100644 --- a/res/drawable-hdpi/ic_scene_mode_hdr.png +++ b/res/drawable-hdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-hdpi/ic_scene_mode_landscape.png b/res/drawable-hdpi/ic_scene_mode_landscape.png Binary files differindex 2b77d0173..505a387cf 100644 --- a/res/drawable-hdpi/ic_scene_mode_landscape.png +++ b/res/drawable-hdpi/ic_scene_mode_landscape.png diff --git a/res/drawable-hdpi/ic_scene_mode_night.png b/res/drawable-hdpi/ic_scene_mode_night.png Binary files differindex 7bbcce451..7511775d1 100644 --- a/res/drawable-hdpi/ic_scene_mode_night.png +++ b/res/drawable-hdpi/ic_scene_mode_night.png diff --git a/res/drawable-hdpi/ic_scene_mode_portrait.png b/res/drawable-hdpi/ic_scene_mode_portrait.png Binary files differindex d7ba4ae8a..9e5e654d4 100644 --- a/res/drawable-hdpi/ic_scene_mode_portrait.png +++ b/res/drawable-hdpi/ic_scene_mode_portrait.png diff --git a/res/drawable-hdpi/ic_scene_mode_refocus.png b/res/drawable-hdpi/ic_scene_mode_refocus.png Binary files differnew file mode 100644 index 000000000..5118e59f8 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_refocus.png diff --git a/res/drawable-hdpi/ic_scene_mode_snow.png b/res/drawable-hdpi/ic_scene_mode_snow.png Binary files differindex 6ae16f00a..a0634c718 100644 --- a/res/drawable-hdpi/ic_scene_mode_snow.png +++ b/res/drawable-hdpi/ic_scene_mode_snow.png diff --git a/res/drawable-hdpi/ic_scene_mode_sports.png b/res/drawable-hdpi/ic_scene_mode_sports.png Binary files differindex e3912018b..bc72a6420 100644 --- a/res/drawable-hdpi/ic_scene_mode_sports.png +++ b/res/drawable-hdpi/ic_scene_mode_sports.png diff --git a/res/drawable-hdpi/ic_scene_mode_sunset.png b/res/drawable-hdpi/ic_scene_mode_sunset.png Binary files differindex 0049b80de..f122276a5 100644 --- a/res/drawable-hdpi/ic_scene_mode_sunset.png +++ b/res/drawable-hdpi/ic_scene_mode_sunset.png diff --git a/res/drawable-xhdpi/ic_scene_mode_auto.png b/res/drawable-xhdpi/ic_scene_mode_auto.png Binary files differindex 511f29bf5..da70ffa17 100644 --- a/res/drawable-xhdpi/ic_scene_mode_auto.png +++ b/res/drawable-xhdpi/ic_scene_mode_auto.png diff --git a/res/drawable-xhdpi/ic_scene_mode_backlight.png b/res/drawable-xhdpi/ic_scene_mode_backlight.png Binary files differindex 31a05c3d3..0f608765a 100644 --- a/res/drawable-xhdpi/ic_scene_mode_backlight.png +++ b/res/drawable-xhdpi/ic_scene_mode_backlight.png diff --git a/res/drawable-xhdpi/ic_scene_mode_beach.png b/res/drawable-xhdpi/ic_scene_mode_beach.png Binary files differindex 435b9d516..6751ccbce 100644 --- a/res/drawable-xhdpi/ic_scene_mode_beach.png +++ b/res/drawable-xhdpi/ic_scene_mode_beach.png diff --git a/res/drawable-xhdpi/ic_scene_mode_candlelight.png b/res/drawable-xhdpi/ic_scene_mode_candlelight.png Binary files differindex 326614d4e..ae95a80aa 100644 --- a/res/drawable-xhdpi/ic_scene_mode_candlelight.png +++ b/res/drawable-xhdpi/ic_scene_mode_candlelight.png diff --git a/res/drawable-xhdpi/ic_scene_mode_flower.png b/res/drawable-xhdpi/ic_scene_mode_flower.png Binary files differindex 411e600a3..6a5d8a0b6 100644 --- a/res/drawable-xhdpi/ic_scene_mode_flower.png +++ b/res/drawable-xhdpi/ic_scene_mode_flower.png diff --git a/res/drawable-xhdpi/ic_scene_mode_hdr.png b/res/drawable-xhdpi/ic_scene_mode_hdr.png Binary files differindex d24107512..660afcb24 100644 --- a/res/drawable-xhdpi/ic_scene_mode_hdr.png +++ b/res/drawable-xhdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-xhdpi/ic_scene_mode_landscape.png b/res/drawable-xhdpi/ic_scene_mode_landscape.png Binary files differindex fe0de0814..aa97e0242 100644 --- a/res/drawable-xhdpi/ic_scene_mode_landscape.png +++ b/res/drawable-xhdpi/ic_scene_mode_landscape.png diff --git a/res/drawable-xhdpi/ic_scene_mode_night.png b/res/drawable-xhdpi/ic_scene_mode_night.png Binary files differindex 5dd62fcc6..9f3c0a322 100644 --- a/res/drawable-xhdpi/ic_scene_mode_night.png +++ b/res/drawable-xhdpi/ic_scene_mode_night.png diff --git a/res/drawable-xhdpi/ic_scene_mode_portrait.png b/res/drawable-xhdpi/ic_scene_mode_portrait.png Binary files differindex ab6b0bed8..0e7b7470d 100644 --- a/res/drawable-xhdpi/ic_scene_mode_portrait.png +++ b/res/drawable-xhdpi/ic_scene_mode_portrait.png diff --git a/res/drawable-xhdpi/ic_scene_mode_refocus.png b/res/drawable-xhdpi/ic_scene_mode_refocus.png Binary files differnew file mode 100644 index 000000000..89bff3d2f --- /dev/null +++ b/res/drawable-xhdpi/ic_scene_mode_refocus.png diff --git a/res/drawable-xhdpi/ic_scene_mode_snow.png b/res/drawable-xhdpi/ic_scene_mode_snow.png Binary files differindex e608c0a3d..707691f6a 100644 --- a/res/drawable-xhdpi/ic_scene_mode_snow.png +++ b/res/drawable-xhdpi/ic_scene_mode_snow.png diff --git a/res/drawable-xhdpi/ic_scene_mode_sports.png b/res/drawable-xhdpi/ic_scene_mode_sports.png Binary files differindex d79a7e0c1..53dab5e83 100644 --- a/res/drawable-xhdpi/ic_scene_mode_sports.png +++ b/res/drawable-xhdpi/ic_scene_mode_sports.png diff --git a/res/drawable-xhdpi/ic_scene_mode_sunset.png b/res/drawable-xhdpi/ic_scene_mode_sunset.png Binary files differindex 721966e43..708faee05 100644 --- a/res/drawable-xhdpi/ic_scene_mode_sunset.png +++ b/res/drawable-xhdpi/ic_scene_mode_sunset.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_auto.png b/res/drawable-xxhdpi/ic_scene_mode_auto.png Binary files differnew file mode 100644 index 000000000..80370a33b --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_auto.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_backlight.png b/res/drawable-xxhdpi/ic_scene_mode_backlight.png Binary files differnew file mode 100644 index 000000000..17b44ad42 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_backlight.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_beach.png b/res/drawable-xxhdpi/ic_scene_mode_beach.png Binary files differnew file mode 100644 index 000000000..e04c8f803 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_beach.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_candlelight.png b/res/drawable-xxhdpi/ic_scene_mode_candlelight.png Binary files differnew file mode 100644 index 000000000..22db9db0b --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_candlelight.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_flower.png b/res/drawable-xxhdpi/ic_scene_mode_flower.png Binary files differnew file mode 100644 index 000000000..afa73e79b --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_flower.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_hdr.png b/res/drawable-xxhdpi/ic_scene_mode_hdr.png Binary files differnew file mode 100644 index 000000000..58e191bb6 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_landscape.png b/res/drawable-xxhdpi/ic_scene_mode_landscape.png Binary files differnew file mode 100644 index 000000000..82805bcbd --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_landscape.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_night.png b/res/drawable-xxhdpi/ic_scene_mode_night.png Binary files differnew file mode 100644 index 000000000..5f61c8ad3 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_night.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_portrait.png b/res/drawable-xxhdpi/ic_scene_mode_portrait.png Binary files differnew file mode 100644 index 000000000..266ca2370 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_portrait.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_snow.png b/res/drawable-xxhdpi/ic_scene_mode_snow.png Binary files differnew file mode 100644 index 000000000..c9b0b605a --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_snow.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_sports.png b/res/drawable-xxhdpi/ic_scene_mode_sports.png Binary files differnew file mode 100644 index 000000000..2c167c867 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_sports.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_sunset.png b/res/drawable-xxhdpi/ic_scene_mode_sunset.png Binary files differnew file mode 100644 index 000000000..cd5a91264 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_sunset.png diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d803bf107..4ea9734b5 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -544,8 +544,8 @@ <string name="all_in_focus">全焦</string> <string name="refocus_toast">点击此处可重新对焦照片</string> - <string name="refocus_prompt_title">Macro+</string> - <string name="refocus_prompt_message">开启Macro+模式后，相机会连续拍摄5张照片并将其合成一张全焦照片。您还可以事后重新对焦。</string> + <string name="refocus_prompt_title">UbiFocus</string> + <string name="refocus_prompt_message">开启UbiFocus模式后，相机会连续拍摄5张照片并将其合成一张全焦照片。您还可以事后重新对焦。</string> <!-- Settings menu, setting title text for Manual white balance --> <string name="pref_camera_manual_wb_title">手动白平衡</string> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 5a9d5fc4b..deb578dfb 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -889,8 +889,8 @@ <string name="all_in_focus">All in Focus</string> <string name="refocus_toast">To re-focus last photo, tap here</string> - <string name="refocus_prompt_title">Macro+</string> - <string name="refocus_prompt_message">With Macro+, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string> + <string name="refocus_prompt_title">UbiFocus</string> + <string name="refocus_prompt_message">With UbiFocus, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string> <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string> <string name="camera_server_died">Media server died, closing camera.</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index c149e997d..36b6507f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -397,8 +397,8 @@ <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_party">Party</string> <!-- Scene mode for refocus feature [CHAR LIMIT=16] --> - <string name="pref_camera_scenemode_entry_refocus">Macro+</string> - <string name="pref_camera_scenemode_entry_optizoom">Opti-Zoom</string> + <string name="pref_camera_scenemode_entry_refocus">UbiFocus</string> + <string name="pref_camera_scenemode_entry_optizoom">OptiZoom</string> <!-- Settings menu, scene mode labels [CHAR LIMIT=50] --> <string name="pref_camera_scenemode_label_auto">NONE</string> |
