diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 053fc851ca313..dc90bbff1aae6 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -18,7 +18,5 @@ --> 75 - 100 - 100 0 diff --git a/packages/Keyguard/res/anim/keyguard_security_animate_in.xml b/packages/Keyguard/res/anim/keyguard_security_animate_in.xml deleted file mode 100644 index 4ee30c363599c..0000000000000 --- a/packages/Keyguard/res/anim/keyguard_security_animate_in.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/packages/Keyguard/res/anim/keyguard_security_animate_out.xml b/packages/Keyguard/res/anim/keyguard_security_animate_out.xml deleted file mode 100644 index 76d065c74f66d..0000000000000 --- a/packages/Keyguard/res/anim/keyguard_security_animate_out.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/packages/Keyguard/res/anim/keyguard_security_fade_in.xml b/packages/Keyguard/res/anim/keyguard_security_fade_in.xml deleted file mode 100644 index c66c6049d52f6..0000000000000 --- a/packages/Keyguard/res/anim/keyguard_security_fade_in.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/packages/Keyguard/res/anim/keyguard_security_fade_out.xml b/packages/Keyguard/res/anim/keyguard_security_fade_out.xml deleted file mode 100644 index 6465b35fab65c..0000000000000 --- a/packages/Keyguard/res/anim/keyguard_security_fade_out.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/packages/Keyguard/res/values/integers.xml b/packages/Keyguard/res/values/integers.xml index 053fc851ca313..dc90bbff1aae6 100644 --- a/packages/Keyguard/res/values/integers.xml +++ b/packages/Keyguard/res/values/integers.xml @@ -18,7 +18,5 @@ --> 75 - 100 - 100 0 diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java index 4da6171cb43c8..10ffccee17a0e 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java @@ -54,7 +54,6 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; -import android.view.animation.AnimationUtils; import android.widget.RemoteViews.OnClickHandler; import java.io.File; @@ -971,10 +970,6 @@ public class KeyguardHostView extends KeyguardViewBase { // Find and show this child. final int childCount = mSecurityViewContainer.getChildCount(); - mSecurityViewContainer.setInAnimation( - AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_fade_in)); - mSecurityViewContainer.setOutAnimation( - AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_fade_out)); final int securityViewIdForMode = getSecurityViewIdForMode(securityMode); for (int i = 0; i < childCount; i++) { if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {