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

am ce605142: Merge change 26717 into eclair

Browse Source 
Merge commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58' into eclair-plus-aosp

* commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58':
  Newer animations.
This commit is contained in:
Dianne Hackborn
2009-09-23 17:10:07 -07:00
committed by Android Git Automerger
parent 060f388c63 ce60514221
commit b8f193da85
9 changed files with 135 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/WindowManagerService.java
View File

@@ -7320,18 +7320,22 @@ public class WindowManagerService extends IWindowManager.Stub
// are currently targeting.
if (mAttrs.type == TYPE_WALLPAPER && mLowerWallpaperTarget == null
&& mWallpaperTarget != null) {
if (mWallpaperTarget.mHasLocalTransformation) {
if (mWallpaperTarget.mHasLocalTransformation &&
mWallpaperTarget.mAnimation != null &&
!mWallpaperTarget.mAnimation.getDetachWallpaper()) {
attachedTransformation = mWallpaperTarget.mTransformation;
if (DEBUG_WALLPAPER && attachedTransformation != null) {
Log.v(TAG, "WP target attached xform: " + attachedTransformation);
}
}
if (mWallpaperTarget.mAppToken != null &&
mWallpaperTarget.mAppToken.hasTransformation) {
mWallpaperTarget.mAppToken.hasTransformation &&
mWallpaperTarget.mAppToken.animation != null &&
!mWallpaperTarget.mAppToken.animation.getDetachWallpaper()) {
appTransformation = mWallpaperTarget.mAppToken.transformation;
}
if (DEBUG_WALLPAPER && attachedTransformation != null) {
Log.v(TAG, "WP target attached xform: " + attachedTransformation);
}
if (DEBUG_WALLPAPER && appTransformation != null) {
Log.v(TAG, "WP target app xform: " + appTransformation);
if (DEBUG_WALLPAPER && appTransformation != null) {
Log.v(TAG, "WP target app xform: " + appTransformation);
}
}
}