drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d69417d2: Merge "Reduce jank on incoming phone call during dream." into klp-dev

Browse Source 
* commit 'd69417d2f62606af76ec4cea72bff089ff27b2f2':
  Reduce jank on incoming phone call during dream.
This commit is contained in:
Craig Mautner
2013-10-11 09:52:54 -07:00
committed by Android Git Automerger
parent 41920afa54 d69417d2f6
commit 9ccc082c9a
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3519,7 +3519,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
| FINISH_LAYOUT_REDO_CONFIG | FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER; | FINISH_LAYOUT_REDO_WALLPAPER;
} }
if (!mShowingDream) {
mKeyguardDelegate.setHidden(true); mKeyguardDelegate.setHidden(true);
}
} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) { } else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
// This is the case of keyguard isSecure() and not mHideLockScreen. // This is the case of keyguard isSecure() and not mHideLockScreen.
if (mDismissKeyguard == DISMISS_KEYGUARD_START) { if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
@ -3560,9 +3562,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
public boolean allowAppAnimationsLw() { public boolean allowAppAnimationsLw() {
if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) { if (mKeyguard != null && mKeyguard.isVisibleLw() || mShowingDream) {
// If keyguard is currently visible, no reason to animate // If keyguard or dreams is currently visible, no reason to animate behind it.
// behind it.
return false; return false;
} }
return true; return true;

5
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -8502,6 +8502,8 @@ public class WindowManagerService extends IWindowManager.Stub
// example, when this transition is being done behind // example, when this transition is being done behind
// the lock screen. // the lock screen.
if (!mPolicy.allowAppAnimationsLw()) { if (!mPolicy.allowAppAnimationsLw()) {
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"Animations disallowed by keyguard or dream.");
animLp = null; animLp = null;
} }
@ -8544,8 +8546,7 @@ public class WindowManagerService extends IWindowManager.Stub
NN = mClosingApps.size(); NN = mClosingApps.size();
for (i=0; i<NN; i++) { for (i=0; i<NN; i++) {
AppWindowToken wtoken = mClosingApps.get(i); AppWindowToken wtoken = mClosingApps.get(i);
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now closing app " + wtoken);
"Now closing app " + wtoken);
wtoken.mAppAnimator.clearThumbnail(); wtoken.mAppAnimator.clearThumbnail();
wtoken.inPendingTransaction = false; wtoken.inPendingTransaction = false;
wtoken.mAppAnimator.animation = null; wtoken.mAppAnimator.animation = null;