Merge "Avoid reference ObservablePreferenceFragment" into main
diff --git a/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java b/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
index a41a0b2..560f313 100644
--- a/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
@@ -20,6 +20,7 @@
import android.content.Context;
+import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
@@ -28,7 +29,6 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
/**
* Preference controller for the pin_auto_confirm setting.
@@ -40,11 +40,10 @@
private final int mUserId;
private final LockPatternUtils mLockPatternUtils;
- private final ObservablePreferenceFragment mParentFragment;
+ private final Fragment mParentFragment;
public AutoPinConfirmPreferenceController(Context context, int userId,
- LockPatternUtils lockPatternUtils,
- ObservablePreferenceFragment parentFragment) {
+ LockPatternUtils lockPatternUtils, Fragment parentFragment) {
super(context);
mUserId = userId;
mLockPatternUtils = lockPatternUtils;
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java
index 86c1244..0e0ed69 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java
@@ -22,11 +22,11 @@
import android.content.Context;
+import androidx.fragment.app.Fragment;
import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +41,7 @@
@Mock
private LockPatternUtils mLockPatternUtils;
@Mock
- private ObservablePreferenceFragment mParentFragment;
+ private Fragment mParentFragment;
private AutoPinConfirmPreferenceController mController;
private SwitchPreference mPreference;