diff options
| -rw-r--r-- | res/xml/video_preferences.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 12 | ||||
| -rw-r--r-- | src/com/android/camera/ui/SecondLevelIndicatorControlBar.java | 2 |
4 files changed, 22 insertions, 6 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 700c843..e158139 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -62,4 +62,12 @@ camera:largeIcons="@array/video_effect_icons" camera:entries="@array/pref_video_effect_entries" camera:entryValues="@array/pref_video_effect_entryvalues" /> + <RecordLocationPreference + camera:key="pref_camera_recordlocation_key" + camera:defaultValue="@string/pref_camera_recordlocation_default" + camera:title="@string/pref_camera_recordlocation_title" + camera:icons="@array/camera_recordlocation_icons" + camera:largeIcons="@array/camera_recordlocation_largeicons" + camera:entries="@array/pref_camera_recordlocation_entries" + camera:entryValues="@array/pref_camera_recordlocation_entryvalues" /> </PreferenceGroup> diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 10f0b80..74a1b37 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -941,12 +941,12 @@ public class Camera extends ActivityBase implements FocusManager.Listener, final String[] SETTING_KEYS = { CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_WHITE_BALANCE, + CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_SCENE_MODE}; final String[] OTHER_SETTING_KEYS = { CameraSettings.KEY_RECORD_LOCATION, - CameraSettings.KEY_FOCUS_MODE, - CameraSettings.KEY_EXPOSURE, - CameraSettings.KEY_PICTURE_SIZE}; + CameraSettings.KEY_PICTURE_SIZE, + CameraSettings.KEY_FOCUS_MODE}; CameraPicker.setImageResourceId(R.drawable.ic_switch_photo_facing_holo_light); mIndicatorControlContainer.initialize(this, mPreferenceGroup, diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 3198953..b75fbed 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -466,11 +466,12 @@ public class VideoCamera extends ActivityBase final String[] SETTING_KEYS = { CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, - CameraSettings.KEY_VIDEO_EFFECT, CameraSettings.KEY_WHITE_BALANCE, + CameraSettings.KEY_VIDEO_EFFECT, + CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, CameraSettings.KEY_VIDEO_QUALITY}; final String[] OTHER_SETTING_KEYS = { - CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL}; + CameraSettings.KEY_RECORD_LOCATION}; CameraPicker.setImageResourceId(R.drawable.ic_switch_video_facing_holo_light); mIndicatorControlContainer.initialize(this, mPreferenceGroup, @@ -1138,6 +1139,13 @@ public class VideoCamera extends ActivityBase mMediaRecorder.setCaptureRate((1000 / (double) mTimeBetweenTimeLapseFrameCaptureMs)); } + Location loc = mLocationManager.getCurrentLocation(); + if (loc != null) { + mMediaRecorder.setLocation((float) loc.getLatitude(), + (float) loc.getLongitude()); + } + + // Set output file. // Try Uri in the intent first. If it doesn't exist, use our own // instead. diff --git a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java index f3e5247..8fce8a7 100644 --- a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java +++ b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java @@ -34,7 +34,7 @@ import android.widget.ImageView; public class SecondLevelIndicatorControlBar extends IndicatorControl implements View.OnClickListener, AbstractIndicatorButton.IndicatorChangeListener { private static final String TAG = "SecondLevelIndicatorControlBar"; - private static int ICON_SPACING = Util.dpToPixel(24); + private static int ICON_SPACING = Util.dpToPixel(16); private ImageView mCloseIcon; private View mDivider; // the divider line private View mIndicatorHighlight; // the side highlight bar |