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
97 lines
3.4 KiB
Java
97 lines
3.4 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
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;
|
|
|
|
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,
|
|
RebootConfirmationDialogHost {
|
|
|
|
private static final String FORCE_DESKTOP_MODE_KEY = "force_desktop_mode_on_external_displays";
|
|
|
|
@VisibleForTesting
|
|
static final int SETTING_VALUE_OFF = 0;
|
|
@VisibleForTesting
|
|
static final int SETTING_VALUE_ON = 1;
|
|
|
|
private final DevelopmentSettingsDashboardFragment mFragment;
|
|
|
|
public DesktopModePreferenceController(
|
|
Context context, DevelopmentSettingsDashboardFragment fragment) {
|
|
super(context);
|
|
mFragment = fragment;
|
|
}
|
|
|
|
@Override
|
|
public String getPreferenceKey() {
|
|
return FORCE_DESKTOP_MODE_KEY;
|
|
}
|
|
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
final boolean isEnabled = (Boolean) newValue;
|
|
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;
|
|
}
|
|
|
|
@Override
|
|
public void updateState(Preference preference) {
|
|
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
|
|
DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
|
|
((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
|
|
}
|
|
|
|
@Override
|
|
protected void onDeveloperOptionsSwitchDisabled() {
|
|
super.onDeveloperOptionsSwitchDisabled();
|
|
Settings.Global.putInt(mContext.getContentResolver(),
|
|
DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
|
|
((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;
|
|
}
|
|
}
|