Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eda9de1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 2fe57183: am 30eec832: Merge "Transparent activity orientation problem when... 

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

* commit '2fe57183':
  Transparent activity orientation problem when previous landsacpe fullscreen activity not yet destroyed.
parents 690935ed 2fe57183

services/java/com/android/server/wm/WindowManagerService.java

100644 → 100755
+15 −11
Original line number Diff line number Diff line
@@ -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