am bb339ead: Merge change 26867 into eclair

Merge commit 'bb339eadcb4a3ffd2dc861ffb0f268a49238fd03' into eclair-plus-aosp

* commit 'bb339eadcb4a3ffd2dc861ffb0f268a49238fd03':
  fix bug where siilent mode dissapears when it triggers instead of animating off to the left edge.
This commit is contained in:
Karl Rosaen
2009-09-24 11:03:12 -07:00
committed by Android Git Automerger

View File

@@ -668,7 +668,7 @@ public class RotarySelector extends View {
// wrapping the offset back to the other side so that when the animation is finished, // wrapping the offset back to the other side so that when the animation is finished,
// the buttons will come back into their original places. // the buttons will come back into their original places.
if (mDimplesOfFling > 0) { if (mDimplesOfFling > 0) {
if (!goingRight && mRotaryOffsetX < 3 * mDimpleSpacing) { if (!goingRight && mRotaryOffsetX < -3 * mDimpleSpacing) {
// wrap around on fling left // wrap around on fling left
mRotaryOffsetX += mDimplesOfFling * mDimpleSpacing; mRotaryOffsetX += mDimplesOfFling * mDimpleSpacing;
} else if (goingRight && mRotaryOffsetX > 3 * mDimpleSpacing) { } else if (goingRight && mRotaryOffsetX > 3 * mDimpleSpacing) {