Merge "Disable ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
a5e3d39db8
@@ -61,6 +61,7 @@ import org.robolectric.shadows.ShadowSystemProperties;
|
|||||||
com.android.settings.testutils.shadow.ShadowFragment.class,
|
com.android.settings.testutils.shadow.ShadowFragment.class,
|
||||||
})
|
})
|
||||||
@EnableFlags(Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
|
@EnableFlags(Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
|
||||||
|
@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION)
|
||||||
public class DesktopModePreferenceControllerTest {
|
public class DesktopModePreferenceControllerTest {
|
||||||
|
|
||||||
@Rule
|
@Rule
|
||||||
|
Reference in New Issue
Block a user