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

Merge "Remove Biometric Option from Private Space Lock Setup in Settings" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-07-19 23:32:15 +00:00
committed by Android (Google) Code Review
parent 2004df98f1 83b49e06c2
commit 0271c39748
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.privatespace.onelock; package com.android.settings.privatespace.onelock;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE;
import static com.android.settings.privatespace.PrivateSpaceSetupActivity.EXTRA_ACTION_TYPE; import static com.android.settings.privatespace.PrivateSpaceSetupActivity.EXTRA_ACTION_TYPE;
import static com.android.settings.privatespace.PrivateSpaceSetupActivity.SET_LOCK_ACTION; import static com.android.settings.privatespace.PrivateSpaceSetupActivity.SET_LOCK_ACTION;
import static com.android.settings.privatespace.onelock.UseOneLockSettingsFragment.UNIFY_PRIVATE_LOCK_WITH_DEVICE_REQUEST; import static com.android.settings.privatespace.onelock.UseOneLockSettingsFragment.UNIFY_PRIVATE_LOCK_WITH_DEVICE_REQUEST;
@@ -197,12 +199,7 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
.setPositiveButton( .setPositiveButton(
R.string.private_space_set_lock_label, R.string.private_space_set_lock_label,
(dialog, which) -> { (dialog, which) -> {
Intent intent = new Intent(mContext, startSeparateLockSetup();
PrivateProfileContextHelperActivity.class);
intent.putExtra(EXTRA_ACTION_TYPE, SET_LOCK_ACTION);
((Activity) mContext).startActivityForResultAsUser(intent,
UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST,
/*Options*/ null, mUserHandle);
}) })
.setNegativeButton(R.string.private_space_cancel_label, .setNegativeButton(R.string.private_space_cancel_label,
(DialogInterface dialog, int which) -> { (DialogInterface dialog, int which) -> {
@@ -216,4 +213,26 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
}) })
.show(); .show();
} }
private void startSeparateLockSetup() {
if (android.multiuser.Flags.modifyPrivateSpaceSecondaryUnlockSetupFlow()) {
final Bundle extras = new Bundle();
extras.putInt(Intent.EXTRA_USER_ID, mProfileUserId);
extras.putBoolean(HIDE_INSECURE_OPTIONS, true);
extras.putInt(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE,
R.string.private_space_lock_setup_title);
new SubSettingLauncher(mContext).setDestination(ChooseLockGeneric
.ChooseLockGenericFragment.class.getName())
.setSourceMetricsCategory(mHost.getMetricsCategory())
.setArguments(extras)
.setExtras(extras)
.setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE)
.launch();
} else {
Intent intent = new Intent(mContext, PrivateProfileContextHelperActivity.class);
intent.putExtra(EXTRA_ACTION_TYPE, SET_LOCK_ACTION);
((Activity) mContext).startActivityForResultAsUser(intent,
UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST, /*Options*/ null, mUserHandle);
}
}
} }