diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-25 17:20:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-25 17:20:27 -0700 |
| commit | 18ec4d4dcac362e3ea5dcdad15a8a5b9b554d740 (patch) | |
| tree | 5795a1c1fe009770668ed0525d2e6dc576fb5b9c /src | |
| parent | 1d55f0797ead9b4c60c86e801c4b9b20a2dbe4f6 (diff) | |
| parent | c5acbc82c37748cddd4844a497dbe2091684d1ea (diff) | |
| download | android_packages_apps_Snap-18ec4d4dcac362e3ea5dcdad15a8a5b9b554d740.tar.gz android_packages_apps_Snap-18ec4d4dcac362e3ea5dcdad15a8a5b9b554d740.tar.bz2 android_packages_apps_Snap-18ec4d4dcac362e3ea5dcdad15a8a5b9b554d740.zip | |
Merge "SnapdragonCamera: Fix mistakes of judgment of limit 1080P" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/util/CameraUtil.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 34787e4d8..854b5bdfa 100755 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -576,7 +576,7 @@ public class CameraUtil { public static int getOptimalPreviewSize(Activity currentActivity, Point[] sizes, double targetRatio) { // TODO(andyhuibers): Don't hardcode this but use device's measurements. - final int MAX_ASPECT_HEIGHT = 1080; + final int MAX_ASPECT_HEIGHT = 1440; // Use a very small tolerance because we want an exact match. final double ASPECT_TOLERANCE = 0.01; if (sizes == null) return -1; @@ -599,10 +599,9 @@ public class CameraUtil { if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue; // Count sizes with height <= 1080p to mimic camera1 api behavior. + if (size.y > MAX_ASPECT_HEIGHT) continue; if (ratio_4_3 == targetRatio) { if (size.y > minDiff) continue; - } else { - if (size.y > MAX_ASPECT_HEIGHT) continue; } double heightDiff = Math.abs(size.y - targetHeight); |