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

2
src/com/android/settings/users/AutoSyncDataPreferenceController.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.users;
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ContentResolver;
import android.content.Context;
@@ -33,6 +32,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;

2
src/com/android/settings/users/EditUserInfoController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.users;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -41,6 +40,7 @@ import com.android.settingslib.drawable.CircleFramedDrawable;
import java.io.File;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
/**

2
src/com/android/settings/users/OwnerInfoSettings.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.users;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@@ -33,6 +32,7 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener {

3
src/com/android/settings/users/UserDialogs.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.users;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -34,6 +33,8 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.Utils;
import androidx.appcompat.app.AlertDialog;
/**
* Helper class for displaying dialogs related to user settings.
*/

2
src/com/android/settings/users/UserSettings.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.users;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
@@ -79,6 +78,7 @@ import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.WorkerThread;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;