diff options
author | Doris Liu <tianliu@google.com> | 2013-10-16 12:51:02 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2013-10-16 12:55:15 -0700 |
commit | 0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c (patch) | |
tree | 96f8e0784b7835984fe4b6b16ff74c43eca29afd /src/com/android/camera/util/CameraUtil.java | |
parent | d3e75bd748ce2be8fdcb30575bbde9bd07536bd3 (diff) | |
download | android_packages_apps_Snap-0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c.tar.gz android_packages_apps_Snap-0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c.tar.bz2 android_packages_apps_Snap-0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c.zip |
Fix shutter covering pie menu
Bug: 11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 458ae04f2..eff0c4078 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -43,6 +43,7 @@ import android.telephony.TelephonyManager; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; +import android.view.Display; import android.view.OrientationEventListener; import android.view.Surface; import android.view.View; @@ -411,6 +412,28 @@ public class CameraUtil { return 0; } + /** + * Calculate the default orientation of the device based on the width and + * height of the display when rotation = 0 (i.e. natural width and height) + * @param activity the activity context + * @return whether the default orientation of the device is portrait + */ + public static boolean isDefaultToPortrait(Activity activity) { + Display currentDisplay = activity.getWindowManager().getDefaultDisplay(); + Point displaySize = new Point(); + currentDisplay.getSize(displaySize); + int orientation = currentDisplay.getRotation(); + int naturalWidth, naturalHeight; + if (orientation == Surface.ROTATION_0 || orientation == Surface.ROTATION_180) { + naturalWidth = displaySize.x; + naturalHeight = displaySize.y; + } else { + naturalWidth = displaySize.y; + naturalHeight = displaySize.x; + } + return naturalWidth < naturalHeight; + } + public static int getDisplayOrientation(int degrees, int cameraId) { // See android.hardware.Camera.setDisplayOrientation for // documentation. |