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

Commit c299f643 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Use top fullscreen window to inherit SystemUI flags" into oc-mr1-dev 

am: 626b8c37

Change-Id: I9a52001ebae1c9a619af5bc73219fbb50de98dda
parents 0e0d5aac 626b8c37

services/core/java/com/android/server/wm/AppWindowToken.java

+15 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.util.Slog; 
import android.view.IApplicationToken;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManagerPolicy.StartingSurface;



import com.android.internal.util.ToBooleanFunction;
@@ -471,6 +472,20 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        return delayed;

    }



    /**

     * @return The to top most child window for which {@link LayoutParams#isFullscreen()} returns

     *         true.

     */

    WindowState getTopFullscreenWindow() {

        for (int i = mChildren.size() - 1; i >= 0; i--) {

            final WindowState win = mChildren.get(i);

            if (win != null && win.mAttrs.isFullscreen()) {

                return win;

            }

        }

        return null;

    }



    WindowState findMainWindow() {

        WindowState candidate = null;

        int j = mChildren.size();

services/core/java/com/android/server/wm/TaskSnapshotSurface.java

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ class TaskSnapshotSurface implements StartingSurface { 
                        + task);

                return null;

            }

            final WindowState topFullscreenWindow = topFullscreenToken.findMainWindow();

            final WindowState topFullscreenWindow = topFullscreenToken.getTopFullscreenWindow();

            if (mainWindow == null || topFullscreenWindow == null) {

                Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find main window for token="

                        + token);

services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java

+18 −0
Original line number Diff line number Diff line
@@ -96,6 +96,24 @@ public class AppWindowTokenTests extends WindowTestsBase { 
        token.removeImmediately();

    }



    @Test

    public void testGetTopFullscreenWindow() throws Exception {

        final WindowTestUtils.TestAppWindowToken token =

                new WindowTestUtils.TestAppWindowToken(mDisplayContent);



        assertNull(token.getTopFullscreenWindow());



        final WindowState window1 = createWindow(null, TYPE_BASE_APPLICATION, token, "window1");

        final WindowState window11 = createWindow(null, TYPE_APPLICATION, token, "window11");

        final WindowState window12 = createWindow(null, TYPE_APPLICATION, token, "window12");

        assertEquals(window12, token.getTopFullscreenWindow());

        window12.mAttrs.width = 500;

        assertEquals(window11, token.getTopFullscreenWindow());

        window11.mAttrs.width = 500;

        assertEquals(window1, token.getTopFullscreenWindow());

        token.removeImmediately();

    }



    @Test

    public void testLandscapeSeascapeRotationByApp() throws Exception {

        // Some plumbing to get the service ready for rotation updates.