summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Util.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-08-03 16:58:46 +0800
committerWu-cheng Li <wuchengli@google.com>2011-08-04 17:59:20 +0800
commit4b602592e0d189499b22d107d997b83e798b5bd9 (patch)
tree4c711877033b204a6245f48a54e55238c49bbd9b /src/com/android/camera/Util.java
parentbed7386688cd7810cba23732ab71f370fe3222ff (diff)
downloadLegacyCamera-4b602592e0d189499b22d107d997b83e798b5bd9.tar.gz
LegacyCamera-4b602592e0d189499b22d107d997b83e798b5bd9.tar.bz2
LegacyCamera-4b602592e0d189499b22d107d997b83e798b5bd9.zip
Add face detection UI.
bug:4460717 Change-Id: Id09cc012efffcee0f5af3a070b5dcb775a7048a0
Diffstat (limited to 'src/com/android/camera/Util.java')
-rw-r--r--src/com/android/camera/Util.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index d3fa24e4..2b39b3d6 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -295,9 +295,8 @@ public class Util {
return 0;
}
- public static void setCameraDisplayOrientation(int degrees,
- int cameraId, Camera camera) {
- // See android.hardware.Camera.setCameraDisplayOrientation for
+ public static int getDisplayOrientation(int degrees, int cameraId) {
+ // See android.hardware.Camera.setDisplayOrientation for
// documentation.
Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info);
@@ -308,7 +307,7 @@ public class Util {
} else { // back-facing
result = (info.orientation - degrees + 360) % 360;
}
- camera.setDisplayOrientation(result);
+ return result;
}
public static Size getOptimalPreviewSize(Activity currentActivity,