diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-07-07 14:19:00 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-07-07 14:26:21 +0800 |
| commit | 3008e86ddbf854e9fb6a247b6fa9f267d44886ba (patch) | |
| tree | 98ef2e96a58e09dbc3f144494b48adbf395a0a58 /src/com | |
| parent | cd4aacd29f860ba6c1769372c698ab1a4517179c (diff) | |
| download | LegacyCamera-3008e86ddbf854e9fb6a247b6fa9f267d44886ba.zip LegacyCamera-3008e86ddbf854e9fb6a247b6fa9f267d44886ba.tar.gz LegacyCamera-3008e86ddbf854e9fb6a247b6fa9f267d44886ba.tar.bz2 | |
Remove color effect in camcorder app.
bug:5000060
Change-Id: Iaac250dfb0cabf3d6d6a9c563d432d9fac889a3d
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CamcorderHeadUpDisplay.java | 7 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 4f3f2cc..683483c 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -568,8 +568,7 @@ public class VideoCamera extends ActivityBase CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL}; - final String[] OTHER_SETTING_KEYS = {CameraSettings.KEY_COLOR_EFFECT}; - mIndicatorWheel.initialize(this, mPreferenceGroup, SETTING_KEYS, OTHER_SETTING_KEYS); + mIndicatorWheel.initialize(this, mPreferenceGroup, SETTING_KEYS, null); mIndicatorWheel.setListener(new MyIndicatorWheelListener()); mPopupGestureDetector = new GestureDetector(this, new PopupGestureListener()); @@ -1777,14 +1776,6 @@ public class VideoCamera extends ActivityBase } } - // Set color effect parameter. - String colorEffect = mPreferences.getString( - CameraSettings.KEY_COLOR_EFFECT, - getString(R.string.pref_camera_coloreffect_default)); - if (isSupported(colorEffect, mParameters.getSupportedColorEffects())) { - mParameters.setColorEffect(colorEffect); - } - // Set zoom. if (mParameters.isZoomSupported()) { mParameters.setZoom(mZoomValue); diff --git a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java index 7268e3a..689fe3d 100644 --- a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java +++ b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java @@ -16,12 +16,12 @@ package com.android.camera.ui; -import android.content.Context; - import com.android.camera.CameraSettings; import com.android.camera.ListPreference; import com.android.camera.PreferenceGroup; +import android.content.Context; + public class CamcorderHeadUpDisplay extends HeadUpDisplay { private static final String TAG = "CamcorderHeadUpDisplay"; @@ -47,8 +47,7 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay { CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_SCENE_MODE, - CameraSettings.KEY_PICTURE_SIZE, - CameraSettings.KEY_COLOR_EFFECT); + CameraSettings.KEY_PICTURE_SIZE); mOtherSettings = new OtherSettingsIndicator(context, prefs); mOtherSettings.setOnRestorePreferencesClickedRunner(new Runnable() { |