diff options
| author | Angus Kong <shkong@google.com> | 2011-09-21 02:17:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-21 02:17:11 -0700 |
| commit | 06102878c6e8777e6b40abb9cbfaae8e546f9184 (patch) | |
| tree | d4d980f4d981172818350f521d8925288bb66bd5 /src | |
| parent | c0c662c5acaa5b76e1cb90a7868d16e471e2bd93 (diff) | |
| parent | 717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1 (diff) | |
| download | LegacyCamera-06102878c6e8777e6b40abb9cbfaae8e546f9184.zip LegacyCamera-06102878c6e8777e6b40abb9cbfaae8e546f9184.tar.gz LegacyCamera-06102878c6e8777e6b40abb9cbfaae8e546f9184.tar.bz2 | |
Merge "Show the video quality setting only when needed." into ics-factoryrom
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index f100d28..39d3298 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -444,7 +444,9 @@ public class VideoCamera extends ActivityBase private void loadCameraPreferences() { CameraSettings settings = new CameraSettings(this, mParameters, mCameraId, CameraHolder.instance().getCameraInfo()); - mPreferenceGroup = settings.getPreferenceGroup(R.xml.video_preferences); + // Remove the video quality preference setting when the quality is given in the intent. + mPreferenceGroup = filterPreferenceScreenByIntent( + settings.getPreferenceGroup(R.xml.video_preferences)); } private boolean collapseCameraControls() { |