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

Revert "When keyguard exits use same anim for all windows"

Browse Source 
Broke window animations.

This reverts commit b834080181.

BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86
This commit is contained in:
Alan Viverette
2014-11-04 20:34:41 -08:00
parent a446195b0d
commit 44eb8b7729
2 changed files with 74 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -116,7 +116,6 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import static android.view.WindowManager.LayoutParams.*; import static android.view.WindowManager.LayoutParams.*;
import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT;
@@ -2300,19 +2299,24 @@ public class PhoneWindowManager implements WindowManagerPolicy {
boolean goingToNotificationShade) { boolean goingToNotificationShade) {
if (goingToNotificationShade) { if (goingToNotificationShade) {
return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_behind_enter_fade_in); return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_behind_enter_fade_in);
} } else if (onWallpaper) {
Animation a = AnimationUtils.loadAnimation(mContext,
R.anim.lock_screen_behind_enter_wallpaper);
AnimationSet set = (AnimationSet) a;
AnimationSet set = (AnimationSet) AnimationUtils.loadAnimation(mContext, onWallpaper ? // TODO: Use XML interpolators when we have log interpolators available in XML.
R.anim.lock_screen_behind_enter_wallpaper : set.getAnimations().get(0).setInterpolator(mLogDecelerateInterpolator);
set.getAnimations().get(1).setInterpolator(mLogDecelerateInterpolator);
return set;
} else {
Animation a = AnimationUtils.loadAnimation(mContext,
R.anim.lock_screen_behind_enter); R.anim.lock_screen_behind_enter);
AnimationSet set = (AnimationSet) a;
// TODO: Use XML interpolators when we have log interpolators available in XML. // TODO: Use XML interpolators when we have log interpolators available in XML.
final List<Animation> animations = set.getAnimations(); set.getAnimations().get(0).setInterpolator(mLogDecelerateInterpolator);
for (int i = animations.size() - 1; i >= 0; --i) { return set;
animations.get(i).setInterpolator(mLogDecelerateInterpolator);
} }
return set;
} }

