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

Avoid reference ObservablePreferenceFragment

Browse Source 
Bug: 365922551
Bug: 275385372
Flag: EXEMPT Code cleanup
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: I55cec2ca5535eac3f0fae16af6eae320b39f1fbe
This commit is contained in:
Jacky Wang
2024-09-11 17:12:28 +08:00
parent d90a5dcf0f
commit 93b437fcf2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
View File

@@ -20,6 +20,7 @@ import static com.android.internal.widget.LockPatternUtils.MIN_AUTO_PIN_REQUIREM
import android.content.Context; import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.TwoStatePreference; import androidx.preference.TwoStatePreference;
@@ -28,7 +29,6 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
/** /**
* Preference controller for the pin_auto_confirm setting. * Preference controller for the pin_auto_confirm setting.
@@ -40,11 +40,10 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro
private final int mUserId; private final int mUserId;
private final LockPatternUtils mLockPatternUtils; private final LockPatternUtils mLockPatternUtils;
private final ObservablePreferenceFragment mParentFragment; private final Fragment mParentFragment;
public AutoPinConfirmPreferenceController(Context context, int userId, public AutoPinConfirmPreferenceController(Context context, int userId,
LockPatternUtils lockPatternUtils, LockPatternUtils lockPatternUtils, Fragment parentFragment) {
ObservablePreferenceFragment parentFragment) {
super(context); super(context);
mUserId = userId; mUserId = userId;
mLockPatternUtils = lockPatternUtils; mLockPatternUtils = lockPatternUtils;

4
tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java
View File

@@ -22,11 +22,11 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -41,7 +41,7 @@ public class AutoPinConfirmPreferenceControllerTest {
@Mock @Mock
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
@Mock @Mock
private ObservablePreferenceFragment mParentFragment; private Fragment mParentFragment;
private AutoPinConfirmPreferenceController mController; private AutoPinConfirmPreferenceController mController;
private SwitchPreference mPreference; private SwitchPreference mPreference;