diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-03-18 15:21:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-29 10:33:18 -0700 |
| commit | da443b91a41a2ca43c34c0d9838779501b32b470 (patch) | |
| tree | 80413b574970ae1941cae907e5f491dd827f740e /src/com | |
| parent | 7bef2ba28a44dfc9c2b5748298b543f662582a25 (diff) | |
| download | android_packages_apps_Snap-da443b91a41a2ca43c34c0d9838779501b32b470.tar.gz android_packages_apps_Snap-da443b91a41a2ca43c34c0d9838779501b32b470.tar.bz2 android_packages_apps_Snap-da443b91a41a2ca43c34c0d9838779501b32b470.zip | |
SnapdragonCamera: Remove accessing to dialog strings
Accessing to translatable strings can lead to unexpected
behavior when non-English is selected as system language.
Making change to remove any accessing to translatable
strings.
Change-Id: I687abdff984bf0e5680c34861fac8c1271b88ead
CRs-Fixed: 993382
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 10 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 681be3474..fda4bb4b6 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1217,10 +1217,10 @@ public class PhotoMenu extends MenuController private void changeFilterModeControlIcon(String value) { if(!value.equals("")) { - if(value.equalsIgnoreCase(mActivity.getString(R.string.pref_camera_coloreffect_entry_none))) { - value = mActivity.getString(R.string.pref_camera_filter_mode_entry_off); + if(value.equalsIgnoreCase("none")) { + value = "Off"; } else { - value = mActivity.getString(R.string.pref_camera_filter_mode_entry_on); + value = "On"; } final IconListPreference pref = (IconListPreference) mPreferenceGroup .findPreference(CameraSettings.KEY_FILTER_MODE); @@ -1436,9 +1436,7 @@ public class PhotoMenu extends MenuController } } - String scene_auto = mActivity.getString(R.string - .pref_camera_scenemode_entry_auto); - if (notSame(pref, CameraSettings.KEY_SCENE_MODE, scene_auto)) { + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, "auto")) { setPreference(CameraSettings.KEY_COLOR_EFFECT, mActivity.getString(R.string.pref_camera_coloreffect_default)); } diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5bf713a3d..589f55152 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1713,9 +1713,9 @@ public class PhotoModule mSceneMode = Parameters.SCENE_MODE_AUTO; String flashMode = Parameters.FLASH_MODE_OFF; String redeyeReduction = mActivity.getString(R.string. - pref_camera_redeyereduction_entry_disable); + pref_camera_redeyereduction_default); String aeBracketing = mActivity.getString(R.string. - pref_camera_ae_bracket_hdr_entry_off); + pref_camera_ae_bracket_hdr_default); String colorEffect = mActivity.getString(R.string. pref_camera_coloreffect_default); String exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; @@ -1845,9 +1845,9 @@ public class PhotoModule flashMode = Parameters.FLASH_MODE_OFF; focusMode = Parameters.FOCUS_MODE_INFINITY; redeyeReduction = mActivity.getString(R.string. - pref_camera_redeyereduction_entry_disable); + pref_camera_redeyereduction_default); aeBracketing = mActivity.getString(R.string. - pref_camera_ae_bracket_hdr_entry_off); + pref_camera_ae_bracket_hdr_default); colorEffect = mActivity.getString(R.string. pref_camera_coloreffect_default); exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index a7eb7306c..302dd47f0 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -636,10 +636,10 @@ public class VideoMenu extends MenuController private void changeFilterModeControlIcon(String value) { if(!value.equals("")) { - if(value.equalsIgnoreCase(mActivity.getString(R.string.pref_camera_coloreffect_entry_none))) { - value = mActivity.getString(R.string.pref_camera_filter_mode_entry_off); + if(value.equalsIgnoreCase("none")) { + value = "Off"; } else { - value = mActivity.getString(R.string.pref_camera_filter_mode_entry_on); + value = "On"; } final IconListPreference pref = (IconListPreference) mPreferenceGroup .findPreference(CameraSettings.KEY_FILTER_MODE); |