Merge "Persist dev option reboot dialog on rotation." into main

src/com/android/settings/development/RebootConfirmationDialogFragment.java

@@ -21,10 +21,13 @@ import android.app.settings.SettingsEnums;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -33,11 +36,10 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 public class RebootConfirmationDialogFragment extends InstrumentedDialogFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
 
-    private static final String TAG = "FreeformPrefRebootDlg";
+    @VisibleForTesting
+    static final String TAG = "DevOptionRebootDlg";
 
-    private final int mMessageId;
-    private final int mCancelButtonId;
-    private final RebootConfirmationDialogHost mHost;
+    private RebootConfirmationDialogViewModel mViewModel;
 
     /** Show an instance of this dialog. */
     public static void show(Fragment fragment, int messageId, RebootConfirmationDialogHost host) {
@@ -50,55 +52,60 @@ public class RebootConfirmationDialogFragment extends InstrumentedDialogFragment
             int messageId,
             int cancelButtonId,
             RebootConfirmationDialogHost host) {
-        final FragmentManager manager = fragment.getActivity().getSupportFragmentManager();
+        final FragmentManager manager = fragment.requireActivity().getSupportFragmentManager();
         if (manager.findFragmentByTag(TAG) == null) {
             final RebootConfirmationDialogFragment dialog =
-                    new RebootConfirmationDialogFragment(messageId, cancelButtonId, host);
+                    new RebootConfirmationDialogFragment();
+            RebootConfirmationDialogViewModel mViewModel = new ViewModelProvider(
+                    fragment.requireActivity()).get(
+                    RebootConfirmationDialogViewModel.class);
+            mViewModel.setMessageId(messageId);
+            mViewModel.setCancelButtonId(cancelButtonId);
+            mViewModel.setHost(host);
             dialog.show(manager, TAG);
         }
     }
 
-    @VisibleForTesting
-    RebootConfirmationDialogFragment(
-            int messageId, int cancelButtonId, RebootConfirmationDialogHost host) {
-        mMessageId = messageId;
-        mCancelButtonId = cancelButtonId;
-        mHost = host;
-    }
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.REBOOT_CONFIRMATION_DIALOG;
     }
 
     @Override
-    public Dialog onCreateDialog(Bundle savedInstances) {
-        return new AlertDialog.Builder(getActivity())
-                .setMessage(mMessageId)
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mViewModel = new ViewModelProvider(requireActivity()).get(
+                RebootConfirmationDialogViewModel.class);
+    }
+
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstances) {
+        int messageId = mViewModel.getMessageId();
+        int cancelButtonId = mViewModel.getCancelButtonId();
+        return new AlertDialog.Builder(requireActivity())
+                .setMessage(messageId)
                 .setPositiveButton(R.string.reboot_dialog_reboot_now, this)
-                .setNegativeButton(mCancelButtonId, this)
+                .setNegativeButton(cancelButtonId, this)
                 .create();
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
+        RebootConfirmationDialogHost host = mViewModel.getHost();
+        if (host == null) return;
         if (which == DialogInterface.BUTTON_POSITIVE) {
-            mHost.onRebootConfirmed(getContext());
+            host.onRebootConfirmed(requireContext());
         } else {
-            mHost.onRebootCancelled();
+            host.onRebootCancelled();
         }
     }
 
     @Override
-    public void onDismiss(DialogInterface dialog) {
+    public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        mHost.onRebootDialogDismissed();
-    }
-
-    @Override
-    public void onPause() {
-        dismiss();
-
-        super.onPause();
+        RebootConfirmationDialogHost host = mViewModel.getHost();
+        if (host != null) {
+            host.onRebootDialogDismissed();
+        }
     }
 }

src/com/android/settings/development/RebootConfirmationDialogViewModel.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2025 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 androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModel;
+
+/**
+ * {@link ViewModel} for the reboot confirmation dialog.
+ *
+ * This class holds the data necessary to display a confirmation dialog for reboots.
+ */
+public class RebootConfirmationDialogViewModel extends ViewModel {
+    @Nullable
+    private RebootConfirmationDialogHost mHost = null;
+    private int mMessageId;
+    private int mCancelButtonId;
+
+    @Nullable
+    public RebootConfirmationDialogHost getHost() {
+        return mHost;
+    }
+
+    public void setHost(RebootConfirmationDialogHost mHost) {
+        this.mHost = mHost;
+    }
+
+    public int getMessageId() {
+        return mMessageId;
+    }
+
+    public void setMessageId(int mMessageId) {
+        this.mMessageId = mMessageId;
+    }
+
+    public int getCancelButtonId() {
+        return mCancelButtonId;
+    }
+
+    public void setCancelButtonId(int mCancelButtonId) {
+        this.mCancelButtonId = mCancelButtonId;
+    }
+}