diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-20 01:39:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-20 01:39:53 -0700 |
| commit | 5d74366ed706960447cb334f543af6f9a1c6f596 (patch) | |
| tree | b6433e340963e13e8d18adba5ee0ea0eec3529df | |
| parent | faab026a77b5a7943161841d0c28d3ba03baf85d (diff) | |
| parent | d675f1dee593bd66c34ae0549253b5c3a60de5cc (diff) | |
| download | android_packages_apps_Snap-5d74366ed706960447cb334f543af6f9a1c6f596.tar.gz android_packages_apps_Snap-5d74366ed706960447cb334f543af6f9a1c6f596.tar.bz2 android_packages_apps_Snap-5d74366ed706960447cb334f543af6f9a1c6f596.zip | |
Merge "SnapdragonCamera: Filter duplicate picture resolution" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index d073c48b2..f700d2187 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1058,7 +1058,7 @@ public class CameraSettings { resetIfInvalid(pref); } - private void filterSimilarPictureSize(PreferenceGroup group, + public static void filterSimilarPictureSize(PreferenceGroup group, ListPreference pref) { pref.filterDuplicated(); if (pref.getEntries().length <= 1) { diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 247e55878..cc7523265 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -524,6 +524,7 @@ public class SettingsManager implements ListMenu.SettingsListener { if (pictureSize != null) { CameraSettings.filterUnsupportedOptions(mPreferenceGroup, pictureSize, getSupportedPictureSize(cameraId)); + CameraSettings.filterSimilarPictureSize(mPreferenceGroup, pictureSize); } if (exposure != null) buildExposureCompensation(cameraId); |