diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-09 20:27:46 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-10 18:49:03 +0800 |
| commit | d50b09687918ae1c89e9c19175e217910b330c60 (patch) | |
| tree | edbbe5e0fd3f79d08506ee55608b45876e864a4f /src/com/android/camera/VideoCamera.java | |
| parent | 15e50f3db82768bc6952a2007eeba3d354e37b5c (diff) | |
| download | LegacyCamera-d50b09687918ae1c89e9c19175e217910b330c60.zip LegacyCamera-d50b09687918ae1c89e9c19175e217910b330c60.tar.gz LegacyCamera-d50b09687918ae1c89e9c19175e217910b330c60.tar.bz2 | |
Refactor IndicatorWheel.
Combine BasicSettingPopup and OtherSettingsPopup in
indicatorWheel for the preparation of adding share
button.
bug:4391419
Change-Id: I684890a9bf47611f25fe0f70faa0f08e6485d620
Diffstat (limited to 'src/com/android/camera/VideoCamera.java')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index dd7088b..8ddf440 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -527,12 +527,13 @@ public class VideoCamera extends ActivityBase if (mIndicatorWheel == null) return; loadCameraPreferences(); - String[] keys = new String[]{CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, + final String[] SETTING_KEYS = { + CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_COLOR_EFFECT, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL}; - mIndicatorWheel.initialize(this, mPreferenceGroup, keys, false); + mIndicatorWheel.initialize(this, mPreferenceGroup, SETTING_KEYS, null); mIndicatorWheel.setListener(new MyIndicatorWheelListener()); mPopupGestureDetector = new GestureDetector(this, new PopupGestureListener()); |