diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-22 13:40:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 13:40:35 -0700 |
| commit | ba6b16d99b0faf438ae557a8fdc478101ac75643 (patch) | |
| tree | 04a83145b32b5a6f5c57ce867e1ad00112d3d710 /src/com/android/gallery3d/app | |
| parent | c04b516ed7c9a90973bd50d62e00f70318e00a5e (diff) | |
| parent | 4327fbf44250e568adb6f7f0b647e24ead54f035 (diff) | |
| download | android_packages_apps_Snap-ba6b16d99b0faf438ae557a8fdc478101ac75643.tar.gz android_packages_apps_Snap-ba6b16d99b0faf438ae557a8fdc478101ac75643.tar.bz2 android_packages_apps_Snap-ba6b16d99b0faf438ae557a8fdc478101ac75643.zip | |
am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
* commit '32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rw-r--r-- | src/com/android/gallery3d/app/OrientationManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/OrientationManager.java b/src/com/android/gallery3d/app/OrientationManager.java index 0a644ef66..24201ff24 100644 --- a/src/com/android/gallery3d/app/OrientationManager.java +++ b/src/com/android/gallery3d/app/OrientationManager.java @@ -25,6 +25,7 @@ import android.provider.Settings; import android.view.OrientationEventListener; import android.view.Surface; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.ui.OrientationSource; public class OrientationManager implements OrientationSource { @@ -71,7 +72,11 @@ public class OrientationManager implements OrientationSource { public void lockOrientation() { if (mOrientationLocked) return; mOrientationLocked = true; - mActivity.setRequestedOrientation(calculateCurrentScreenOrientation()); + if (ApiHelper.HAS_ORIENTATION_LOCK) { + mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED); + } else { + mActivity.setRequestedOrientation(calculateCurrentScreenOrientation()); + } } // Unlock the framework orientation, so it can change when the device |