Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d88ab267 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "Avoid reference ObservablePreferenceFragment" into main

parents 04ef86d1 93b437fc
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.internal.widget.LockPatternUtils.MIN_AUTO_PIN_REQUIREM

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.R;
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 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro

    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;
+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ import static org.mockito.Mockito.when;

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 @@ public class AutoPinConfirmPreferenceControllerTest {
    @Mock
    private LockPatternUtils mLockPatternUtils;
    @Mock
    private ObservablePreferenceFragment mParentFragment;
    private Fragment mParentFragment;
    private AutoPinConfirmPreferenceController mController;
    private SwitchPreference mPreference;