summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-10-26 18:14:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-26 18:14:49 -0700
commit0927998b52b08c334761d4a4cb219ef8ba3f0f8c (patch)
tree8cc45e56eb38f4fcf30c0150799fb63dc4093267
parent1fb466467dc28bccd0613e868ea309800127115c (diff)
parent38f91275d6762029269c02bcd73f0cbd6a63cc6b (diff)
downloadandroid_packages_apps_Snap-0927998b52b08c334761d4a4cb219ef8ba3f0f8c.tar.gz
android_packages_apps_Snap-0927998b52b08c334761d4a4cb219ef8ba3f0f8c.tar.bz2
android_packages_apps_Snap-0927998b52b08c334761d4a4cb219ef8ba3f0f8c.zip
am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
* commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e': Changed rotated display parameter increments to 90.
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
index 90bbeaacd..a4131ff80 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
@@ -75,7 +75,7 @@ public class ImageRotate extends ImageGeometry {
@Override
protected int getLocalValue() {
- return (int) getLocalRotation();
+ return constrainedRotation(snappedAngle(getLocalRotation()));
}
@Override