diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-15 19:03:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 19:03:11 -0700 |
| commit | 2b2cbfb78e3e184b55041926c7bc7bdc18cb5934 (patch) | |
| tree | 577a6e9bfa08ff0f3526ca016bcd6d082fc86a37 /src | |
| parent | 1ac6ed93a383bf2266a212e3b97ce52fa072fae8 (diff) | |
| parent | c97d23826a28dd725951eccb62651244f9fb8228 (diff) | |
| download | LegacyCamera-2b2cbfb78e3e184b55041926c7bc7bdc18cb5934.zip LegacyCamera-2b2cbfb78e3e184b55041926c7bc7bdc18cb5934.tar.gz LegacyCamera-2b2cbfb78e3e184b55041926c7bc7bdc18cb5934.tar.bz2 | |
am c97d2382: Update the code due to API change.
Merge commit 'c97d23826a28dd725951eccb62651244f9fb8228'
* commit 'c97d23826a28dd725951eccb62651244f9fb8228':
Update the code due to API change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/Util.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index e88045e..a863c4b 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -785,7 +785,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, int rotation = 0; if (mOrientation != OrientationEventListener.ORIENTATION_UNKNOWN) { CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; - rotation = (mOrientation + info.mOrientation) % 360; + rotation = (mOrientation + info.orientation) % 360; } mParameters.setRotation(rotation); diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 0ba0a41..cde3d9d 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -255,7 +255,7 @@ public class CameraSettings { int[] largeIconIds = new int[numOfCameras]; for (int i = 0; i < numOfCameras; i++) { entryValues[i] = Integer.toString(i); - if (mCameraInfo[i].mFacing == CameraInfo.CAMERA_FACING_FRONT) { + if (mCameraInfo[i].facing == CameraInfo.CAMERA_FACING_FRONT) { entries[i] = mContext.getString( R.string.pref_camera_id_entry_front); iconIds[i] = R.drawable.ic_menuselect_camera_facing_front; diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java index db174be..f7c3316 100644 --- a/src/com/android/camera/Util.java +++ b/src/com/android/camera/Util.java @@ -301,7 +301,7 @@ public class Util { new android.hardware.Camera.CameraInfo(); android.hardware.Camera.getCameraInfo(cameraId, info); int degrees = getDisplayRotation(activity); - int result = (info.mOrientation - degrees + 360) % 360; + int result = (info.orientation - degrees + 360) % 360; camera.setDisplayOrientation(result); } |