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

Commit db73805f authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Remove unneccessary method DesktopModeStatus#isDesktopModeFlagEnabled. 

This method was used to change flag value within a test. We dont need to
have tests that do that,  as flags are process stable in real scenarios.

Test: current tests pass
Bug: 348193756
Flag: EXEMPT minor refactoring

Change-Id: I9f53addc4b23e0e93179405e1a166adf8a3162a1
parent 71befbdb

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

+1 −11
Original line number Diff line number Diff line
@@ -101,16 +101,6 @@ public class DesktopModeStatus { 
    private static final int MAX_TASK_LIMIT = SystemProperties.getInt(

            "persist.wm.debug.desktop_max_task_limit", DEFAULT_MAX_TASK_LIMIT);



    /**

     * Return {@code true} if desktop windowing flag is enabled. Only to be used for testing.

     * Callers should use {@link #canEnterDesktopMode(Context)} to query the state of desktop

     * windowing.

     */

    @VisibleForTesting

    public static boolean isDesktopModeFlagEnabled() {

        return Flags.enableDesktopWindowingMode();

    }



    /**

     * Return {@code true} if veiled resizing is active. If false, fluid resizing is used.

     */
@@ -167,7 +157,7 @@ public class DesktopModeStatus { 


    /** Returns if desktop mode dev option should be enabled if there is no user override. */

    public static boolean shouldDevOptionBeEnabledByDefault() {

        return isDesktopModeFlagEnabled();

        return Flags.enableDesktopWindowingMode();

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ enum class DesktopModeFlags( 
    private val shouldOverrideByDevOption: Boolean

) {

  // All desktop mode related flags will be added here

  DESKTOP_WINDOWING_MODE(DesktopModeStatus::isDesktopModeFlagEnabled, true),

  DESKTOP_WINDOWING_MODE(Flags::enableDesktopWindowingMode, true),

  WALLPAPER_ACTIVITY(Flags::enableDesktopWindowingWallpaperActivity, true);



  // Local cache for toggle override, which is initialized once on its first access. It needs to be

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityManager.RecentTaskInfo 
import android.app.ActivityManager.RunningTaskInfo

import android.app.KeyguardManager

import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME

import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE

import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD

import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM

import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN
@@ -137,6 +138,7 @@ import org.mockito.quality.Strictness 
 */

@SmallTest

@RunWith(AndroidTestingRunner::class)

@EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

class DesktopTasksControllerTest : ShellTestCase() {



  @JvmField @Rule val setFlagsRule = SetFlagsRule()
@@ -193,7 +195,6 @@ class DesktopTasksControllerTest : ShellTestCase() { 
            .strictness(Strictness.LENIENT)

            .spyStatic(DesktopModeStatus::class.java)

            .startMocking()

    whenever(DesktopModeStatus.isDesktopModeFlagEnabled()).thenReturn(true)

    doReturn(true).`when` { DesktopModeStatus.isDesktopModeSupported(any()) }



    shellInit = spy(ShellInit(testExecutor))
@@ -263,7 +264,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  }



  @Test

  fun instantiate_flagOff_doNotAddInitCallback() {

  fun instantiate_canNotEnterDesktopMode_doNotAddInitCallback() {

    whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(false)

    clearInvocations(shellInit)

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlagsTest.kt

+0 −26
Original line number Diff line number Diff line
@@ -22,13 +22,10 @@ import android.platform.test.flag.junit.SetFlagsRule 
import android.provider.Settings

import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.dx.mockito.inline.extended.ExtendedMockito

import com.android.dx.mockito.inline.extended.StaticMockitoSession

import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE

import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY

import com.android.window.flags.Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION

import com.android.wm.shell.ShellTestCase

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

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON
@@ -39,8 +36,6 @@ import org.junit.Before 
import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.whenever

import org.mockito.quality.Strictness



/**

 * Test class for [DesktopModeFlags]
@@ -187,27 +182,6 @@ class DesktopModeFlagsTest : ShellTestCase() { 
    assertThat(DESKTOP_WINDOWING_MODE.isEnabled(mContext)).isTrue()

  }



  @Test

  @EnableFlags(FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

  fun isEnabled_noOverride_featureFlagOnThenOff_returnsTrueAndFalse() {

    setOverride(null)

    // For overridableFlag, in absence of overrides, follow flag

    assertThat(DESKTOP_WINDOWING_MODE.isEnabled(mContext)).isTrue()



    val mockitoSession: StaticMockitoSession =

        ExtendedMockito.mockitoSession()

            .strictness(Strictness.LENIENT)

            .spyStatic(DesktopModeStatus::class.java)

            .startMocking()

    try {

      // No caching of flags

      whenever(DesktopModeStatus.isDesktopModeFlagEnabled()).thenReturn(false)

      assertThat(DESKTOP_WINDOWING_MODE.isEnabled(mContext)).isFalse()

    } finally {

      mockitoSession.finishMocking()

    }

  }



  @Test

  @EnableFlags(FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)

  @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)