Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 53771e5f: Merge "Remove useless/repetitive code"

Browse Source 
* commit '53771e5f955f67035cf6b6432c34171a18ab14dc':
  Remove useless/repetitive code
This commit is contained in:
Chet Haase
2013-07-22 08:59:30 -07:00
committed by Android Git Automerger
parent e964387466 53771e5f95
commit dbc51de44f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4872,13 +4872,11 @@ public class WindowManagerService extends IWindowManager.Stub
throw new SecurityException("Requires SET_ANIMATION_SCALE permission"); throw new SecurityException("Requires SET_ANIMATION_SCALE permission");
} }
if (scale < 0) scale = 0; scale = fixScale(scale);
else if (scale > 20) scale = 20;
scale = Math.abs(scale);
switch (which) { switch (which) {
case 0: mWindowAnimationScale = fixScale(scale); break; case 0: mWindowAnimationScale = scale; break;
case 1: mTransitionAnimationScale = fixScale(scale); break; case 1: mTransitionAnimationScale = scale; break;
case 2: mAnimatorDurationScale = fixScale(scale); break; case 2: mAnimatorDurationScale = scale; break;
} }
// Persist setting // Persist setting