PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alina Zaidi
2024-10-08 20:24:09 +00:00
committed by Android (Google) Code Review
parent f9d76f5cc4 cc3eac9b7c
commit 1cc49800be
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/development/DesktopModePreferenceController.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
View File

@@ -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;