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

[dev_option] Use DesktopModeFlags from core instead of Shell

Browse Source 
Test: Current tests pass
Bug: 368055148
Flag: EXEMPT refactoring
Change-Id: I5f40bd1e00c0fdddfdeefc886e691c9b732387b8
This commit is contained in:
Alina Zaidi
2024-09-18 17:53:20 +00:00
parent 4764ef4bf1
commit 76bbdd58ab
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,14 +17,14 @@
package com.android.settings.development; package com.android.settings.development;
import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES; import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.convertToToggleOverrideWithFallback; import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.window.flags.DesktopModeFlags.ToggleOverride;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -34,7 +34,6 @@ import androidx.preference.TwoStatePreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride;
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
/** /**
@@ -84,7 +83,7 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC
// Use overridden state, if not present, then use default state // Use overridden state, if not present, then use default state
final int overrideInt = Settings.Global.getInt(mContext.getContentResolver(), final int overrideInt = Settings.Global.getInt(mContext.getContentResolver(),
DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting()); DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting());
final ToggleOverride toggleOverride = convertToToggleOverrideWithFallback(overrideInt, final ToggleOverride toggleOverride = fromSetting(overrideInt,
OVERRIDE_UNSET); OVERRIDE_UNSET);
final boolean shouldDevOptionBeEnabled = switch (toggleOverride) { final boolean shouldDevOptionBeEnabled = switch (toggleOverride) {
case OVERRIDE_OFF -> false; case OVERRIDE_OFF -> false;

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

@@ -17,10 +17,9 @@
package com.android.settings.development; package com.android.settings.development;
import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES; import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;