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

am a85b789a: Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb

Browse Source 
* commit 'a85b789a4a6c58c33dda9e5b00a10faee6bbf561':
  Fix 3381322: Update transition animation from lockscreen to home.
This commit is contained in:
Jim Miller
2011-01-27 17:44:41 -08:00
committed by Android Git Automerger
parent 599814f16c a85b789a4a
commit 6fc22aaadb
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/res/res/anim/lock_screen_behind_enter.xml
View File

@@ -3,21 +3,34 @@
/* /*
** Copyright 2007, The Android Open Source Project ** Copyright 2007, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at ** You may obtain a copy of the License at
** **
** http://www.apache.org/licenses/LICENSE-2.0 ** http://www.apache.org/licenses/LICENSE-2.0
** **
** Unless required by applicable law or agreed to in writing, software ** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS, ** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and ** See the License for the specific language governing permissions and
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/accelerate_cubic"> <set xmlns:android="http://schemas.android.com/apk/res/android"
<alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:detachWallpaper="true" android:shareInterpolator="false">
android:duration="@android:integer/config_activityDefaultDur" /> <scale
</set> android:fromXScale="0.9" android:toXScale="1.0"
android:fromYScale="0.9" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha
android:fromAlpha="0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

35
core/res/res/anim/lock_screen_exit.xml
View File

@@ -3,22 +3,33 @@
/* /*
** Copyright 2007, The Android Open Source Project ** Copyright 2007, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at ** You may obtain a copy of the License at
** **
** http://www.apache.org/licenses/LICENSE-2.0 ** http://www.apache.org/licenses/LICENSE-2.0
** **
** Unless required by applicable law or agreed to in writing, software ** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS, ** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and ** See the License for the specific language governing permissions and
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android" <set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@interpolator/decelerate_cubic"> android:zAdjustment="top"
<alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:shareInterpolator="false">
android:duration="@android:integer/config_activityDefaultDur" /> <scale
</set> android:fromXScale="1.0" android:toXScale="1.2"
android:fromYScale="1.0" android:toYScale="1.2"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quint"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha
android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>