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

Merge "Remove old animation" into klp-dev

Browse Source
This commit is contained in:
John Reck
2013-10-01 22:29:08 +00:00
committed by Android (Google) Code Review
parent d1e01cb46c da7af95d81
commit 607463788a
7 changed files with 0 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/integers.xml
View File

@@ -18,7 +18,5 @@
--> -->
<resources> <resources>
<integer name="kg_carousel_angle">75</integer> <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> <integer name="kg_glowpad_rotation_offset">0</integer>
</resources> </resources>

33
packages/Keyguard/res/anim/keyguard_security_animate_in.xml
View File

@@ -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>

32
packages/Keyguard/res/anim/keyguard_security_animate_out.xml
View File

@@ -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>

22
packages/Keyguard/res/anim/keyguard_security_fade_in.xml
View File

@@ -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" />

21
packages/Keyguard/res/anim/keyguard_security_fade_out.xml
View File

@@ -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"
/>

2
packages/Keyguard/res/values/integers.xml
View File

@@ -18,7 +18,5 @@
--> -->
<resources> <resources>
<integer name="kg_carousel_angle">75</integer> <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> <integer name="kg_glowpad_rotation_offset">0</integer>
</resources> </resources>

5
packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
View File

@@ -54,7 +54,6 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.AnimationUtils;
import android.widget.RemoteViews.OnClickHandler; import android.widget.RemoteViews.OnClickHandler;
import java.io.File; import java.io.File;
@@ -971,10 +970,6 @@ public class KeyguardHostView extends KeyguardViewBase {
// Find and show this child. // Find and show this child.
final int childCount = mSecurityViewContainer.getChildCount(); 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); final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) { if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {