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

Ask user to reboot when enabling freeform and desktop mode

Browse Source 
The introduction of FreeformTaskListener in WM shell requires a reboot
after enabling freeform support fully. Let's add a dialog explaining the
requirement and ask user to reboot the device.

Enabling desktop mode also requires a reboot to take effect, so this CL
also adds the support to it.

There is also a cancel button to dismiss the dialog without a reboot,
just in case users need to hold off the reboot for any reason.

Bug: 215437867
Test: Pressing OK reboots the device. Pressing Cancel dismisses the
dialog.
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest

Change-Id: I553237a29751f73afa9fd4066241a19740872f6f
This commit is contained in:
Garfield Tan
2022-01-19 17:33:02 -08:00
parent 0128837312
commit 7a380f3dc6
8 changed files with 196 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.settings.development;
import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.provider.Settings;
@@ -26,11 +27,13 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class DesktopModePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
RebootConfirmationDialogHost {
private static final String FORCE_DESKTOP_MODE_KEY = "force_desktop_mode_on_external_displays";
@@ -39,8 +42,12 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC
@VisibleForTesting
static final int SETTING_VALUE_ON = 1;
public DesktopModePreferenceController(Context context) {
private final DevelopmentSettingsDashboardFragment mFragment;
public DesktopModePreferenceController(
Context context, DevelopmentSettingsDashboardFragment fragment) {
super(context);
mFragment = fragment;
}
@Override
@@ -54,6 +61,10 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC
Settings.Global.putInt(mContext.getContentResolver(),
DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS,
isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
if (isEnabled) {
RebootConfirmationDialogFragment.show(
mFragment, R.string.reboot_dialog_force_desktop_mode, this);
}
return true;
}
@@ -72,6 +83,12 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC
((SwitchPreference) mPreference).setChecked(false);
}
@Override
public void onRebootConfirmed() {
final Intent intent = new Intent(Intent.ACTION_REBOOT);
mContext.startActivity(intent);
}
@VisibleForTesting
String getBuildType() {
return Build.TYPE;