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

am 8f48624b: Merge "Account for windows on non-app display."

Browse Source 
* commit '8f48624bdc8af5add52c9184b42ed10583f63710':
  Account for windows on non-app display.
This commit is contained in:
Craig Mautner
2014-05-08 02:27:43 +00:00
committed by Android Git Automerger
parent 073af7f370 221b336cc1
commit c26c329d2e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -299,6 +299,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
boolean mHasSurface = false;
boolean mNotOnAppsDisplay = false;
DisplayContent mDisplayContent;
/** When true this window can be displayed on screens owther than mOwnerUid's */
@@ -430,6 +431,10 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
mRootToken = appToken;
mAppToken = appToken.appWindowToken;
if (mAppToken != null) {
final DisplayContent appDisplay = getDisplayContent();
mNotOnAppsDisplay = displayContent != appDisplay;
}
mWinAnimator = new WindowStateAnimator(this);
mWinAnimator.mAlpha = a.alpha;
@@ -717,7 +722,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
public DisplayContent getDisplayContent() {
return mAppToken == null ? mDisplayContent : getStack().getDisplayContent();
return mAppToken == null || mNotOnAppsDisplay ?
mDisplayContent : getStack().getDisplayContent();
}
public int getDisplayId() {