Don't lose dialogs during configuration change
Bug: 62442606
Test: Rotate device when a dialog is showing
Change-Id: Iba63343d4e52e8e3ed2489f2f9482e698baf6111
diff --git a/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java b/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java
new file mode 100644
index 0000000..72ab8c3
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 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.settingslib.core;
+
+import android.support.annotation.Nullable;
+import android.support.v7.preference.Preference;
+
+/**
+ * Interface for {@link AbstractPreferenceController} objects which manage confirmation dialogs
+ */
+public interface ConfirmationDialogController {
+ /**
+ * Returns the key for this preference.
+ */
+ String getPreferenceKey();
+
+ /**
+ * Shows the dialog
+ * @param preference Preference object relevant to the dialog being shown
+ */
+ void showConfirmationDialog(@Nullable Preference preference);
+
+ /**
+ * Dismiss the dialog managed by this object
+ */
+ void dismissConfirmationDialog();
+
+ /**
+ * @return {@code true} if the dialog is showing
+ */
+ boolean isConfirmationDialogShowing();
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
index 75b6696..47cbb77 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
@@ -29,8 +29,10 @@
import android.text.TextUtils;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.ConfirmationDialogController;
-public abstract class AbstractEnableAdbPreferenceController extends AbstractPreferenceController {
+public abstract class AbstractEnableAdbPreferenceController extends AbstractPreferenceController
+ implements ConfirmationDialogController {
private static final String KEY_ENABLE_ADB = "enable_adb";
public static final String ACTION_ENABLE_ADB_STATE_CHANGED =
"com.android.settingslib.development.AbstractEnableAdbController."
@@ -91,7 +93,7 @@
public boolean handlePreferenceTreeClick(Preference preference) {
if (TextUtils.equals(KEY_ENABLE_ADB, preference.getKey())) {
if (!isAdbEnabled()) {
- showConfirmationDialog((SwitchPreference) preference);
+ showConfirmationDialog(preference);
} else {
writeAdbSetting(false);
}
@@ -107,10 +109,8 @@
notifyStateChanged();
}
- protected void notifyStateChanged() {
+ private void notifyStateChanged() {
LocalBroadcastManager.getInstance(mContext)
.sendBroadcast(new Intent(ACTION_ENABLE_ADB_STATE_CHANGED));
}
-
- public abstract void showConfirmationDialog(SwitchPreference preference);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
index d813655..502fb17 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
@@ -31,13 +31,15 @@
import com.android.settingslib.R;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.ConfirmationDialogController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnDestroy;
public abstract class AbstractLogpersistPreferenceController extends AbstractPreferenceController
- implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy {
+ implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
+ ConfirmationDialogController {
private static final String SELECT_LOGPERSIST_KEY = "select_logpersist";
private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd";
@@ -254,6 +256,4 @@
}
updateLogpersistValues();
}
-
- public abstract void showConfirmationDialog(ListPreference preference);
}