diff options
| author | Angus Kong <shkong@google.com> | 2011-09-21 15:30:03 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2011-09-21 15:43:21 +0800 |
| commit | 717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1 (patch) | |
| tree | caf082061c68b25c4a0376fb033fc3481d32c2a3 | |
| parent | 425d5ca6e7d330b6dc8f30850a20e385626a8350 (diff) | |
| download | LegacyCamera-717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1.zip LegacyCamera-717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1.tar.gz LegacyCamera-717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1.tar.bz2 | |
Show the video quality setting only when needed.
1. Remove mms option from quality setting.
2. Hide the quality preference when the desired quality is already known.
bug:5141068
Change-Id: I3d839bc60fc6173626d0dfb4110edb06db4bf28e
| -rw-r--r-- | res/values/arrays.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 51b4085..8ad433e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -20,21 +20,18 @@ <string-array name="pref_video_quality_entries" translatable="false"> <item>@string/pref_video_quality_entry_high</item> <item>@string/pref_video_quality_entry_low</item> - <item>@string/pref_video_quality_entry_mms</item> <item>@string/pref_video_quality_entry_youtube</item> </string-array> <string-array name="pref_video_quality_entryvalues" translatable="false"> <item>@string/pref_video_quality_high</item> <item>@string/pref_video_quality_low</item> - <item>@string/pref_video_quality_mms</item> <item>@string/pref_video_quality_youtube</item> </string-array> <array name="video_quality_largeicons" translatable="false"> <item>@drawable/ic_viewfinder_video_quality_high</item> <item>@drawable/ic_viewfinder_video_quality_low</item> - <item>@drawable/ic_viewfinder_video_quality_mms</item> <item>@drawable/ic_viewfinder_video_quality_youtube</item> </array> 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() { |