Merge "Clean up theme part 1: move attrs to attrs.xml"
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 1ecc8d7..53be36a 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -150,7 +150,8 @@
}
}
- ImsManager.factoryReset(context);
+ ImsManager.getInstance(context,
+ SubscriptionManager.getPhoneId(mSubId)).factoryReset();
restoreDefaultApn(context);
esimFactoryReset(context, context.getPackageName());
// There has been issues when Sms raw table somehow stores orphan
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 3a04ade..ad90e72 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -22,7 +22,6 @@
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6;
-import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Context;
@@ -52,6 +51,7 @@
import java.util.Map;
import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
/**
* Dialog to set the Private DNS
@@ -72,7 +72,7 @@
PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
}
- private static final int[] ADDRESS_FAMILIES = new int[]{AF_INET, AF_INET6};
+ private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET, AF_INET6};
@VisibleForTesting
static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java
index aec362f..76d8bcc 100644
--- a/src/com/android/settings/widget/ValidatedEditTextPreference.java
+++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java
@@ -16,7 +16,6 @@
package com.android.settings.widget;
-import android.app.AlertDialog;
import android.content.Context;
import android.text.Editable;
import android.text.InputType;
@@ -30,6 +29,7 @@
import com.android.settingslib.CustomEditTextPreferenceCompat;
import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceViewHolder;
/**
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index 3e1cde1..cb26fb6 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -25,7 +25,6 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
@@ -49,6 +48,8 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
+import androidx.appcompat.app.AlertDialog;
+
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowOs.class)
public class PrivateDnsModeDialogPreferenceTest {
@@ -132,9 +133,9 @@
@Test
public void testOnCheckedChanged_switchMode_saveButtonHasCorrectState() {
final String[] INVALID_HOST_NAMES = new String[] {
- INVALID_HOST_NAME,
- "2001:db8::53", // IPv6 string literal
- "192.168.1.1", // IPv4 string literal
+ INVALID_HOST_NAME,
+ "2001:db8::53", // IPv6 string literal
+ "192.168.1.1", // IPv4 string literal
};
for (String invalid : INVALID_HOST_NAMES) {