138
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -91,9 +91,6 @@ public class WindowAnimator {
boolean mKeyguardGoingAwayToNotificationShade; boolean mKeyguardGoingAwayToNotificationShade;
boolean mKeyguardGoingAwayDisableWindowAnimations; boolean mKeyguardGoingAwayDisableWindowAnimations;
/** Use one animation for all entering activities after keyguard is dismissed. */
Animation mPostKeyguardExitAnimation;
// forceHiding states. // forceHiding states.
static final int KEYGUARD_NOT_SHOWN = 0; static final int KEYGUARD_NOT_SHOWN = 0;
static final int KEYGUARD_ANIMATING_IN = 1; static final int KEYGUARD_ANIMATING_IN = 1;
@@ -223,6 +220,9 @@ public class WindowAnimator {
++mAnimTransactionSequence; ++mAnimTransactionSequence;
final WindowList windows = mService.getWindowListLocked(displayId); final WindowList windows = mService.getWindowListLocked(displayId);
ArrayList<WindowStateAnimator> unForceHiding = null;
boolean wallpaperInUnForceHiding = false;
WindowState wallpaper = null;
if (mKeyguardGoingAway) { if (mKeyguardGoingAway) {
for (int i = windows.size() - 1; i >= 0; i--) { for (int i = windows.size() - 1; i >= 0; i--) {
@@ -261,9 +261,6 @@ public class WindowAnimator {
final AppWindowToken appShowWhenLocked = winShowWhenLocked == null ? final AppWindowToken appShowWhenLocked = winShowWhenLocked == null ?
null : winShowWhenLocked.mAppToken; null : winShowWhenLocked.mAppToken;
boolean wallpaperInUnForceHiding = false;
ArrayList<WindowStateAnimator> unForceHiding = null;
WindowState wallpaper = null;
for (int i = windows.size() - 1; i >= 0; i--) { for (int i = windows.size() - 1; i >= 0; i--) {
WindowState win = windows.get(i); WindowState win = windows.get(i);
WindowStateAnimator winAnimator = win.mWinAnimator; WindowStateAnimator winAnimator = win.mWinAnimator;
@@ -330,53 +327,40 @@ public class WindowAnimator {
} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
final boolean hideWhenLocked = !((win.mIsImWindow && showImeOverKeyguard) || final boolean hideWhenLocked = !((win.mIsImWindow && showImeOverKeyguard) ||
(appShowWhenLocked != null && appShowWhenLocked == win.mAppToken)); (appShowWhenLocked != null && appShowWhenLocked == win.mAppToken));
final boolean changed;
if (((mForceHiding == KEYGUARD_ANIMATING_IN) if (((mForceHiding == KEYGUARD_ANIMATING_IN)
&& (!winAnimator.isAnimating() || hideWhenLocked)) && (!winAnimator.isAnimating() || hideWhenLocked))
|| ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) { || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
if (!win.hideLw(false, false)) { changed = win.hideLw(false, false);
// Was already hidden if ((DEBUG_KEYGUARD || WindowManagerService.DEBUG_VISIBILITY)
continue; && changed) Slog.v(TAG, "Now policy hidden: " + win);
}
if (DEBUG_KEYGUARD || WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
"Now policy hidden: " + win);
} else { } else {
if (!win.showLw(false, false)) { changed = win.showLw(false, false);
// Was already showing. if ((DEBUG_KEYGUARD || WindowManagerService.DEBUG_VISIBILITY)
continue; && changed) Slog.v(TAG, "Now policy shown: " + win);
} if (changed) {
final boolean visibleNow = win.isVisibleNow(); if ((mBulkUpdateParams & SET_FORCE_HIDING_CHANGED) != 0
if (!visibleNow) { && win.isVisibleNow() /*w.isReadyForDisplay()*/) {
// Couldn't really show, must showLw() again when win becomes visible. if (unForceHiding == null) {
win.hideLw(false, false); unForceHiding = new ArrayList<WindowStateAnimator>();
continue; }
} unForceHiding.add(winAnimator);
if (DEBUG_KEYGUARD || WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG, if ((flags & FLAG_SHOW_WALLPAPER) != 0) {
"Now policy shown: " + win); wallpaperInUnForceHiding = true;
if ((mBulkUpdateParams & SET_FORCE_HIDING_CHANGED) != 0) { }
if (unForceHiding == null) {
unForceHiding = new ArrayList<>();
} }
unForceHiding.add(winAnimator); final WindowState currentFocus = mService.mCurrentFocus;
if ((flags & FLAG_SHOW_WALLPAPER) != 0) { if (currentFocus == null || currentFocus.mLayer < win.mLayer) {
wallpaperInUnForceHiding = true; // We are showing on to of the current
// focus, so re-evaluate focus to make
// sure it is correct.
if (WindowManagerService.DEBUG_FOCUS_LIGHT) Slog.v(TAG,
"updateWindowsLocked: setting mFocusMayChange true");
mService.mFocusMayChange = true;
} }
} else if (mPostKeyguardExitAnimation != null) {
// We're already in the middle of an animation. Use the existing
// animation to bring in this window.
winAnimator.setAnimation(mPostKeyguardExitAnimation);
winAnimator.keyguardGoingAwayAnimation = true;
}
final WindowState currentFocus = mService.mCurrentFocus;
if (currentFocus == null || currentFocus.mLayer < win.mLayer) {
// We are showing on top of the current
// focus, so re-evaluate focus to make
// sure it is correct.
if (WindowManagerService.DEBUG_FOCUS_LIGHT) Slog.v(TAG,
"updateWindowsLocked: setting mFocusMayChange true");
mService.mFocusMayChange = true;
} }
} }
if ((flags & FLAG_SHOW_WALLPAPER) != 0) { if (changed && (flags & FLAG_SHOW_WALLPAPER) != 0) {
mBulkUpdateParams |= SET_WALLPAPER_MAY_CHANGE; mBulkUpdateParams |= SET_WALLPAPER_MAY_CHANGE;
setPendingLayoutChanges(Display.DEFAULT_DISPLAY, setPendingLayoutChanges(Display.DEFAULT_DISPLAY,
WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER); WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER);
@@ -419,44 +403,42 @@ public class WindowAnimator {
// If we have windows that are being show due to them no longer // If we have windows that are being show due to them no longer
// being force-hidden, apply the appropriate animation to them. // being force-hidden, apply the appropriate animation to them.
if (unForceHiding != null) { if (unForceHiding != null) {
// This only happens the first time that we detect the keyguard is animating out. boolean startKeyguardExit = true;
if (mKeyguardGoingAwayDisableWindowAnimations) { for (int i=unForceHiding.size()-1; i>=0; i--) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: skipping anim for windows"); Animation a = null;
} else { if (!mKeyguardGoingAwayDisableWindowAnimations) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: created anim for windows"); a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding,
mPostKeyguardExitAnimation = mPolicy.createForceHideEnterAnimation( mKeyguardGoingAwayToNotificationShade);
wallpaperInUnForceHiding, mKeyguardGoingAwayToNotificationShade); if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: created anim=" + a
} + " for win=" + unForceHiding.get(i));
if (mPostKeyguardExitAnimation != null) { } else {
for (int i=unForceHiding.size()-1; i>=0; i--) { if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: skipping anim for win="
+ unForceHiding.get(i));
}
if (a != null) {
final WindowStateAnimator winAnimator = unForceHiding.get(i); final WindowStateAnimator winAnimator = unForceHiding.get(i);
winAnimator.setAnimation(mPostKeyguardExitAnimation); winAnimator.setAnimation(a);
winAnimator.keyguardGoingAwayAnimation = true; winAnimator.keyguardGoingAwayAnimation = true;
if (startKeyguardExit && mKeyguardGoingAway) {
// Do one time only.
mPolicy.startKeyguardExitAnimation(mCurrentTime + a.getStartOffset(),
a.getDuration());
mKeyguardGoingAway = false;
startKeyguardExit = false;
}
} }
} }
}
if (mPostKeyguardExitAnimation != null) { // Wallpaper is going away in un-force-hide motion, animate it as well.
// We're in the midst of a keyguard exit animation. if (!wallpaperInUnForceHiding && wallpaper != null
if (mKeyguardGoingAway) { && !mKeyguardGoingAwayDisableWindowAnimations) {
mPolicy.startKeyguardExitAnimation(mCurrentTime + if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: wallpaper animating away");
mPostKeyguardExitAnimation.getStartOffset(), Animation a = mPolicy.createForceHideWallpaperExitAnimation(
mPostKeyguardExitAnimation.getDuration()); mKeyguardGoingAwayToNotificationShade);
mKeyguardGoingAway = false; if (a != null) {
} else if (mPostKeyguardExitAnimation.hasEnded()) { WindowStateAnimator animator = wallpaper.mWinAnimator;
// Done with the animation, reset. animator.setAnimation(a);
mPostKeyguardExitAnimation = null; }
}
}
// Wallpaper is going away in un-force-hide motion, animate it as well.
if (!wallpaperInUnForceHiding && wallpaper != null
&& !mKeyguardGoingAwayDisableWindowAnimations) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: wallpaper animating away");
Animation a = mPolicy.createForceHideWallpaperExitAnimation(
mKeyguardGoingAwayToNotificationShade);
if (a != null) {
wallpaper.mWinAnimator.setAnimation(a);
} }
} }
} }