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

Commit 3a651337 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix split layout didn't update config when rotation" into udc-qpr-dev... 

Merge "Fix split layout didn't update config when rotation" into udc-qpr-dev am: d972dd13 am: 071f67ce

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



Change-Id: Ica087703f680e192fe16411dccb2f776a7b9abfb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7d8b3cc 071f67ce

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+0 −4
Original line number Diff line number Diff line
@@ -722,10 +722,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        return bounds.width() > bounds.height();

    }



    public boolean isDensityChanged(int densityDpi) {

        return mDensity != densityDpi;

    }



    /**

     * Return if this layout is landscape.

     */

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −17
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.LauncherApps;

import android.content.pm.ShortcutInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.hardware.devicestate.DeviceStateManager;

import android.os.Bundle;
@@ -1779,8 +1778,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mRootTaskInfo = taskInfo;

        if (mSplitLayout != null

                && mSplitLayout.updateConfiguration(mRootTaskInfo.configuration)

                && mMainStage.isActive()

                && !ENABLE_SHELL_TRANSITIONS) {

                && mMainStage.isActive()) {

            // Clear the divider remote animating flag as the divider will be re-rendered to apply

            // the new rotation config.

            mIsDividerRemoteAnimating = false;
@@ -2218,20 +2216,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mDisplayController.addDisplayChangingController(this::onDisplayChange);

    }



    @Override

    public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {

        if (displayId != DEFAULT_DISPLAY) {

            return;

        }

        if (mSplitLayout != null && mSplitLayout.isDensityChanged(newConfig.densityDpi)

                && mMainStage.isActive()

                && mSplitLayout.updateConfiguration(newConfig)

                && ENABLE_SHELL_TRANSITIONS) {

            mSplitLayout.update(null /* t */);

            onLayoutSizeChanged(mSplitLayout);

        }

    }



    /**

     * Update surfaces of the split screen layout based on the current state

     * @param transaction to write the updates to