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

Commit 52199b39 authored by Vali Calinescu's avatar Vali Calinescu Committed by Automerger Merge Worker
Browse files

Merge "Check the current runtime orientation in updateCompatDisplayInsets"... 

Merge "Check the current runtime orientation in updateCompatDisplayInsets" into tm-qpr-dev am: 05557900

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



Change-Id: I5c9eaffafa1e59a1e6ada706799ebea6a891193d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9461576f 05557900

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

+2 −4
Original line number Diff line number Diff line
@@ -8008,9 +8008,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // The smallest screen width is the short side of screen bounds. Because the bounds

        // and density won't be changed, smallestScreenWidthDp is also fixed.

        overrideConfig.smallestScreenWidthDp = fullConfig.smallestScreenWidthDp;

        // TODO(b/264276741): Check whether the runtime orietnation request is fixed rather than

        // the manifest orientation which may be obsolete.

        if (info.isFixedOrientation()) {

        if (ActivityInfo.isFixedOrientation(getOverrideOrientation())) {

            // lock rotation too. When in size-compat, onConfigurationChanged will watch for and

            // apply runtime rotation changes.

            overrideConfig.windowConfiguration.setRotation(
@@ -8187,7 +8185,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    /**

     * @return The orientation to use to understand if reachability is enabled.

     */

    @ActivityInfo.ScreenOrientation

    @Configuration.Orientation

    int getOrientationForReachability() {

        return mLetterboxUiController.hasInheritedLetterboxBehavior()

                ? mLetterboxUiController.getInheritedOrientation()

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

+2 −2
Original line number Diff line number Diff line
@@ -1436,7 +1436,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     *         {@link Configuration#ORIENTATION_PORTRAIT},

     *         {@link Configuration#ORIENTATION_UNDEFINED}).

     */

    @ScreenOrientation

    @Configuration.Orientation

    int getRequestedConfigurationOrientation() {

        return getRequestedConfigurationOrientation(false /* forDisplay */);

    }
@@ -1454,7 +1454,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     *         {@link Configuration#ORIENTATION_PORTRAIT},

     *         {@link Configuration#ORIENTATION_UNDEFINED}).

     */

    @ScreenOrientation

    @Configuration.Orientation

    int getRequestedConfigurationOrientation(boolean forDisplay) {

        int requestedOrientation = getOverrideOrientation();

        final RootDisplayArea root = getRootDisplayArea();