diff --git a/res/values/strings.xml b/res/values/strings.xml index b839b6d4a8b..c4e332574b4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13813,4 +13813,17 @@ Preview screensaver Customize + + + A reboot is required to enable freeform + support. + + A reboot is required to force desktop mode on + secondary displays. + + Reboot now + + Reboot later diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java index 528af8aee80..912809c0a56 100644 --- a/src/com/android/settings/development/DesktopModePreferenceController.java +++ b/src/com/android/settings/development/DesktopModePreferenceController.java @@ -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; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 8f227dcd810..025c51f0327 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -553,8 +553,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new NotificationChannelWarningsPreferenceController(context)); controllers.add(new AllowAppsOnExternalPreferenceController(context)); controllers.add(new ResizableActivityPreferenceController(context)); - controllers.add(new FreeformWindowsPreferenceController(context)); - controllers.add(new DesktopModePreferenceController(context)); + controllers.add(new FreeformWindowsPreferenceController(context, fragment)); + controllers.add(new DesktopModePreferenceController(context, fragment)); controllers.add(new NonResizableMultiWindowPreferenceController(context)); controllers.add(new ShortcutManagerThrottlingPreferenceController(context)); controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context)); diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index 4d384809464..47b648565d4 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; +import android.content.Intent; import android.os.Build; import android.provider.Settings; @@ -24,11 +25,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 FreeformWindowsPreferenceController extends DeveloperOptionsPreferenceController - implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { + implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, + RebootConfirmationDialogHost { private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support"; @@ -37,8 +40,12 @@ public class FreeformWindowsPreferenceController extends DeveloperOptionsPrefere @VisibleForTesting static final int SETTING_VALUE_ON = 1; - public FreeformWindowsPreferenceController(Context context) { + private final DevelopmentSettingsDashboardFragment mFragment; + + public FreeformWindowsPreferenceController( + Context context, DevelopmentSettingsDashboardFragment fragment) { super(context); + mFragment = fragment; } @Override @@ -52,6 +59,10 @@ public class FreeformWindowsPreferenceController extends DeveloperOptionsPrefere Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + if (isEnabled) { + RebootConfirmationDialogFragment.show( + mFragment, R.string.reboot_dialog_enable_freeform_support, this); + } return true; } @@ -70,6 +81,12 @@ public class FreeformWindowsPreferenceController extends DeveloperOptionsPrefere ((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; diff --git a/src/com/android/settings/development/RebootConfirmationDialogFragment.java b/src/com/android/settings/development/RebootConfirmationDialogFragment.java new file mode 100644 index 00000000000..84409d1b45a --- /dev/null +++ b/src/com/android/settings/development/RebootConfirmationDialogFragment.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2022 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 android.app.Dialog; +import android.app.settings.SettingsEnums; +import android.content.DialogInterface; +import android.os.Bundle; + +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + +import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; + +/** + * Dialog fragment for reboot confirmation when enabling certain features. + */ +public class RebootConfirmationDialogFragment extends InstrumentedDialogFragment + implements DialogInterface.OnClickListener { + + private static final String TAG = "FreeformPrefRebootDlg"; + + private final int mMessageId; + private final RebootConfirmationDialogHost mHost; + + /** + * Show an instance of this dialog. + */ + public static void show(Fragment fragment, int messageId, RebootConfirmationDialogHost host) { + final FragmentManager manager = fragment.getActivity().getSupportFragmentManager(); + if (manager.findFragmentByTag(TAG) == null) { + final RebootConfirmationDialogFragment dialog = + new RebootConfirmationDialogFragment(messageId, host); + dialog.show(manager, TAG); + } + } + + private RebootConfirmationDialogFragment(int messageId, RebootConfirmationDialogHost host) { + mMessageId = messageId; + mHost = host; + } + + @Override + public int getMetricsCategory() { + return SettingsEnums.REBOOT_CONFIRMATION_DIALOG; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstances) { + return new AlertDialog.Builder(getActivity()) + .setMessage(mMessageId) + .setPositiveButton(R.string.reboot_dialog_reboot_now, this) + .setNegativeButton(R.string.reboot_dialog_reboot_later, null) + .create(); + } + + @Override + public void onClick(DialogInterface dialog, int which) { + mHost.onRebootConfirmed(); + } +} diff --git a/src/com/android/settings/development/RebootConfirmationDialogHost.java b/src/com/android/settings/development/RebootConfirmationDialogHost.java new file mode 100644 index 00000000000..6eb9f2fd111 --- /dev/null +++ b/src/com/android/settings/development/RebootConfirmationDialogHost.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 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; + +/** + * Host of {@link RebootConfirmationDialogFragment} that provides callback when user + * interacts with the UI. + */ +public interface RebootConfirmationDialogHost { + /** + * Called when user made a decision on whether to reboot the device. + */ + void onRebootConfirmed(); +} diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index 108ec19ca6e..26b529d62f5 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -23,6 +23,7 @@ import static com.android.settings.development.DesktopModePreferenceController.S import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,6 +32,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; @@ -52,6 +56,14 @@ public class DesktopModePreferenceControllerTest { private SwitchPreference mPreference; @Mock private PreferenceScreen mScreen; + @Mock + private DevelopmentSettingsDashboardFragment mFragment; + @Mock + private FragmentActivity mActivity; + @Mock + private FragmentManager mFragmentManager; + @Mock + private FragmentTransaction mTransaction; private Context mContext; private DesktopModePreferenceController mController; @@ -60,7 +72,10 @@ public class DesktopModePreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new DesktopModePreferenceController(mContext); + doReturn(mTransaction).when(mFragmentManager).beginTransaction(); + doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager(); + doReturn(mActivity).when(mFragment).getActivity(); + mController = new DesktopModePreferenceController(mContext, mFragment); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } @@ -82,16 +97,18 @@ public class DesktopModePreferenceControllerTest { } @Test - public void onPreferenceChange_switchEnabled_shouldEnableFreeformWindows() { + public void onPreferenceChange_switchEnabled_shouldEnableDesktopMode() { mController.onPreferenceChange(mPreference, true /* new value */); final int mode = Settings.Global.getInt(mContext.getContentResolver(), DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */); assertThat(mode).isEqualTo(SETTING_VALUE_ON); + + verify(mTransaction).add(any(RebootConfirmationDialogFragment.class), any()); } @Test - public void onPreferenceChange_switchDisabled_shouldDisableFreeformWindows() { + public void onPreferenceChange_switchDisabled_shouldDisableDesktopMode() { mController.onPreferenceChange(mPreference, false /* new value */); final int mode = Settings.Global.getInt(mContext.getContentResolver(), diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 6162483c3ec..695a291bbd2 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static com.android.settings.development.FreeformWindowsPreferenceControll import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,6 +31,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; @@ -51,6 +55,14 @@ public class FreeformWindowsPreferenceControllerTest { private SwitchPreference mPreference; @Mock private PreferenceScreen mScreen; + @Mock + private DevelopmentSettingsDashboardFragment mFragment; + @Mock + private FragmentActivity mActivity; + @Mock + private FragmentManager mFragmentManager; + @Mock + private FragmentTransaction mTransaction; private Context mContext; private FreeformWindowsPreferenceController mController; @@ -59,7 +71,10 @@ public class FreeformWindowsPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new FreeformWindowsPreferenceController(mContext); + doReturn(mTransaction).when(mFragmentManager).beginTransaction(); + doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager(); + doReturn(mActivity).when(mFragment).getActivity(); + mController = new FreeformWindowsPreferenceController(mContext, mFragment); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } @@ -87,6 +102,8 @@ public class FreeformWindowsPreferenceControllerTest { final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, -1 /* default */); assertThat(mode).isEqualTo(SETTING_VALUE_ON); + + verify(mTransaction).add(any(RebootConfirmationDialogFragment.class), any()); } @Test