diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-07 05:07:51 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-20 20:02:05 +0300 |
| commit | c13bc9672f7b2f41d04410a76bf8d06a461b6bcc (patch) | |
| tree | 8e327f3065b25484134dc6bea2cd4d3f65305e73 /src/com/android/camera/PhotoModule.java | |
| parent | d39f18084212bc11e845549156ad58da0ecef920 (diff) | |
| download | android_packages_apps_Snap-c13bc9672f7b2f41d04410a76bf8d06a461b6bcc.tar.gz android_packages_apps_Snap-c13bc9672f7b2f41d04410a76bf8d06a461b6bcc.tar.bz2 android_packages_apps_Snap-c13bc9672f7b2f41d04410a76bf8d06a461b6bcc.zip | |
Snap: Cleanup qcom string resources
* Remove tons of unused strings
* Make some strings shorter to fit better in the settings popup
* 'Off' should be always the first option, else the app behaves unexpectedly
* Use consistent strings for all on/off options
* Replace string references to entryvalues for all qcom options with the actual parameters
* Group arrays & strings based on the option
Change-Id: I092ce765013e7a80a2928df8e7d1b7e7bfd67905
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 908a0ebdc..122add144 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1637,9 +1637,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; @@ -1733,9 +1733,7 @@ public class PhotoModule } if ((continuousShot != null) && continuousShot.equals(continuousShotOn)) { - String pictureFormat = mActivity.getString(R.string. - pref_camera_picture_format_value_jpeg); - mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, pictureFormat); + mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, PIXEL_FORMAT_JPEG); } else { mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, null); } @@ -1743,9 +1741,7 @@ public class PhotoModule mParameters.get(CameraSettings.KEY_QC_RE_FOCUS); if (mFocusManager.isZslEnabled()) { - String pictureFormat = mActivity.getString(R.string. - pref_camera_picture_format_value_jpeg); - mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, pictureFormat); + mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, PIXEL_FORMAT_JPEG); } else { mUI.overrideSettings(CameraSettings.KEY_PICTURE_FORMAT, null); } @@ -2852,8 +2848,7 @@ public class PhotoModule if (mIsImageCaptureIntent && !pictureFormat.equals(PIXEL_FORMAT_JPEG)) { pictureFormat = PIXEL_FORMAT_JPEG; Editor editor = mPreferences.edit(); - editor.putString(CameraSettings.KEY_PICTURE_FORMAT, - mActivity.getString(R.string.pref_camera_picture_format_value_jpeg)); + editor.putString(CameraSettings.KEY_PICTURE_FORMAT, PIXEL_FORMAT_JPEG); editor.apply(); } Log.v(TAG, "Picture format value =" + pictureFormat); |