auto import from //depot/cupcake/@136620

diff --git a/src/com/android/calendar/CalendarActivity.java b/src/com/android/calendar/CalendarActivity.java
index f691648..2bc991a 100644 (file)
--- a/src/com/android/calendar/CalendarActivity.java
+++ b/src/com/android/calendar/CalendarActivity.java
@@ -257,6 +257,9 @@ public class CalendarActivity extends Activity implements Navigator {
 
     public View switchViews(boolean forward, float xOffSet, float width) {
         float progress = Math.abs(xOffSet) / width;
+        if (progress > 1.0f) {
+            progress = 1.0f;
+        }
         
         float inFromXValue, inToXValue;
         float outFromXValue, outToXValue;