From 84e4170aff12e0e6dbaec1b0ae5a98372a0d091c Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 21 Feb 2012 14:15:27 +0100
Subject: Use a fixed duration of 400ms for scroll animation.

Make fade in/out animations 200ms long, the same as the default animation
duration for iOS UI animations.
---
 android/res/anim/fade_in.xml                  | 2 +-
 android/res/anim/fade_out.xml                 | 2 +-
 android/src/com/artifex/mupdf/ReaderView.java | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'android')

diff --git a/android/res/anim/fade_in.xml b/android/res/anim/fade_in.xml
index 65bf6edd..b2af62ca 100644
--- a/android/res/anim/fade_in.xml
+++ b/android/res/anim/fade_in.xml
@@ -2,4 +2,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromAlpha="0.0"
     android:toAlpha="1.0"
-    android:duration="100" />
+    android:duration="200" />
diff --git a/android/res/anim/fade_out.xml b/android/res/anim/fade_out.xml
index efde8c13..7d742df3 100644
--- a/android/res/anim/fade_out.xml
+++ b/android/res/anim/fade_out.xml
@@ -2,4 +2,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromAlpha="1.0"
     android:toAlpha="0.0"
-    android:duration="100" />
+    android:duration="200" />
diff --git a/android/src/com/artifex/mupdf/ReaderView.java b/android/src/com/artifex/mupdf/ReaderView.java
index 811f8b78..76bf0eee 100644
--- a/android/src/com/artifex/mupdf/ReaderView.java
+++ b/android/src/com/artifex/mupdf/ReaderView.java
@@ -539,8 +539,7 @@ public class ReaderView extends AdapterView<Adapter>
 		Point corr = getCorrection(getScrollBounds(v));
 		if (corr.x != 0 || corr.y != 0) {
 			mScrollerLastX = mScrollerLastY = 0;
-			mScroller.startScroll(0, 0, corr.x, corr.y,
-						Math.max(Math.abs(corr.x), Math.abs(corr.y))*SCROLL_SPEED);
+			mScroller.startScroll(0, 0, corr.x, corr.y, 400);
 			post(this);
 		}
 	}
-- 
cgit v1.2.3