Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off

Browse Source 
- Fix the logic to set the pin_auto_confirm setting before triggering the password save workflow in ChooseLockPassword

Bug: 275385372
Test: atest AutoPinConfirmPreferenceControllerTest
Test: Manual Test
Change-Id: Id6774bc9afcd6d3161e023dc52911ae3e1f556c9
This commit is contained in:
Avinash Vadlamudi
2023-03-27 18:46:08 +00:00
parent cdfd4ee9b3
commit a4cf551d25
5 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,14 +16,19 @@
package com.android.settings.security.screenlock;
import static com.android.internal.widget.LockPatternUtils.MIN_AUTO_PIN_REQUIREMENT_LENGTH;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
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.
@@ -32,21 +37,23 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
private static final String PREF_KEY_PIN_AUTO_CONFIRM = "auto_pin_confirm";
private static final long MIN_AUTO_PIN_REQUIREMENT_LENGTH = 6L;
private final int mUserId;
private final LockPatternUtils mLockPatternUtils;
private final ObservablePreferenceFragment mParentFragment;
public AutoPinConfirmPreferenceController(Context context, int userId,
LockPatternUtils lockPatternUtils) {
LockPatternUtils lockPatternUtils,
ObservablePreferenceFragment parentFragment) {
super(context);
mUserId = userId;
mLockPatternUtils = lockPatternUtils;
mParentFragment = parentFragment;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
setPinAutoConfirmSettingState((boolean) newValue);
launchPinConfirmActivity((boolean) newValue);
return true;
}
@@ -82,4 +89,18 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro
private void setPinAutoConfirmSettingState(boolean state) {
mLockPatternUtils.setAutoPinConfirm(state, mUserId);
}
private void launchPinConfirmActivity(boolean newState) {
new ChooseLockSettingsHelper.Builder(mParentFragment.getActivity(), mParentFragment)
.setUserId(mUserId)
.setRequestCode(newState
? ScreenLockSettings.AUTO_PIN_SETTING_ENABLING_REQUEST_CODE
: ScreenLockSettings.AUTO_PIN_SETTING_DISABLING_REQUEST_CODE)
.setTitle(mContext.getString(R.string.lock_screen_auto_pin_confirm_title))
.setDescription(newState
? mContext.getString(R.string.auto_confirm_on_pin_verify_description)
: mContext.getString(R.string.auto_confirm_off_pin_verify_description))
.setReturnCredentials(true)
.show();
}
}