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

Commit 12a1ca22 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Let MaximizeMenu use IsMaximized from shared utility 

This CL changes MaximizeMenu to use the IsMaximized check from the
shared utility.
That ensures that the maximize/restore icon is consistent with the
outcome.

Bug: 382025572
Flag: EXEMPT bug fix
Test: existing test passes
Change-Id: I76226c86b401db76e085aee634ecbc6590c49cbd
parent bb70ba01

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MaximizeMenu.kt

+2 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import com.android.wm.shell.R 
import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.desktopmode.calculateMaximizeBounds

import com.android.wm.shell.desktopmode.isTaskMaximized

import com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED_DECELERATE

import com.android.wm.shell.shared.animation.Interpolators.FAST_OUT_LINEAR_IN

import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewHostViewContainer
@@ -231,11 +231,7 @@ class MaximizeMenu( 
    }



    private fun getSizeToggleDirection(): MaximizeMenuView.SizeToggleDirection {

        val maximizeBounds = calculateMaximizeBounds(

            displayController.getDisplayLayout(taskInfo.displayId)!!,

            taskInfo

        )

        val maximized = taskInfo.configuration.windowConfiguration.bounds.equals(maximizeBounds)

        val maximized = isTaskMaximized(taskInfo, displayController)

        return if (maximized)

            MaximizeMenuView.SizeToggleDirection.RESTORE

        else