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

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

2
services/java/com/android/server/wm/AppTransition.java
View File

@ -722,7 +722,7 @@ public class AppTransition implements Dump {
@Override
public void dump(PrintWriter pw) {
pw.print(" " + this);
pw.print(" mAppTransitionState="); pw.println(appStateToString());
pw.print(" mAppTransitionState="); pw.println(appStateToString());
if (mNextAppTransitionType != NEXT_TRANSIT_TYPE_NONE) {
pw.print(" mNextAppTransitionType="); pw.println(transitTypeToString());
}

7
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
// the lock screen.
if (!mPolicy.allowAppAnimationsLw()) {
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"Animations disallowed by keyguard or dream.");
animLp = null;
}
@ -8544,8 +8546,7 @@ public class WindowManagerService extends IWindowManager.Stub
NN = mClosingApps.size();
for (i=0; i<NN; i++) {
AppWindowToken wtoken = mClosingApps.get(i);
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"Now closing app " + wtoken);
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now closing app " + wtoken);
wtoken.mAppAnimator.clearThumbnail();
wtoken.inPendingTransaction = false;
wtoken.mAppAnimator.animation = null;
@ -10394,7 +10395,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
pw.println();
if (dumpAll) {
pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer);
pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer);
pw.print(" mScreenRect="); pw.println(mScreenRect.toShortString());
if (mLastStatusBarVisibility != 0) {
pw.print(" mLastStatusBarVisibility=0x");