summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--res/drawable/ic_settings_filter.xml2
-rw-r--r--res/layout/camera.xml4
-rw-r--r--res/layout/capture_module.xml10
-rw-r--r--src/com/android/camera/CameraActivity.java4
-rw-r--r--src/com/android/camera/CaptureModule.java33
-rw-r--r--src/com/android/camera/CaptureUI.java111
-rw-r--r--src/com/android/camera/ComboPreferences.java2
-rw-r--r--src/com/android/camera/FocusStateListener.java14
-rw-r--r--src/com/android/camera/SettingsManager.java1
-rw-r--r--src/com/android/camera/VideoMenu.java2
-rw-r--r--src/com/android/camera/VideoModule.java15
-rw-r--r--src/com/android/camera/ui/CameraControls.java2
-rw-r--r--src/com/android/camera/ui/ListMenu.java2
14 files changed, 60 insertions, 144 deletions
diff --git a/Android.mk b/Android.mk
index a738ae3..804d319 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,8 @@ LOCAL_PACKAGE_NAME := Snap
LOCAL_AAPT_FLAGS += --rename-manifest-package org.cyanogenmod.snap
+LOCAL_CERTIFICATE := platform
+
#LOCAL_SDK_VERSION := current
LOCAL_RENDERSCRIPT_TARGET_API := 23
diff --git a/res/drawable/ic_settings_filter.xml b/res/drawable/ic_settings_filter.xml
index 9f0e4ed..5b86789 100644
--- a/res/drawable/ic_settings_filter.xml
+++ b/res/drawable/ic_settings_filter.xml
@@ -6,7 +6,7 @@
android:viewportHeight="24">
<path
- android:fillColor="@color/white"
+ android:fillColor="@color/grey"
android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09
2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15
L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index a714600..7ca37e4 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.CameraRootFrame xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/camera_root_frame"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -37,4 +37,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
</com.android.camera.ui.CameraRootView>
-</FrameLayout>
+</com.android.camera.ui.CameraRootFrame>
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 07594ce..26ac861 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -55,6 +55,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <com.android.camera.ui.focus.FocusRingView
+ android:id="@+id/focus_ring"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
<com.android.camera.ui.Camera2FaceView
android:id="@+id/face_view"
android:layout_width="match_parent"
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 2685357..fffd016 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -200,7 +200,7 @@ public class CameraActivity extends Activity
private WideAnglePanoramaModule mPanoModule;
private CaptureModule mCaptureModule;
private FrameLayout mAboveFilmstripControlLayout;
- private FrameLayout mCameraRootFrame;
+ private CameraRootFrame mCameraRootFrame;
private View mCameraPhotoModuleRootView;
private View mCameraVideoModuleRootView;
private View mCameraPanoModuleRootView;
@@ -1497,7 +1497,7 @@ public class CameraActivity extends Activity
LayoutInflater inflater = getLayoutInflater();
View rootLayout = inflater.inflate(R.layout.camera, null, false);
- mCameraRootFrame = (FrameLayout)rootLayout.findViewById(R.id.camera_root_frame);
+ mCameraRootFrame = (CameraRootFrame)rootLayout.findViewById(R.id.camera_root_frame);
mCameraPhotoModuleRootView = rootLayout.findViewById(R.id.camera_photo_root);
mCameraVideoModuleRootView = rootLayout.findViewById(R.id.camera_video_root);
mCameraPanoModuleRootView = rootLayout.findViewById(R.id.camera_pano_root);
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a7448ae..79b4d40 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -78,6 +78,7 @@ import com.android.camera.PhotoModule.NamedImages;
import com.android.camera.PhotoModule.NamedImages.NamedEntity;
import com.android.camera.imageprocessor.filter.SharpshooterFilter;
import com.android.camera.ui.CountDownView;
+import com.android.camera.ui.focus.FocusRing;
import com.android.camera.ui.ModuleSwitcher;
import com.android.camera.ui.RotateTextToast;
import com.android.camera.util.CameraUtil;
@@ -1572,7 +1573,6 @@ public class CaptureModule implements CameraModule, PhotoController,
updateVideoSnapshotSize();
updateTimeLapseSetting();
estimateJpegFileSize();
- updateMaxVideoDuration();
}
@Override
@@ -1766,10 +1766,10 @@ public class CaptureModule implements CameraModule, PhotoController,
Log.d(TAG, "onSingleTapUp " + x + " " + y);
int[] newXY = {x, y};
if (!mUI.isOverSurfaceView(newXY)) return;
- mUI.setFocusPosition(x, y);
+ mUI.getFocusRing().startActiveFocus();
+ mUI.getFocusRing().setFocusLocation(x, y);
x = newXY[0];
y = newXY[1];
- mUI.onFocusStarted();
if (isBackCamera()) {
switch (getCameraMode()) {
case DUAL_MODE:
@@ -2016,18 +2016,6 @@ public class CaptureModule implements CameraModule, PhotoController,
}
}
- private void updateMaxVideoDuration() {
- String minutesStr = mSettingsManager.getValue(SettingsManager.KEY_VIDEO_DURATION);
- int minutes = Integer.parseInt(minutesStr);
- if (minutes == -1) {
- // User wants lowest, set 30s */
- mMaxVideoDurationInMs = 30000;
- } else {
- // 1 minute = 60000ms
- mMaxVideoDurationInMs = 60000 * minutes;
- }
- }
-
private void startRecordingVideo(int cameraId) {
if (null == mCameraDevice[cameraId]) {
return;
@@ -2036,7 +2024,7 @@ public class CaptureModule implements CameraModule, PhotoController,
mIsRecordingVideo = true;
mMediaRecorderPausing = false;
mUI.hideUIwhileRecording();
- mUI.clearFocus();
+ mUI.getFocusRing().stopFocusAnimations();
mCameraHandler.removeMessages(CANCEL_TOUCH_FOCUS, cameraId);
mState[cameraId] = STATE_PREVIEW;
mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
@@ -2076,7 +2064,7 @@ public class CaptureModule implements CameraModule, PhotoController,
e.printStackTrace();
}
mMediaRecorder.start();
- mUI.clearFocus();
+ mUI.getFocusRing().stopFocusAnimations();
mUI.resetPauseButton();
mRecordingTotalTime = 0L;
mRecordingStartTime = SystemClock.uptimeMillis();
@@ -2332,9 +2320,9 @@ public class CaptureModule implements CameraModule, PhotoController,
size = CameraSettings.getTimeLapseQualityFor(size);
mProfile = CamcorderProfile.get(cameraId, size);
- int videoEncoder = SettingTranslation
+ mProfile.videoCodec = SettingTranslation
.getVideoEncoder(mSettingsManager.getValue(SettingsManager.KEY_VIDEO_ENCODER));
- int audioEncoder = SettingTranslation
+ mProfile.audioCodec = SettingTranslation
.getAudioEncoder(mSettingsManager.getValue(SettingsManager.KEY_AUDIO_ENCODER));
int outputFormat = MediaRecorder.OutputFormat.MPEG_4;
@@ -2351,12 +2339,12 @@ public class CaptureModule implements CameraModule, PhotoController,
mMediaRecorder.setVideoEncodingBitRate(mProfile.videoBitRate);
mMediaRecorder.setVideoFrameRate(mProfile.videoFrameRate);
mMediaRecorder.setVideoSize(mProfile.videoFrameWidth, mProfile.videoFrameHeight);
- mMediaRecorder.setVideoEncoder(videoEncoder);
+ mMediaRecorder.setVideoEncoder(mProfile.videoCodec);
if (!mCaptureTimeLapse) {
mMediaRecorder.setAudioEncodingBitRate(mProfile.audioBitRate);
mMediaRecorder.setAudioChannels(mProfile.audioChannels);
mMediaRecorder.setAudioSamplingRate(mProfile.audioSampleRate);
- mMediaRecorder.setAudioEncoder(audioEncoder);
+ mMediaRecorder.setAudioEncoder(mProfile.audioCodec);
}
mMediaRecorder.setMaxDuration(mMaxVideoDurationInMs);
if (mCaptureTimeLapse) {
@@ -2835,9 +2823,6 @@ public class CaptureModule implements CameraModule, PhotoController,
case SettingsManager.KEY_JPEG_QUALITY:
estimateJpegFileSize();
continue;
- case SettingsManager.KEY_VIDEO_DURATION:
- updateMaxVideoDuration();
- continue;
case SettingsManager.KEY_VIDEO_QUALITY:
updateVideoSize();
continue;
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index f5f23fa..dfec5eb 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -46,7 +46,7 @@ import com.android.camera.ui.AutoFitSurfaceView;
import com.android.camera.ui.Camera2FaceView;
import com.android.camera.ui.CameraControls;
import com.android.camera.ui.CountDownView;
-import com.android.camera.ui.FocusIndicator;
+import com.android.camera.ui.focus.FocusRing;
import com.android.camera.ui.ListMenu;
import com.android.camera.ui.ListSubMenu;
import com.android.camera.ui.ModuleSwitcher;
@@ -63,7 +63,7 @@ import org.codeaurora.snapcam.R;
import java.util.List;
import java.util.Locale;
-public class CaptureUI implements FocusOverlayManager.FocusUI,
+public class CaptureUI implements
PreviewGestures.SingleTapListener,
LocationManager.Listener,
CameraManager.CameraFaceDetectionCallback,
@@ -71,7 +71,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
ListMenu.Listener,
ListSubMenu.Listener,
PauseButton.OnPauseButtonListener {
- private static final int HIGHLIGHT_COLOR = 0xff33b5e5;
private static final String TAG = "SnapCam_CaptureUI";
private static final int SETTING_MENU_NONE = 0;
private static final int SETTING_MENU_IN_ANIMATION = 1;
@@ -99,7 +98,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
SettingsManager.KEY_MAKEUP,
SettingsManager.KEY_FACE_DETECTION,
SettingsManager.KEY_VIDEO_FLASH_MODE,
- SettingsManager.KEY_VIDEO_DURATION,
SettingsManager.KEY_VIDEO_QUALITY
};
String[] mDeveloperKeys = new String[]{
@@ -115,6 +113,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
SettingsManager.KEY_VIDEO_ROTATION,
SettingsManager.KEY_AUTO_VIDEOSNAP_SIZE
};
+ private final FocusRing mFocusRing;
private CameraActivity mActivity;
private View mRootView;
private View mPreviewCover;
@@ -186,7 +185,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
private View mTimeLapseLabel;
private RotateLayout mRecordingTimeRect;
private PauseButton mPauseButton;
- private RotateImageView mMuteButton;
int mPreviewWidth;
int mPreviewHeight;
@@ -259,6 +257,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mSurfaceHolder2 = mSurfaceView2.getHolder();
mSurfaceHolder2.addCallback(callback2);
+ mFocusRing = (FocusRing) mRootView.findViewById(R.id.focus_ring);
+
mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay);
mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button);
mVideoButton = (ImageView) mRootView.findViewById(R.id.video_button);
@@ -291,28 +291,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mPauseButton = (PauseButton) mRootView.findViewById(R.id.video_pause);
mPauseButton.setOnPauseButtonListener(this);
- mMuteButton = (RotateImageView)mRootView.findViewById(R.id.mute_button);
- mMuteButton.setVisibility(View.VISIBLE);
- if(!mModule.isAudioMute()) {
- mMuteButton.setImageResource(R.drawable.ic_unmuted_button);
- } else {
- mMuteButton.setImageResource(R.drawable.ic_muted_button);
- }
- mMuteButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- boolean isEnabled = !mModule.isAudioMute();
- mModule.setMute(isEnabled, true);
- if (!isEnabled)
- mMuteButton.setImageResource(R.drawable.ic_unmuted_button);
- else
- mMuteButton.setImageResource(R.drawable.ic_muted_button);
- }
- });
-
- RotateImageView muteButton = (RotateImageView) mRootView.findViewById(R.id.mute_button);
- muteButton.setVisibility(View.GONE);
-
mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
mFaceView = (Camera2FaceView) mRootView.findViewById(R.id.face_view);
@@ -375,7 +353,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mShutterButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (!CameraControls.isAnimating())
+ if (!mCameraControls.isAnimating())
doShutterAnimation();
}
});
@@ -509,12 +487,10 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
hideSwitcher();
mRecordingTimeView.setText("");
((ViewGroup)mRootView).addView(mRecordingTimeRect);
- mMuteButton.setVisibility(View.VISIBLE);
} else {
mVideoButton.setImageResource(R.drawable.btn_new_shutter_video);
showSwitcher();
((ViewGroup)mRootView).removeView(mRecordingTimeRect);
- mMuteButton.setVisibility(View.INVISIBLE);
}
}
@@ -623,10 +599,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
} else if (event.getAction() == MotionEvent.ACTION_UP) {
if (System.currentTimeMillis() - startTime < CLICK_THRESHOLD) {
for (View v1 : views) {
- v1.setBackgroundResource(R.drawable.scene_mode_view_border);
+ v1.setActivated(v1 == v);
}
- View border = v.findViewById(R.id.border);
- border.setBackgroundResource(R.drawable.scene_mode_view_border_selected);
updateSceneModeIcon(j);
mSettingsManager.setValueIndex(SettingsManager.KEY_SCENE_MODE, j);
removeSceneAndFilterMenu(true);
@@ -636,10 +610,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
}
});
- View border = sceneBox.findViewById(R.id.border);
- views[j] = border;
- if (i == init)
- border.setBackgroundResource(R.drawable.scene_mode_view_border_selected);
+ views[j] = sceneBox;
+ sceneBox.setActivated(i == init);
imageView.setImageResource(thumbnails[i]);
label.setText(entries[i]);
@@ -745,19 +717,16 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mSettingsManager.setValueIndex(SettingsManager
.KEY_COLOR_EFFECT, j);
for (View v1 : views) {
- v1.setBackground(null);
+ v1.setActivated(v1 == v);
}
- ImageView image = (ImageView) v.findViewById(R.id.image);
- image.setBackgroundColor(HIGHLIGHT_COLOR);
}
}
return true;
}
});
- views[j] = imageView;
- if (i == init)
- imageView.setBackgroundColor(HIGHLIGHT_COLOR);
+ views[j] = filterBox;
+ filterBox.setActivated(i == init);
TextView label = (TextView) filterBox.findViewById(R.id.label);
imageView.setImageResource(thumbnails[i]);
@@ -900,7 +869,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public void animateFadeIn(View v) {
ViewPropertyAnimator vp = v.animate();
- vp.alpha(0.85f).setDuration(ANIMATION_DURATION);
+ vp.alpha(1f).setDuration(ANIMATION_DURATION);
vp.start();
}
@@ -1032,7 +1001,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public void showSettingMenu() {
- if (isMenuBeingShown() || CameraControls.isAnimating()) {
+ if (isMenuBeingShown() || mCameraControls.isAnimating()) {
return;
}
if (mSettingMenu == null) {
@@ -1135,7 +1104,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mThumbnail.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (!CameraControls.isAnimating() && !mModule.isTakingPicture() &&
+ if (!mCameraControls.isAnimating() && !mModule.isTakingPicture() &&
!mModule.isRecordingVideo())
mActivity.gotoGallery();
}
@@ -1330,54 +1299,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
return ret;
}
- private FocusIndicator getFocusIndicator() {
- return (mFaceView != null && mFaceView.faceExists()) ? mFaceView : mPieRenderer;
- }
-
- @Override
- public boolean hasFaces() {
- return (mFaceView != null && mFaceView.faceExists());
- }
-
- public void clearFaces() {
- if (mFaceView != null) mFaceView.clear();
- }
-
- @Override
- public void clearFocus() {
- FocusIndicator indicator = getFocusIndicator();
- if (indicator != null) indicator.clear();
- }
-
- @Override
- public void setFocusPosition(int x, int y) {
- mPieRenderer.setFocus(x, y);
- }
-
- @Override
- public void onFocusStarted() {
- FocusIndicator indicator = getFocusIndicator();
- if (indicator != null) indicator.showStart();
- }
-
- @Override
- public void onFocusSucceeded(boolean timeout) {
- FocusIndicator indicator = getFocusIndicator();
- if (indicator != null) indicator.showSuccess(timeout);
- }
-
- @Override
- public void onFocusFailed(boolean timeOut) {
-
- }
-
- @Override
- public void pauseFaceDetection() {
-
- }
-
- @Override
- public void resumeFaceDetection() {
+ public FocusRing getFocusRing() {
+ return mFocusRing;
}
public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound) {
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index a094a80..972d673 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -155,7 +155,7 @@ public class ComboPreferences implements
|| key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE)
|| key.equals(CameraSettings.KEY_CAMERA_SAVEPATH)
|| key.equals(CameraSettings.KEY_POWER_SHUTTER)
- || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS
+ || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS)
|| key.equals(SettingsManager.KEY_CAMERA2)
|| key.equals(SettingsManager.KEY_CAMERA_ID)
|| key.equals(SettingsManager.KEY_MONO_ONLY)
diff --git a/src/com/android/camera/FocusStateListener.java b/src/com/android/camera/FocusStateListener.java
index 6c536c5..459e4ec 100644
--- a/src/com/android/camera/FocusStateListener.java
+++ b/src/com/android/camera/FocusStateListener.java
@@ -44,31 +44,31 @@ public class FocusStateListener {
switch (focusState) {
case CaptureResult.CONTROL_AF_STATE_ACTIVE_SCAN:
Log.d(TAG, "CONTROL_AF_STATE_ACTIVE_SCAN onFocusStarted");
- mUI.onFocusStarted();
+ mUI.getFocusRing().startActiveFocus();
break;
case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED:
Log.d(TAG, "CONTROL_AF_STATE_FOCUSED_LOCKED onFocusSucceeded");
- mUI.onFocusSucceeded(false);
+ mUI.getFocusRing().stopFocusAnimations();
break;
case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED:
Log.d(TAG, "CONTROL_AF_STATE_NOT_FOCUSED_LOCKED onFocusFailed");
- mUI.onFocusFailed(false);
+ mUI.getFocusRing().stopFocusAnimations();
break;
case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED:
Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_FOCUSED onFocusSucceeded");
- mUI.onFocusSucceeded(true);
+ mUI.getFocusRing().stopFocusAnimations();
break;
case CaptureResult.CONTROL_AF_STATE_PASSIVE_SCAN:
Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_SCAN onFocusStarted");
- mUI.onFocusStarted();
+ mUI.getFocusRing().startPassiveFocus();
break;
case CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED:
Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_UNFOCUSED onFocusFailed");
- mUI.onFocusFailed(true);
+ mUI.getFocusRing().stopFocusAnimations();
break;
case CaptureResult.CONTROL_AF_STATE_INACTIVE:
Log.d(TAG, "CONTROL_AF_STATE_INACTIVE clearFocus");
- mUI.clearFocus();
+ mUI.getFocusRing().stopFocusAnimations();
break;
}
}
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 37976f1..e78a360 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -93,7 +93,6 @@ public class SettingsManager implements ListMenu.SettingsListener {
public static final String KEY_EXPOSURE = "pref_camera2_exposure_key";
public static final String KEY_TIMER = "pref_camera2_timer_key";
public static final String KEY_LONGSHOT = "pref_camera2_longshot_key";
- public static final String KEY_VIDEO_DURATION = "pref_camera2_video_duration_key";
public static final String KEY_VIDEO_QUALITY = "pref_camera2_video_quality_key";
public static final String KEY_VIDEO_ENCODER = "pref_camera2_videoencoder_key";
public static final String KEY_AUDIO_ENCODER = "pref_camera2_audioencoder_key";
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 1fd8b5d..d42c248 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -611,7 +611,7 @@ public class VideoMenu extends MenuController
mListMenu.setPreferenceEnabled(
CameraSettings.KEY_SEE_MORE, false);
mListMenu.overrideSettings(
- CameraSettings.KEY_SEE_MORE, mActivity.getString(R.string.pref_camera_see_more_value_off));
+ CameraSettings.KEY_SEE_MORE, mActivity.getString(R.string.setting_off));
}
}
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 5dc4c21..5743a70 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2346,7 +2346,6 @@ public class VideoModule implements CameraModule,
mActivity.getString(R.string.pref_camera_dis_value_disable));
RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS,
Toast.LENGTH_LONG).show();
- mIsDISEnabled = false;
} else {
Log.e(TAG, "Not supported IS mode = " +
mActivity.getString(R.string.pref_camera_dis_value_disable));
@@ -2532,12 +2531,11 @@ public class VideoModule implements CameraModule,
/* Disable CDS */
if (noiseReductionMode.equals(
mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) &&
- video_cds.equals(mActivity.getString(R.string.
- pref_camera_video_cds_value_on))) {
+ video_cds.equals(mActivity.getString(R.string.setting_on))) {
mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
- mActivity.getString(R.string.pref_camera_video_cds_value_off));
+ mActivity.getString(R.string.setting_off));
mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
- mActivity.getString(R.string.pref_camera_video_cds_value_off));
+ mActivity.getString(R.string.setting_off));
Toast.makeText(mActivity, R.string.disable_CDS_during_HighQualityNoiseReduction,
Toast.LENGTH_LONG).show();
}
@@ -2545,12 +2543,11 @@ public class VideoModule implements CameraModule,
/* Disable TNR */
if (noiseReductionMode.equals(
mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) &&
- video_tnr.equals(mActivity.getString(R.string.
- pref_camera_video_tnr_value_on))) {
+ video_tnr.equals(mActivity.getString(R.string.setting_on))) {
mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
- mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+ mActivity.getString(R.string.setting_off));
mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
- mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+ mActivity.getString(R.string.setting_off));
Toast.makeText(mActivity, R.string.disable_TNR_during_HighQualityNoiseReduction,
Toast.LENGTH_LONG).show();
}
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 980bff2..2610bc4 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -212,7 +212,7 @@ public class CameraControls extends RotatableLayout {
mSceneModeSwitcher, mHdrSwitcher, mAutoHdrNotice, mHistogramView
};
mBottomViews = new View[] {
- mPreview, mShutter, mSwitcher
+ mPreview, mShutter, mVideoShutter, mSwitcher
};
mAllViews = new View[mTopViews.length + mBottomViews.length];
for (int i = 0; i < mTopViews.length; i++) {
diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java
index decaad8..58042a2 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -44,7 +44,7 @@ import java.util.List;
/* A popup window that contains several camera settings. */
public class ListMenu extends ListView
implements ListMenuItem.Listener,
- RotateLayout.Child {
+ RotateLayout.Child,
AdapterView.OnItemClickListener,
ListSubMenu.Listener {
@SuppressWarnings("unused")