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

Commit 1cc49800 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "[dev_option] Move DestopModeFlags out of android.windows.flags" into main

parents f9d76f5c cc3eac9b

src/com/android/settings/development/DesktopModePreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
package com.android.settings.development;



import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;

import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;

import static android.window.DesktopModeFlags.ToggleOverride.fromSetting;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;



import android.content.Context;

import android.provider.Settings;

import android.window.flags.DesktopModeFlags.ToggleOverride;

import android.window.DesktopModeFlags.ToggleOverride;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.settings.development;



import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;

import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;



import static com.google.common.truth.Truth.assertThat;