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

Merge "Dump out last real used app transit type" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-11 20:29:41 +00:00
committed by Android (Google) Code Review
parent dd59a27f2e 60091a978f
commit b1dfc3e7e1
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -162,6 +162,9 @@ public class AppTransition implements Dump {
private final WindowManagerService mService;
private int mNextAppTransition = TRANSIT_UNSET;
private int mLastUsedAppTransition = TRANSIT_UNSET;
private String mLastOpeningApp;
private String mLastClosingApp;
private static final int NEXT_TRANSIT_TYPE_NONE = 0;
private static final int NEXT_TRANSIT_TYPE_CUSTOM = 1;
@@ -285,6 +288,13 @@ public class AppTransition implements Dump {
private void setAppTransition(int transit) {
mNextAppTransition = transit;
setLastAppTransition(TRANSIT_UNSET, null, null);
}
void setLastAppTransition(int transit, AppWindowToken openingApp, AppWindowToken closingApp) {
mLastUsedAppTransition = transit;
mLastOpeningApp = "" + openingApp;
mLastClosingApp = "" + closingApp;
}
boolean isReady() {
@@ -1904,6 +1914,14 @@ public class AppTransition implements Dump {
pw.print(prefix); pw.print("mNextAppTransitionCallback=");
pw.println(mNextAppTransitionCallback);
}
if (mLastUsedAppTransition != TRANSIT_NONE) {
pw.print(prefix); pw.print("mLastUsedAppTransition=");
pw.println(appTransitionToString(mLastUsedAppTransition));
pw.print(prefix); pw.print("mLastOpeningApp=");
pw.println(mLastOpeningApp);
pw.print(prefix); pw.print("mLastClosingApp=");
pw.println(mLastClosingApp);
}
}
public void setCurrentUser(int newUserId) {

2
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -1189,6 +1189,8 @@ class WindowSurfacePlacer {
final AppWindowToken topOpeningApp = handleOpeningApps(transit,
animLp, voiceInteraction, topClosingLayer);
mService.mAppTransition.setLastAppTransition(transit, topOpeningApp, topClosingApp);
final AppWindowAnimator openingAppAnimator = (topOpeningApp == null) ? null :
topOpeningApp.mAppAnimator;
final AppWindowAnimator closingAppAnimator = (topClosingApp == null) ? null :