commit e39120e45c2476f3ea018e71ba7c4b947d6b999b
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Thu Mar 03 23:37:07 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Thu Mar 03 23:37:07 2022 +0000
tree 45bfff8a4d2d08c3b157e3208c49a6975c6c4a0e
parent 702e26be6109d3144e7976527e034713c229f7ec
parent cd517a654aa7d34bf0570092381b313930f0264b

[automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922

Bug: 216442969
Change-Id: I8b98a48ad8d34b965f0d3dadb06247fdb84572bf

src/com/android/settings/password/SetupSkipDialog.java

diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java
index a0fe961..2dac3d6 100644
--- a/src/com/android/settings/password/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.DialogInterface;
@@ -26,7 +27,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;