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

Commit ec2652a9 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Android (Google) Code Review
Browse files

Merge "Let MaximizeMenu use IsMaximized from shared utility" into main

parents c7a5fcbb 12a1ca22

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