diff options
| author | Chet Haase <chet@android.com> | 2013-07-22 15:55:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-22 15:55:52 +0000 |
| commit | 53771e5f955f67035cf6b6432c34171a18ab14dc (patch) | |
| tree | 4da3029853d0d32c7cf927bb493c1fcf1817bd8e | |
| parent | 0bad537093ed5b493e4c2af778cf802a2cf2c15f (diff) | |
| parent | 5f5882ffa83d1c5762569e3260fa4ec85e0d0d4c (diff) | |
| download | base-jb-mr1.1-dev-plus-aosp.tar.gz | |
Merge "Remove useless/repetitive code"jb-mr1.1-dev-plus-aosp
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index d6dfff40844d..26a4e3944ec1 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -5366,13 +5366,11 @@ public class WindowManagerService extends IWindowManager.Stub throw new SecurityException("Requires SET_ANIMATION_SCALE permission"); } - if (scale < 0) scale = 0; - else if (scale > 20) scale = 20; - scale = Math.abs(scale); + scale = fixScale(scale); switch (which) { - case 0: mWindowAnimationScale = fixScale(scale); break; - case 1: mTransitionAnimationScale = fixScale(scale); break; - case 2: mAnimatorDurationScale = fixScale(scale); break; + case 0: mWindowAnimationScale = scale; break; + case 1: mTransitionAnimationScale = scale; break; + case 2: mAnimatorDurationScale = scale; break; } // Persist setting |