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

Commit 89b61fe4 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Update config from ancestor if it can handle orientation request" into sc-dev am: 1b394248 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14206622

Change-Id: Id06619f6daafb3e872e120f47b201cce3519cf0b
parents 856344ba 1b394248

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

+8 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        mOrientation = orientation;

        final WindowContainer parent = getParent();

        if (parent != null) {

            if (getConfiguration().orientation != getRequestedConfigurationOrientation()) {

            if (getConfiguration().orientation != getRequestedConfigurationOrientation()

                    // Update configuration directly only if the change won't be dispatched from

                    // ancestor. This prevents from computing intermediate configuration when the

                    // parent also needs to be updated from the ancestor. E.g. the app requests

                    // portrait but the task is still in landscape. While updating from display,

                    // the task can be updated to portrait first so the configuration can be

                    // computed in a consistent environment.

                    && (inMultiWindowMode() || !handlesOrientationChangeFromDescendant())) {

                // Resolve the requested orientation.

                onConfigurationChanged(parent.getConfiguration());

            }

services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
@@ -633,6 +634,22 @@ public class WindowContainerTests extends WindowTestsBase { 
        assertEquals(SCREEN_ORIENTATION_PORTRAIT, root.getOrientation());

    }



    @Test

    public void testSetOrientation() {

        final TestWindowContainer root = spy(new TestWindowContainerBuilder(mWm).build());

        final TestWindowContainer child = spy(root.addChildWindow());

        doReturn(true).when(root).handlesOrientationChangeFromDescendant();

        child.getWindowConfiguration().setWindowingMode(WINDOWING_MODE_FULLSCREEN);

        child.setOrientation(SCREEN_ORIENTATION_PORTRAIT);

        // The ancestor should decide whether to dispatch the configuration change.

        verify(child, never()).onConfigurationChanged(any());



        doReturn(false).when(root).handlesOrientationChangeFromDescendant();

        child.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

        // The ancestor doesn't handle the request so the descendant applies the change directly.

        verify(child).onConfigurationChanged(any());

    }



    @Test

    public void testCompareTo() {

        final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm);