summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/video_module.xml4
-rw-r--r--res/values/qcomarrays.xml6
-rw-r--r--res/values/qcomstrings.xml6
-rw-r--r--res/values/styles.xml2
-rw-r--r--src/com/android/camera/CameraSettings.java10
-rw-r--r--src/com/android/camera/PhotoMenu.java4
-rw-r--r--src/com/android/camera/PhotoModule.java56
-rw-r--r--src/com/android/camera/VideoModule.java4
8 files changed, 58 insertions, 34 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 20d7be1d2..2456caf82 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -70,8 +70,8 @@
<com.android.camera.PauseButton android:id="@+id/video_pause"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="70dp"
- android:padding="23dp"
+ android:layout_marginLeft="50dp"
+ android:padding="38dp"
android:src="@drawable/btn_pause_recording"/>
<include layout="@layout/viewfinder_labels_video"
android:id="@+id/labels" />
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index c4c7be482..7574992b9 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -833,12 +833,14 @@
</string-array>
<string-array name="pref_camera_instant_capture_entries" translatable="true">
- <item>@string/pref_camera_instant_capture_entry_enable</item>
+ <item>@string/pref_camera_instant_capture_entry_aggressive_aec</item>
+ <item>@string/pref_camera_instant_capture_entry_fast_aec</item>
<item>@string/pref_camera_instant_capture_entry_disable</item>
</string-array>
<string-array name="pref_camera_instant_capture_entry_values" translatable="false">
- <item>@string/pref_camera_instant_capture_value_enable</item>
+ <item>@string/pref_camera_instant_capture_value_aggressive_aec</item>
+ <item>@string/pref_camera_instant_capture_value_fast_aec</item>
<item>@string/pref_camera_instant_capture_value_disable</item>
</string-array>
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 476d65efe..974ac2356 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -202,12 +202,14 @@
<!-- Instant Capture entry -->
<string name="pref_camera_instant_capture_title" translatable="true">Instant Capture</string>
- <string name="pref_camera_instant_capture_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string>
+ <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string>
<string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string>
<!-- Instant Capture entry values -->
<string name="pref_camera_instant_capture_default" translatable="false">0</string>
- <string name="pref_camera_instant_capture_value_enable" translatable="false">1</string>
+ <string name="pref_camera_instant_capture_value_aggressive_aec" translatable="false">1</string>
+ <string name="pref_camera_instant_capture_value_fast_aec" translatable="false">2</string>
<string name="pref_camera_instant_capture_value_disable" translatable="false">0</string>
<!-- Settings screen, ZSL location dialog choices -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bb13cc5c8..4a7284874 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -129,7 +129,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
- <item name="android:layout_marginTop">23dp</item>
+ <item name="android:layout_marginTop">38dp</item>
<item name="android:paddingLeft">15dp</item>
<item name="android:paddingRight">15dp</item>
<item name="android:paddingTop">3dp</item>
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index b9d085f9b..da203d52c 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -167,6 +167,7 @@ public class CameraSettings {
public static final String KEY_QC_SEE_MORE_MODE = "see-more";
public static final String KEY_QC_NOISE_REDUCTION_MODE = "noise-reduction-mode";
public static final String KEY_QC_INSTANT_CAPTURE = "instant-capture";
+ public static final String KEY_QC_INSTANT_CAPTURE_VALUES = "instant-capture-values";
public static final String KEY_INTERNAL_PREVIEW_RESTART = "internal-restart";
public static final String KEY_QC_ZSL_HDR_SUPPORTED = "zsl-hdr-supported";
@@ -1402,14 +1403,11 @@ public class CameraSettings {
public static boolean isInstantCaptureSupported(Parameters params) {
boolean ret = false;
if (null != params) {
- // TODO: need to uncomment this code once get parameter
- // is supported
- //String val = params.get(KEY_QC_INSTANT_CAPTURE);
- //if (null != val) {
+ String val = params.get(KEY_QC_INSTANT_CAPTURE_VALUES);
+ if (null != val) {
ret = true;
- //}
+ }
}
return ret;
}
-
}
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 173cca61c..083b019c4 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -731,6 +731,8 @@ public class PhotoMenu extends MenuController
mActivity.getString(R.string.pref_camera_advanced_feature_default));
popup1.setPreferenceEnabled(CameraSettings.KEY_ADVANCED_FEATURES, false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false);
+
if(!TsMakeupManager.HAS_TS_MAKEUP) {
if (mHdrSwitcher.getVisibility() == View.VISIBLE) {
buttonSetEnabled(mHdrSwitcher, true);
@@ -752,7 +754,7 @@ public class PhotoMenu extends MenuController
popup1.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false);
popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false);
-
+ popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false);
setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
if(!TsMakeupManager.HAS_TS_MAKEUP) {
if (mHdrSwitcher.getVisibility() == View.VISIBLE) {
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 5d577a1eb..d6caf7eb8 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2937,10 +2937,10 @@ public class PhotoModule
CameraSettings.KEY_INSTANT_CAPTURE,
mActivity.getString(R.string.pref_camera_instant_capture_default));
if (instantCapture.equals(mActivity.getString(
- R.string.pref_camera_instant_capture_value_enable))) {
- return true;
+ R.string.pref_camera_instant_capture_value_disable))) {
+ return false;
}
- return false;
+ return true;
}
private void qcomUpdateAdvancedFeatures(String ubiFocus,
@@ -3223,23 +3223,6 @@ public class PhotoModule
mParameters.set(CameraSettings.KEY_SNAPCAM_HDR_NEED_1X, hdrNeed1x);
}
- // Set Instant Capture
- String instantCapture = mPreferences.getString(
- CameraSettings.KEY_INSTANT_CAPTURE,
- mActivity.getString(R.string.pref_camera_instant_capture_default));
-
- if (instantCapture.equals(mActivity.getString(
- R.string.pref_camera_instant_capture_value_enable))) {
- if (!mInstantCaptureSnapShot) {
- // Disable instant capture after first snapshot is taken
- instantCapture = mActivity.getString(
- R.string.pref_camera_instant_capture_value_disable);
- }
- }
- Log.v(TAG, "Instant capture = " + instantCapture + ", mInstantCaptureSnapShot = "
- + mInstantCaptureSnapShot);
- mParameters.set(CameraSettings.KEY_QC_INSTANT_CAPTURE, instantCapture);
-
// Set Advanced features.
String advancedFeature = mPreferences.getString(
CameraSettings.KEY_ADVANCED_FEATURES,
@@ -3489,6 +3472,39 @@ public class PhotoModule
}
}
+ // Set Instant Capture
+ String instantCapture = mPreferences.getString(
+ CameraSettings.KEY_INSTANT_CAPTURE,
+ mActivity.getString(R.string.pref_camera_instant_capture_default));
+
+ if (!instantCapture.equals(mActivity.getString(
+ R.string.pref_camera_instant_capture_value_disable))) {
+ if (zsl.equals("on") &&
+ advancedFeature.equals(mActivity.getString(R.string.pref_camera_advanced_feature_value_none))) {
+ if (!mInstantCaptureSnapShot) {
+ // Disable instant capture after first snapshot is taken
+ instantCapture = mActivity.getString(
+ R.string.pref_camera_instant_capture_value_disable);
+ }
+ } else {
+ mParameters.set(CameraSettings.KEY_QC_INSTANT_CAPTURE,
+ mActivity.getString(R.string.pref_camera_instant_capture_value_disable));
+ instantCapture = mActivity.getString(
+ R.string.pref_camera_instant_capture_value_disable);
+ mActivity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mUI.overrideSettings(CameraSettings.KEY_INSTANT_CAPTURE,
+ mActivity.getString(R.string.pref_camera_instant_capture_value_disable));
+ }
+ });
+ }
+ }
+ Log.v(TAG, "Instant capture = " + instantCapture + ", mInstantCaptureSnapShot = "
+ + mInstantCaptureSnapShot);
+ mParameters.set(CameraSettings.KEY_QC_INSTANT_CAPTURE, instantCapture);
+
+
//Set Histogram
String histogram = mPreferences.getString(
CameraSettings.KEY_HISTOGRAM,
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c9be68f6b..9ad8f0197 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1486,6 +1486,10 @@ public class VideoModule implements CameraModule,
mProfile.audioCodec = mAudioEncoder;
mProfile.duration = mMaxVideoDurationInMs;
+ if ((mProfile.audioCodec == MediaRecorder.AudioEncoder.AMR_NB) &&
+ !mCaptureTimeLapse && !isHFR) {
+ mProfile.fileFormat = MediaRecorder.OutputFormat.THREE_GPP;
+ }
// Set params individually for HFR case, as we do not want to encode audio
if ((isHFR || isHSR) && captureRate > 0) {
if (isHSR) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:58:24 +0000