diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-09-11 01:54:16 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-09-11 01:54:16 -0700 |
| commit | 7c0e9cc3c2f60eced35ad5c475fae22ea27341bf (patch) | |
| tree | d9c21e511509f39f8dcb97a82f74cdb14feeed13 /src | |
| parent | debbc5ad3c08db8f7c0a35a9d39dc11d95bca8c2 (diff) | |
| parent | e07e72ac2bbe4dc0160b5feff6084e31a98ea8e4 (diff) | |
| download | android_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.tar.gz android_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.tar.bz2 android_packages_apps_Snap-7c0e9cc3c2f60eced35ad5c475fae22ea27341bf.zip | |
Merge "Camera: Add support for video rotation"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 1 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 2803dbe1b..c0c8a4092 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -149,6 +149,7 @@ public class CameraSettings { public static final String FLIP_MODE_VH = "flip-vh"; private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values"; + public static final String KEY_VIDEO_ROTATION = "pref_camera_video_rotation_key"; private static final String VIDEO_QUALITY_HIGH = "high"; private static final String VIDEO_QUALITY_MMS = "mms"; private static final String VIDEO_QUALITY_YOUTUBE = "youtube"; @@ -384,6 +385,7 @@ public class CameraSettings { filterUnsupportedOptions(group, hdr_mode, getSupportedHDRModes(mParameters)); } + ListPreference videoRotation = group.findPreference(KEY_VIDEO_ROTATION); if (touchAfAec != null) { filterUnsupportedOptions(group, @@ -469,6 +471,11 @@ public class CameraSettings { if (longShot!= null && !isLongshotSupported(mParameters)) { removePreference(group, longShot.getKey()); } + + if (videoRotation != null) { + filterUnsupportedOptions(group, + videoRotation, mParameters.getSupportedVideoRotationValues()); + } } private void initPreference(PreferenceGroup group) { diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index ae6d67072..85e77dda7 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -83,6 +83,7 @@ public class VideoMenu extends PieController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, + CameraSettings.KEY_VIDEO_ROTATION }; PieItem item1 = makeItem(R.drawable.ic_settings_holo_light_01); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 679f89557..30144407c 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2143,6 +2143,14 @@ public class VideoModule implements CameraModule, mUI.overrideSettings(CameraSettings.KEY_DIS,"disable"); } } + //setting video rotation + String videoRotation = mPreferences.getString( + CameraSettings.KEY_VIDEO_ROTATION, + mActivity.getString(R.string.pref_camera_video_rotation_default)); + if (isSupported(videoRotation, mParameters.getSupportedVideoRotationValues())) { + mParameters.setVideoRotation(videoRotation); + } + } @SuppressWarnings("deprecation") private void setCameraParameters() { |