diff options
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 3 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1ae40a24f..4ff56c7c5 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -504,6 +504,9 @@ <string name="pref_camera_ae_bracket_hdr_title">自动包围曝光</string> + <!-- Settings screen, Selectable HDR need 1x frame title --> + <string name="pref_camera_hdr_need_1x_title">多帧HDR</string> + <!-- Settings screen, Selectable advanced features title --> <string name="pref_camera_advanced_features_title">高级特性</string> <!-- Settings screen, Selectable Zone Af dialog radio button choices --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index a3cb048ba..7e4988a01 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -823,14 +823,14 @@ <string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string> <!-- Settings screen, Selectable HDR need 1x frame default value --> - <string name="pref_camera_hdr_need_1x_default">true</string> + <string name="pref_camera_hdr_need_1x_default">@string/pref_hdr_need_1x_value_true</string> <!-- Settings screen, Selectable HDR need 1x frame title --> <string name="pref_camera_hdr_need_1x_title">HDR need 1x frame</string> <!-- Settings screen, Selectable HDR need 1x frame radio button choices --> - <string name="pref_camera_hdr_need_1x_entry_false">False</string> - <string name="pref_camera_hdr_need_1x_entry_true">True</string> + <string name="pref_camera_hdr_need_1x_entry_false">@string/setting_off</string> + <string name="pref_camera_hdr_need_1x_entry_true">@string/setting_on</string> <!-- HDR need 1x frame entry values. Do not translate. --> <string name="pref_hdr_need_1x_value_false">false</string> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b5fc0a676..3c4a93a18 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -621,8 +621,10 @@ public class CameraActivity extends Activity if (cursor == null) return null; int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); - cursor.moveToFirst(); - String s = cursor.getString(column_index); + String s = null; + if (cursor.moveToFirst()) { + s = cursor.getString(column_index); + } cursor.close(); return s; } @@ -1418,6 +1420,7 @@ public class CameraActivity extends Activity // If it's secure camera, requestLoad() should not be called // as it will load all the data. mDataAdapter.requestLoad(getContentResolver()); + setPreviewThumbnailBitmap(null); } } mLocalImagesObserver.setActivityPaused(false); |