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

am 30eec832: Merge "Transparent activity orientation problem when previous landsacpe fullscreen activity not yet destroyed."

Browse Source 
* commit '30eec832ec30709a8dd8830b9c5d64dcc0778a09':
  Transparent activity orientation problem when previous landsacpe fullscreen activity not yet destroyed.
This commit is contained in:
Dianne Hackborn
2012-04-18 20:39:30 -07:00
committed by Android Git Automerger
parent 3b29ca8814 30eec832ec
commit 2fe57183d3
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/java/com/android/server/wm/WindowManagerService.java Normal file → Executable file
View File

@@ -3359,17 +3359,7 @@ public class WindowManagerService extends IWindowManager.Stub
continue;
}
if (!haveGroup) {
// We ignore any hidden applications on the top.
if (wtoken.hiddenRequested || wtoken.willBeHidden) {
if (DEBUG_ORIENTATION) Slog.v(TAG, "Skipping " + wtoken
+ " -- hidden on top");
continue;
}
haveGroup = true;
curGroup = wtoken.groupId;
lastOrientation = wtoken.requestedOrientation;
} else if (curGroup != wtoken.groupId) {
if (haveGroup == true && curGroup != wtoken.groupId) {
// If we have hit a new application group, and the bottom
// of the previous group didn't explicitly say to use
// the orientation behind it, and the last app was
@@ -3382,6 +3372,20 @@ public class WindowManagerService extends IWindowManager.Stub
return lastOrientation;
}
}
// We ignore any hidden applications on the top.
if (wtoken.hiddenRequested || wtoken.willBeHidden) {
if (DEBUG_ORIENTATION) Slog.v(TAG, "Skipping " + wtoken
+ " -- hidden on top");
continue;
}
if (!haveGroup) {
haveGroup = true;
curGroup = wtoken.groupId;
lastOrientation = wtoken.requestedOrientation;
}
int or = wtoken.requestedOrientation;
// If this application is fullscreen, and didn't explicitly say
// to use the orientation behind it, then just take whatever