diff options
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 1 | ||||
| -rw-r--r-- | res/values-zh-rTW/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 11 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 4 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
8 files changed, 37 insertions, 5 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 07eceb500..c87184728 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -481,4 +481,5 @@ <string name="error_app_unsupported_raw">"RAW图片格式下不支持零秒快拍，已为您切换至JPEG格式"</string> <string name="error_app_unsupported_hsr">当前格式下不支持HSR</string> + <string name="pref_camera_longshot_title">连拍</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9697eec7b..46c3df368 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -292,4 +292,5 @@ <string name="cannot_load_image" msgid="4100136187076585580">"無法載入圖片！"</string> <string name="switch_photo_filmstrip" msgid="1448511001008888767">"幻燈片檢視"</string> <string name="setting_wallpaper" msgid="2397759659347872725">"正在設定桌布"</string> + <string name="pref_camera_longshot_title">連拍</string> </resources> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 07bb7eb6c..dfdd67cd3 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -579,5 +579,16 @@ <item>@string/pref_camera_advanced_feature_value_optizoom_on</item> </string-array> + <!-- Camera Preferences Long Shot dialog box entries --> + <string-array name="pref_camera_longshot_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </string-array> + + <string-array name="pref_camera_longshot_entryvalues" translatable="false"> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index a55623dae..cd089a2ce 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -651,5 +651,9 @@ <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string> <string name="pref_camera_videosnapsize_default" translatable="false">1920x1080</string> + + <!-- longshot value --> + <string name="pref_camera_longshot_default" translatable="false">off</string> + <string name="pref_camera_longshot_title">Continuous Shot</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index c3afedecf..db56927a7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -242,4 +242,12 @@ camera:title="@string/pref_camera_advanced_features_title" camera:entries="@array/pref_camera_advanced_features_entries" camera:entryValues="@array/pref_camera_advanced_features_entryvalues" /> + + <ListPreference + camera:key="pref_camera_longshot_key" + camera:title="@string/pref_camera_longshot_title" + camera:defaultValue="@string/pref_camera_longshot_default" + camera:entries="@array/pref_camera_longshot_entries" + camera:entryValues="@array/pref_camera_longshot_entryvalues" /> + </PreferenceGroup> diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index c6fad5ca0..243a1ff8f 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -106,6 +106,8 @@ public class CameraSettings { public static final String KEY_FACE_RECOGNITION = "pref_camera_facerc_key"; public static final String KEY_DIS = "pref_camera_dis_key"; + public static final String KEY_LONGSHOT = "pref_camera_longshot_key"; + private static final String KEY_QC_SUPPORTED_AE_BRACKETING_MODES = "ae-bracket-hdr-values"; private static final String KEY_QC_SUPPORTED_AF_BRACKETING_MODES = "af-bracket-values"; private static final String KEY_QC_SUPPORTED_CF_MODES = "chroma-flash-values"; diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 61b74bed4..ce2511267 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -102,7 +102,8 @@ public class PhotoMenu extends PieController CameraSettings.KEY_ZSL, CameraSettings.KEY_TIMER, CameraSettings.KEY_TIMER_SOUND_EFFECTS, - CameraSettings.KEY_CAMERA_SAVEPATH + CameraSettings.KEY_CAMERA_SAVEPATH, + CameraSettings.KEY_LONGSHOT }; mOtherKeys2 = new String[] { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9f95154c7..7e1ac9088 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1741,10 +1741,14 @@ public class PhotoModule @Override public void onShutterButtonLongClick() { if ((null != mCameraDevice) && ((mCameraState == IDLE) || (mCameraState == FOCUSING))) { - boolean enable = false; - enable = SystemProperties.getBoolean(PERSIST_LONG_ENABLE, false); - if ( enable ) { - enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); + //Add on/off Menu for longshot + String longshot_enable = mPreferences.getString( + CameraSettings.KEY_LONGSHOT, + mActivity.getString(R.string.pref_camera_longshot_default)); + + Log.d(TAG, "longshot_enable = " + longshot_enable); + if (longshot_enable.equals("on")) { + boolean enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); mLongshotSave = enable; mCameraDevice.setLongshot(true); setCameraState(PhotoController.LONGSHOT); |