diff options
| -rw-r--r-- | res/xml/video_preferences.xml | 10 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CamcorderHeadUpDisplay.java | 7 |
3 files changed, 5 insertions, 23 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index eee2e9b..c28bfcb 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -48,15 +48,7 @@ camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/> - <IconListPreference - camera:key="pref_camera_coloreffect_key" - camera:defaultValue="@string/pref_camera_coloreffect_default" - camera:title="@string/pref_camera_coloreffect_title" - camera:singleIcon="@drawable/ic_viewfinder_coloreffect" - camera:images="@array/coloreffect_images" - camera:entries="@array/pref_camera_coloreffect_entries" - camera:entryValues="@array/pref_camera_coloreffect_entryvalues"/> - <IconListPreference + <IconListPreference camera:key="pref_camera_id_key" camera:defaultValue="@string/pref_camera_id_default" camera:title="@string/pref_camera_id_title" 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() { |