Ask user to reboot when enabling freeform and desktop mode

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
2022-01-19 17:33:02 -08:00
parent 0128837312
commit 7a380f3dc6
8 changed files with 196 additions and 10 deletions
--- a/src/com/android/settings/development/RebootConfirmationDialogFragment.java
+++ 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();
+    }
+}