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

Commit ce812de3 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Add restore-to-prev-size from immersive flag to dev options" into main

parents 62896ccd a1381653

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public enum DesktopModeFlags { 
    ENABLE_HOLD_TO_DRAG_APP_HANDLE(Flags::enableHoldToDragAppHandle, true),

    ENABLE_MINIMIZE_BUTTON(Flags::enableMinimizeButton, true),

    ENABLE_RESIZING_METRICS(Flags::enableResizingMetrics, true),

    ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE(

            Flags::enableRestoreToPreviousSizeFromDesktopImmersive, true),

    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true),

    ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true),

    ENABLE_THEMED_APP_HEADERS(Flags::enableThemedAppHeaders, true),

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopImmersiveController.kt

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.IBinder 
import android.view.SurfaceControl

import android.view.WindowManager.TRANSIT_CHANGE

import android.view.animation.DecelerateInterpolator

import android.window.DesktopModeFlags

import android.window.DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS

import android.window.TransitionInfo

import android.window.TransitionRequestInfo
@@ -396,7 +397,7 @@ class DesktopImmersiveController( 
                taskId = taskId,

                immersive = pendingTransition.direction == Direction.ENTER,

            )

            if (Flags.enableRestoreToPreviousSizeFromDesktopImmersive()) {

            if (DesktopModeFlags.ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE.isTrue) {

                when (pendingTransition.direction) {

                    Direction.EXIT -> {

                        desktopRepository.removeBoundsBeforeFullImmersive(taskId)
@@ -457,7 +458,7 @@ class DesktopImmersiveController( 
        val displayLayout =

            displayController.getDisplayLayout(taskInfo.displayId)

                ?: error("Expected non-null display layout for displayId: ${taskInfo.displayId}")

        return if (Flags.enableRestoreToPreviousSizeFromDesktopImmersive()) {

        return if (DesktopModeFlags.ENABLE_RESTORE_TO_PREVIOUS_SIZE_FROM_DESKTOP_IMMERSIVE.isTrue) {

            desktopUserRepositories.current.removeBoundsBeforeFullImmersive(taskInfo.taskId)

                ?: if (ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()) {

                    calculateInitialBounds(displayLayout, taskInfo)