diff options
author | John Reck <jreck@google.com> | 2013-10-01 14:45:01 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2013-10-01 14:52:03 -0700 |
commit | da7af95d81fc609a8f02ea3ab6b55d0224556a5c (patch) | |
tree | 4bff8f11c4540081ae55f7643cc6dca1d27cf35c /packages/Keyguard/res | |
parent | 7eb5ce03d9697caa2e9caf0437036a937d081e90 (diff) | |
download | frameworks_base-da7af95d81fc609a8f02ea3ab6b55d0224556a5c.zip frameworks_base-da7af95d81fc609a8f02ea3ab6b55d0224556a5c.tar.gz frameworks_base-da7af95d81fc609a8f02ea3ab6b55d0224556a5c.tar.bz2 |
Remove old animation
Bug: 10918599
Shaves ~1.5MB off of Keyguard creation from usage of an
old-style Alpha animator that would create a draw cache
The animation is unseen due to screen timings, so simply remove it
Also adds a bit of de-jank to the non-svelte case by avoiding
a potential GC_FOR_ALLOC
Change-Id: Id49742d95988f670a44305e4033e7a850d20e675
Diffstat (limited to 'packages/Keyguard/res')
5 files changed, 0 insertions, 110 deletions
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 4ee30c3..0000000 --- a/packages/Keyguard/res/anim/keyguard_security_animate_in.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - - <scale - android:interpolator="@android:anim/decelerate_interpolator" - android:fromXScale="0.0" - android:toXScale="1.0" - android:fromYScale="1.0" - android:toYScale="1.0" - android:pivotX="50%" - android:pivotY="50%" - android:fillEnabled="true" - android:fillAfter="true" - android:duration="@integer/kg_security_flip_duration" - android:startOffset="@integer/kg_security_flip_duration" /> - -</set> - 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 76d065c..0000000 --- a/packages/Keyguard/res/anim/keyguard_security_animate_out.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - - <scale - android:interpolator="@android:anim/accelerate_interpolator" - android:fromXScale="1.0" - android:toXScale="0.0" - android:fromYScale="1.0" - android:toYScale="1.0" - android:pivotX="50%" - android:pivotY="50%" - android:fillEnabled="true" - android:fillAfter="true" - android:duration="@integer/kg_security_flip_duration" /> - -</set> - 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 c66c604..0000000 --- a/packages/Keyguard/res/anim/keyguard_security_fade_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/decelerate_quad" - android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@integer/kg_security_fade_duration" /> - - 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 6465b35..0000000 --- a/packages/Keyguard/res/anim/keyguard_security_fade_out.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/accelerate_quad" - android:fromAlpha="1.0" - android:toAlpha="0.0" - android:duration="@integer/kg_security_fade_duration" -/> diff --git a/packages/Keyguard/res/values/integers.xml b/packages/Keyguard/res/values/integers.xml index 053fc85..dc90bbf 100644 --- a/packages/Keyguard/res/values/integers.xml +++ b/packages/Keyguard/res/values/integers.xml @@ -18,7 +18,5 @@ --> <resources> <integer name="kg_carousel_angle">75</integer> - <integer name="kg_security_flip_duration">100</integer> - <integer name="kg_security_fade_duration">100</integer> <integer name="kg_glowpad_rotation_offset">0</integer> </resources> |