diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-19 17:34:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 17:34:08 +0000 |
| commit | 4327fbf44250e568adb6f7f0b647e24ead54f035 (patch) | |
| tree | ff4ccbb98bc911175551cae444382e0847f14a40 /src | |
| parent | 32cae72fda76329e181c20aa2f0b74e0f391fa8f (diff) | |
| parent | b2c323e3538820dc1da537c7a207ca6c9bd6d92b (diff) | |
| download | android_packages_apps_Snap-4327fbf44250e568adb6f7f0b647e24ead54f035.tar.gz android_packages_apps_Snap-4327fbf44250e568adb6f7f0b647e24ead54f035.tar.bz2 android_packages_apps_Snap-4327fbf44250e568adb6f7f0b647e24ead54f035.zip | |
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -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 |