PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all AlertDialogs to AndroidX version

Browse Source 
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
This commit is contained in:
tmfang
2018-07-17 13:53:04 +08:00
parent 6cf7a6e564
commit 41ab6b4bf8
114 changed files with 141 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/vpn2/AppDialog.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageInfo;
@@ -24,6 +23,8 @@ import android.os.Bundle;
import com.android.settings.R;
import androidx.appcompat.app.AlertDialog;
/**
* UI for managing the connection controlled by an app.
*

2
src/com/android/settings/vpn2/AppDialogFragment.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -34,6 +33,7 @@ import com.android.internal.net.VpnConfig;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
/**

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.vpn2;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
import android.annotation.NonNull;
import android.app.AlertDialog;
import android.app.AppOpsManager;
import android.app.Dialog;
import android.content.Context;
@@ -49,6 +48,7 @@ import com.android.settingslib.RestrictedSwitchPreference;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.preference.Preference;

3
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -39,6 +38,8 @@ import com.android.settings.R;
import java.net.InetAddress;
import androidx.appcompat.app.AlertDialog;
/**
* Dialog showing information about a VPN configuration. The dialog
* can be launched to either edit or prompt for credentials to connect

3
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -38,6 +37,8 @@ import com.android.internal.net.VpnProfile;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.appcompat.app.AlertDialog;
/**
* Fragment wrapper around a {@link ConfigDialog}.
*/

2
src/com/android/settings/vpn2/ConfirmLockdownFragment.java
View File

@@ -15,7 +15,6 @@
*/
package com.android.settings.vpn2;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,6 +23,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
public class ConfirmLockdownFragment extends InstrumentedDialogFragment