'Freeform windows on secondary diplay'. Make sure the toggles enables freeform support on devices. This remove reliance on 'Enable freeform windows suppport' toggle when using this toggle. Also update strings for all toggles to just use term 'freeform windows' instead of 'desktop mode' or 'freeform windowing experiences'. Two toggles have the same name 'enable freeform windows', but users will see only one of them at a time. Test: Added new tests Bug: 348193756 Bug: 348186127 Flag: EXEMPT minor change Change-Id: Ic4528618e6902d084c58a6b5ddeb4b92d63386d6
104 lines
3.9 KiB
Java
104 lines
3.9 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.os.Build;
|
|
import android.provider.Settings;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.VisibleForTesting;
|
|
import androidx.preference.Preference;
|
|
import androidx.preference.TwoStatePreference;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.core.PreferenceControllerMixin;
|
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
|
|
|
/**
|
|
* Preference controller to control Desktop mode features on secondary display
|
|
*/
|
|
public class DesktopModeSecondaryDisplayPreferenceController extends
|
|
DeveloperOptionsPreferenceController
|
|
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
|
|
RebootConfirmationDialogHost {
|
|
|
|
private static final String ENABLE_DESKTOP_MODE_ON_SECONDARY_DISPLAY =
|
|
"force_desktop_mode_on_external_displays";
|
|
|
|
@VisibleForTesting
|
|
static final int SETTING_VALUE_OFF = 0;
|
|
@VisibleForTesting
|
|
static final int SETTING_VALUE_ON = 1;
|
|
|
|
@Nullable
|
|
private final DevelopmentSettingsDashboardFragment mFragment;
|
|
|
|
public DesktopModeSecondaryDisplayPreferenceController(
|
|
Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
|
|
super(context);
|
|
mFragment = fragment;
|
|
}
|
|
|
|
@Override
|
|
public String getPreferenceKey() {
|
|
return ENABLE_DESKTOP_MODE_ON_SECONDARY_DISPLAY;
|
|
}
|
|
|
|
@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);
|
|
// Update freeform window support on device.
|
|
// DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT setting enables freeform support on device
|
|
// where it's not present by default.
|
|
Settings.Global.putInt(mContext.getContentResolver(),
|
|
Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,
|
|
isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
|
|
if (isEnabled && mFragment != null) {
|
|
RebootConfirmationDialogFragment.show(
|
|
mFragment, R.string.reboot_dialog_enable_desktop_mode_on_secondary_display,
|
|
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);
|
|
((TwoStatePreference) 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);
|
|
((TwoStatePreference) mPreference).setChecked(false);
|
|
}
|
|
|
|
@VisibleForTesting
|
|
String getBuildType() {
|
|
return Build.TYPE;
|
|
}
|
|
}
|