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

Commit 26ee7c4c authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Migrate enableDragToMaximize to DesktopExpFlags 

This is a pure migration.

Flag: com.android.window.flags.enable_drag_to_maximize
Bug: 398095714
Test: m
Change-Id: Iecd3bb49fa966b916794a70fe57182e9e9e7a317
parent e491be83

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public class DesktopModeStatus { 
     * screen.

     */

    public static boolean shouldMaximizeWhenDragToTopEdge(@NonNull Context context) {

        if (!Flags.enableDragToMaximize()) {

        if (!DesktopExperienceFlags.ENABLE_DRAG_TO_MAXIMIZE.isTrue()) {

            return false;

        }

        return SystemProperties.getBoolean(ENABLE_DRAG_TO_MAXIMIZE_SYS_PROP,

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/ExitDesktopWithDragToTopDragZone.kt

+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.wm.shell.scenarios 


import android.tools.NavBar

import android.tools.Rotation

import com.android.internal.R

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -42,8 +42,8 @@ constructor( 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Skip the test when the drag-to-maximize is enabled on this device.

        Assume.assumeFalse(Flags.enableDragToMaximize() &&

            instrumentation.context.resources.getBoolean(R.bool.config_dragToMaximizeInDesktopMode))

        Assume.assumeFalse(

            DesktopModeStatus.shouldMaximizeWhenDragToTopEdge(instrumentation.context))

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        testApp.enterDesktopMode(wmHelper, device)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/MaximizeAppWindowWithDragToTopDragZone.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.tools.flicker.rules.ChangeDisplayOrientationRule 
import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.internal.R

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -54,8 +54,8 @@ constructor(private val rotation: Rotation = Rotation.ROTATION_0) { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Skip the test when the drag-to-maximize is disabled on this device.

        Assume.assumeTrue(Flags.enableDragToMaximize() &&

            instrumentation.context.resources.getBoolean(R.bool.config_dragToMaximizeInDesktopMode))

        Assume.assumeTrue(

            DesktopModeStatus.shouldMaximizeWhenDragToTopEdge(instrumentation.context))

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        ChangeDisplayOrientationRule.setRotation(rotation)