Merge "Update archive's button `enable` property whenever hibernation toggle has changed its value" into main
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a3acd49..321c437 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -719,6 +719,13 @@
android:value="@string/menu_key_security"/>
</activity>
+ <activity android:name=".Settings$PrivateSpaceBiometricSettingsActivity"
+ android:label="@string/private_space_biometric_title"
+ android:exported="false">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings" />
+ </activity>
+
<activity android:name=".bluetooth.DevicePickerActivity"
android:label="@string/device_picker"
android:configChanges="orientation|keyboardHidden|screenSize"
diff --git a/res/drawable/keyboard_review_layout_background.xml b/res/drawable/keyboard_review_layout_background.xml
new file mode 100644
index 0000000..7f93f80
--- /dev/null
+++ b/res/drawable/keyboard_review_layout_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/settingslib_colorSurface"/>
+ <corners android:radius="@dimen/keyboard_picker_radius"/>
+</shape>
diff --git a/res/layout/keyboard_layout_picker.xml b/res/layout/keyboard_layout_picker.xml
index b25c228..5e62a2c 100644
--- a/res/layout/keyboard_layout_picker.xml
+++ b/res/layout/keyboard_layout_picker.xml
@@ -17,15 +17,33 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/keyboard_picker_margin"
android:id="@+id/keyboard_layout_picker_container"
android:orientation="vertical">
- <ImageView
- android:id="@+id/keyboard_layout_preview"
+ <FrameLayout
+ android:id="@+id/keyboard_layout_preview_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:adjustViewBounds="true"
- android:scaleType="fitCenter"/>
+ android:background="@drawable/keyboard_review_layout_background">
+ <ImageView
+ android:id="@+id/keyboard_layout_preview"
+ android:layout_marginTop="@dimen/keyboard_picker_margin_small"
+ android:layout_marginBottom="@dimen/keyboard_picker_margin_large"
+ android:layout_marginHorizontal="@dimen/keyboard_picker_margin_small"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:adjustViewBounds="true"
+ android:scaleType="fitCenter" />
+ <TextView
+ android:id="@+id/keyboard_layout_preview_name"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/keyboard_picker_margin_large"
+ android:textSize="@dimen/keyboard_picker_text_size"
+ android:textColor="?android:attr/textColorPrimary"
+ android:layout_gravity="bottom"
+ android:gravity="center" />
+ </FrameLayout>
<FrameLayout
android:id="@+id/keyboard_layout_title"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 647ba6c..6421e3e 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -27,4 +27,7 @@
<dimen name="text_reading_preview_layout_padding_horizontal_min_suw">24dp</dimen>
<dimen name="text_reading_preview_background_padding_horizontal_min_suw">24dp</dimen>
+
+ <!-- Keyboard -->
+ <dimen name="keyboard_picker_margin">106dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6c03955..3e0b8d9 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -165,6 +165,13 @@
<item name="face_preview_scale" format="float" type="dimen">1.0</item>
<dimen name="face_enroll_intro_illustration_margin_bottom">0dp</dimen>
+ <!-- Keyboard -->
+ <dimen name="keyboard_picker_margin_large">68dp</dimen>
+ <dimen name="keyboard_picker_margin">24dp</dimen>
+ <dimen name="keyboard_picker_margin_small">16dp</dimen>
+ <dimen name="keyboard_picker_radius">28dp</dimen>
+ <dimen name="keyboard_picker_text_size">16sp</dimen>
+
<!-- RemoteAuth-->
<dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>
<dimen name="remoteauth_fragment_subtitle_text_size">14sp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aaa0465..2be3f3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1207,7 +1207,7 @@
<!-- Title for the Private Space page. [CHAR LIMIT=60] -->
<string name="private_space_title">Private Space</string>
<!-- Summary for the Private Space page. [CHAR LIMIT=NONE] -->
- <string name="private_space_summary">Hide apps in a private folder</string>
+ <string name="private_space_summary">Keep private apps locked and hidden</string>
<!-- Description for the Private Space page. [CHAR LIMIT=NONE] -->
<string name="private_space_description">Hide apps in a private folder that only you can access</string>
<!-- Title for the Private Space one lock preference. [CHAR LIMIT=60] -->
@@ -1220,6 +1220,12 @@
<string name="private_space_biometric_title">Face & Fingerprint Unlock</string>
<!-- Summary for the Face and Fingerprint preference when no biometric is set. [CHAR LIMIT=60] -->
<string name="private_space_biometric_summary">Tap to set up</string>
+ <!-- Title for the Fingerprint unlock for private space preference. [CHAR LIMIT=60] -->
+ <string name="private_space_fingerprint_unlock_title">Fingerprint Unlock for Private Space</string>
+ <!-- Title for the Face unlock for private space preference. [CHAR LIMIT=60] -->
+ <string name="private_space_face_unlock_title">Face Unlock for Private Space</string>
+ <!-- Biometric category title - biometric options for unlocking the device. [CHAR LIMIT=50] -->
+ <string name="private_space_category_ways_to_unlock">Ways to unlock</string>
<!-- Summary for one lock when device screen lock is used as private profile lock. [CHAR LIMIT=60] -->
<string name="private_space_screen_lock_summary">Same as device screen lock</string>
<!-- Dialog message to choose a new lock for Private Space. [CHAR LIMIT=50] -->
@@ -1281,7 +1287,7 @@
<!-- Title for private space setup in auto advancing screen informing private space notifications are hidden when locked. [CHAR LIMIT=NONE] -->
<string name="private_space_notifications_hidden_title">Notifications from apps in private space are hidden when it\u2019s locked</string>
<!-- Title for private space setup in auto advancing screen informing photos/files from private space can be shared when unlocked. [CHAR LIMIT=NONE] -->
- <string name="private_space_share_photos_title">Unlock your space to share photos or files from private space apps</string>
+ <string name="private_space_share_photos_title">Unlock private space to share photos or files from private space apps</string>
<!-- Title for private space setup in auto advancing screen informing some system apps are already installed in private space. [CHAR LIMIT=NONE] -->
<string name="private_space_apps_installed_title">Some apps are already installed in your private space</string>
<!-- Title for private space creation error screen. [CHAR LIMIT=60] -->
@@ -1312,6 +1318,12 @@
<string name="private_space_lock_setup_title">Choose a lock for your private space</string>
<!-- private space lock setup screen description [CHAR LIMIT=NONE] -->
<string name="private_space_lock_setup_description">You can unlock your private space using your fingerprint. For security, this option requires a backup lock.</string>
+ <!-- Header for private space choose your PIN screen [CHAR LIMIT=40] -->
+ <string name="private_space_choose_your_pin_header">Set a PIN for your private space</string>
+ <!-- Header for private space choose your password screen [CHAR LIMIT=40] -->
+ <string name="private_space_choose_your_password_header">Set a password for your private space</string>
+ <!-- Header for private space choose your pattern screen [CHAR LIMIT=40] -->
+ <string name="private_space_choose_your_pattern_header">Set a pattern for your private space</string>
<!-- TODO(b/309950257): Remove below strings once QSTIle fulfillment is complete. -->
<!-- Header in hide Private Space settings page to unhide Private Space. [CHAR LIMIT=90] -->
diff --git a/res/xml/private_space_biometric_settings.xml b/res/xml/private_space_biometric_settings.xml
new file mode 100644
index 0000000..6135b5f
--- /dev/null
+++ b/res/xml/private_space_biometric_settings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/private_space_biometric_title"
+ settings:searchable="false">
+
+ <com.android.settingslib.widget.TopIntroPreference
+ android:title="@string/biometric_settings_intro"
+ settings:searchable="false" />
+
+ <PreferenceCategory
+ android:key="biometric_ways_to_unlock"
+ android:title="@string/private_space_category_ways_to_unlock"
+ settings:searchable="false">
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="private_space_fingerprint_unlock_settings"
+ android:title="@string/private_space_fingerprint_unlock_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.privatespace.onelock.PrivateSpaceFingerprintPreferenceController"
+ settings:searchable="false" />
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="private_space_face_unlock_settings"
+ android:title="@string/private_space_face_unlock_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.privatespace.onelock.PrivateSpaceFacePreferenceController"
+ settings:searchable="false" />
+
+ </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/privatespace_one_lock.xml b/res/xml/privatespace_one_lock.xml
index e078c17..c9e0e62 100644
--- a/res/xml/privatespace_one_lock.xml
+++ b/res/xml/privatespace_one_lock.xml
@@ -34,11 +34,11 @@
android:summary="@string/unlock_set_unlock_mode_pattern"
settings:searchable="false" />
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="private_space_biometrics"
android:title="@string/private_space_biometric_title"
- android:summary="@string/private_space_biometric_summary"
- android:fragment="com.android.settings.privatespace.onelock.FaceFingerprintUnlockFragment"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings"
settings:searchable="false" />
</PreferenceScreen>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 86baba4..01ccbb2 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -57,7 +57,9 @@
public static class CombinedBiometricProfileSettingsActivity extends SettingsActivity { /* empty */ }
public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiTetherSettingsActivity extends SettingsActivity { /* empty */ }
-
+ public static class PrivateSpaceBiometricSettingsActivity extends SettingsActivity {
+ /* empty */
+ }
public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for Data saver settings. */
public static class DataSaverSummaryActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
index 8cc6bc4..2cd239e 100644
--- a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
+++ b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
@@ -159,4 +159,12 @@
public String getProfileSettingsClassName() {
return Settings.CombinedBiometricProfileSettingsActivity.class.getName();
}
+
+ /**
+ * Returns the class name of the Settings page corresponding to combined biometric settings for
+ * Private profile.
+ */
+ public String getPrivateProfileSettingsClassName() {
+ return Settings.PrivateSpaceBiometricSettingsActivity.class.getName();
+ }
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index d68f2c8..69a9fb3 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -165,6 +165,7 @@
import com.android.settings.print.PrintSettingsFragment;
import com.android.settings.privacy.PrivacyControlsFragment;
import com.android.settings.privacy.PrivacyDashboardFragment;
+import com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings;
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
import com.android.settings.security.LockscreenDashboardFragment;
@@ -264,6 +265,7 @@
FingerprintSettingsV2Fragment.class.getName(),
CombinedBiometricSettings.class.getName(),
CombinedBiometricProfileSettings.class.getName(),
+ PrivateSpaceBiometricSettings.class.getName(),
SwipeToNotificationSettings.class.getName(),
DoubleTapPowerSettings.class.getName(),
DoubleTapScreenSettings.class.getName(),
diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
index f583971..85ba5fb 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
@@ -26,10 +26,14 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
import androidx.fragment.app.Fragment;
+import com.android.hardware.input.Flags;
import com.android.settings.R;
//TODO: b/316243168 - [Physical Keyboard Setting] Refactor NewKeyboardLayoutPickerFragment
@@ -38,19 +42,25 @@
private static final int DEFAULT_KEYBOARD_PREVIEW_HEIGHT = 540;
private ImageView mKeyboardLayoutPreview;
+ private TextView mKeyboardLayoutPreviewText;
private InputManager mInputManager;
private final NewKeyboardLayoutPickerController.KeyboardLayoutSelectedCallback
mKeyboardLayoutSelectedCallback =
new NewKeyboardLayoutPickerController.KeyboardLayoutSelectedCallback() {
@Override
public void onSelected(KeyboardLayout keyboardLayout) {
- if (mInputManager != null && mKeyboardLayoutPreview != null) {
+ if (mInputManager != null
+ && mKeyboardLayoutPreview != null
+ && mKeyboardLayoutPreviewText != null && keyboardLayout != null) {
Drawable previewDrawable = mInputManager.getKeyboardLayoutPreview(
keyboardLayout,
DEFAULT_KEYBOARD_PREVIEW_WIDTH, DEFAULT_KEYBOARD_PREVIEW_HEIGHT);
mKeyboardLayoutPreview.setVisibility(
previewDrawable == null ? GONE : VISIBLE);
+ mKeyboardLayoutPreviewText.setVisibility(
+ previewDrawable == null ? GONE : VISIBLE);
if (previewDrawable != null) {
+ mKeyboardLayoutPreviewText.setText(keyboardLayout.getLabel());
mKeyboardLayoutPreview.setImageDrawable(previewDrawable);
}
}
@@ -73,6 +83,10 @@
ViewGroup fragmentView = (ViewGroup) inflater.inflate(
R.layout.keyboard_layout_picker, container, false);
mKeyboardLayoutPreview = fragmentView.findViewById(R.id.keyboard_layout_preview);
+ mKeyboardLayoutPreviewText = fragmentView.findViewById(R.id.keyboard_layout_preview_name);
+ if (!Flags.keyboardLayoutPreviewFlag()) {
+ updateViewMarginForPreviewFlagOff(fragmentView);
+ }
getActivity().getSupportFragmentManager()
.beginTransaction()
.replace(R.id.keyboard_layout_title, new NewKeyboardLayoutPickerTitle())
@@ -87,4 +101,13 @@
.commit();
return fragmentView;
}
+
+ private void updateViewMarginForPreviewFlagOff(ViewGroup fragmentView) {
+ LinearLayout previewContainer = fragmentView.findViewById(
+ R.id.keyboard_layout_picker_container);
+ FrameLayout.LayoutParams previewContainerLayoutParams =
+ (FrameLayout.LayoutParams) previewContainer.getLayoutParams();
+ previewContainerLayoutParams.setMargins(0, 0, 0, 0);
+ previewContainer.setLayoutParams(previewContainerLayoutParams);
+ }
}
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index d36fb89..631c735 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -260,7 +260,6 @@
private LockscreenCredential mFirstPassword;
private RecyclerView mPasswordRestrictionView;
protected boolean mIsAlphaMode;
- protected boolean mIsManagedProfile;
protected FooterButton mSkipOrClearButton;
private FooterButton mNextButton;
private TextView mMessage;
@@ -272,6 +271,14 @@
private static final int CONFIRM_EXISTING_REQUEST = 58;
static final int RESULT_FINISHED = RESULT_FIRST_USER;
+ /** Used to store the profile type for which pin/password is being set */
+ protected enum ProfileType {
+ None,
+ Managed,
+ Private,
+ Other
+ };
+ protected ProfileType mProfileType;
/**
* Keep track internally of where the user is in choosing a pattern.
@@ -285,12 +292,14 @@
R.string.lockpassword_choose_your_password_header_for_fingerprint,
R.string.lockpassword_choose_your_password_header_for_face,
R.string.lockpassword_choose_your_password_header_for_biometrics,
+ R.string.private_space_choose_your_password_header, // private space password
R.string.lockpassword_choose_your_pin_header, // pin
SET_WORK_PROFILE_PIN_HEADER,
R.string.lockpassword_choose_your_profile_pin_header,
R.string.lockpassword_choose_your_pin_header_for_fingerprint,
R.string.lockpassword_choose_your_pin_header_for_face,
R.string.lockpassword_choose_your_pin_header_for_biometrics,
+ R.string.private_space_choose_your_pin_header, // private space pin
R.string.lock_settings_picker_biometrics_added_security_message,
R.string.lock_settings_picker_biometrics_added_security_message,
R.string.next_label),
@@ -302,12 +311,14 @@
R.string.lockpassword_confirm_your_password_header,
R.string.lockpassword_confirm_your_password_header,
R.string.lockpassword_confirm_your_password_header,
+ R.string.lockpassword_confirm_your_password_header,
R.string.lockpassword_confirm_your_pin_header,
REENTER_WORK_PROFILE_PIN_HEADER,
R.string.lockpassword_reenter_your_profile_pin_header,
R.string.lockpassword_confirm_your_pin_header,
R.string.lockpassword_confirm_your_pin_header,
R.string.lockpassword_confirm_your_pin_header,
+ R.string.lockpassword_confirm_your_pin_header,
0,
0,
R.string.lockpassword_confirm_label),
@@ -319,12 +330,14 @@
R.string.lockpassword_confirm_passwords_dont_match,
R.string.lockpassword_confirm_passwords_dont_match,
R.string.lockpassword_confirm_passwords_dont_match,
+ R.string.lockpassword_confirm_passwords_dont_match,
R.string.lockpassword_confirm_pins_dont_match,
UNDEFINED,
R.string.lockpassword_confirm_pins_dont_match,
R.string.lockpassword_confirm_pins_dont_match,
R.string.lockpassword_confirm_pins_dont_match,
R.string.lockpassword_confirm_pins_dont_match,
+ R.string.lockpassword_confirm_pins_dont_match,
0,
0,
R.string.lockpassword_confirm_label);
@@ -335,29 +348,33 @@
int hintInAlphaForFingerprint,
int hintInAlphaForFace,
int hintInAlphaForBiometrics,
+ int hintInAlphaForPrivateProfile,
int hintInNumeric,
String hintOverrideInNumericForProfile,
int hintInNumericForProfile,
int hintInNumericForFingerprint,
int hintInNumericForFace,
int hintInNumericForBiometrics,
+ int hintInNumericForPrivateProfile,
int messageInAlphaForBiometrics,
int messageInNumericForBiometrics,
int nextButtonText) {
this.alphaHint = hintInAlpha;
this.alphaHintOverrideForProfile = hintOverrideInAlphaForProfile;
- this.alphaHintForProfile = hintInAlphaForProfile;
+ this.alphaHintForManagedProfile = hintInAlphaForProfile;
this.alphaHintForFingerprint = hintInAlphaForFingerprint;
this.alphaHintForFace = hintInAlphaForFace;
this.alphaHintForBiometrics = hintInAlphaForBiometrics;
+ this.alphaHintForPrivateProfile = hintInAlphaForPrivateProfile;
this.numericHint = hintInNumeric;
this.numericHintOverrideForProfile = hintOverrideInNumericForProfile;
- this.numericHintForProfile = hintInNumericForProfile;
+ this.numericHintForManagedProfile = hintInNumericForProfile;
this.numericHintForFingerprint = hintInNumericForFingerprint;
this.numericHintForFace = hintInNumericForFace;
this.numericHintForBiometrics = hintInNumericForBiometrics;
+ this.numericHintForPrivateProfile = hintInNumericForPrivateProfile;
this.alphaMessageForBiometrics = messageInAlphaForBiometrics;
this.numericMessageForBiometrics = messageInNumericForBiometrics;
@@ -372,16 +389,18 @@
// Password header
public final int alphaHint;
+ public final int alphaHintForPrivateProfile;
public final String alphaHintOverrideForProfile;
- public final int alphaHintForProfile;
+ public final int alphaHintForManagedProfile;
public final int alphaHintForFingerprint;
public final int alphaHintForFace;
public final int alphaHintForBiometrics;
// PIN header
public final int numericHint;
+ public final int numericHintForPrivateProfile;
public final String numericHintOverrideForProfile;
- public final int numericHintForProfile;
+ public final int numericHintForManagedProfile;
public final int numericHintForFingerprint;
public final int numericHintForFace;
public final int numericHintForBiometrics;
@@ -394,34 +413,40 @@
public final int buttonText;
- public String getHint(Context context, boolean isAlpha, int type, boolean isProfile) {
+ public String getHint(Context context, boolean isAlpha, int type, ProfileType profile) {
if (isAlpha) {
- if (type == TYPE_FINGERPRINT) {
+ if (android.os.Flags.allowPrivateProfile()
+ && profile.equals(ProfileType.Private)) {
+ return context.getString(alphaHintForPrivateProfile);
+ } else if (type == TYPE_FINGERPRINT) {
return context.getString(alphaHintForFingerprint);
} else if (type == TYPE_FACE) {
return context.getString(alphaHintForFace);
} else if (type == TYPE_BIOMETRIC) {
return context.getString(alphaHintForBiometrics);
- } else if (isProfile) {
+ } else if (profile.equals(ProfileType.Managed)) {
return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(alphaHintOverrideForProfile,
- () -> context.getString(alphaHintForProfile));
+ () -> context.getString(alphaHintForManagedProfile));
} else {
return context.getString(alphaHint);
}
} else {
- if (type == TYPE_FINGERPRINT) {
+ if (android.os.Flags.allowPrivateProfile()
+ && profile.equals(ProfileType.Private)) {
+ return context.getString(numericHintForPrivateProfile);
+ } else if (type == TYPE_FINGERPRINT) {
return context.getString(numericHintForFingerprint);
} else if (type == TYPE_FACE) {
return context.getString(numericHintForFace);
} else if (type == TYPE_BIOMETRIC) {
return context.getString(numericHintForBiometrics);
- } else if (isProfile) {
+ } else if (profile.equals(ProfileType.Managed)) {
return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(numericHintOverrideForProfile,
- () -> context.getString(numericHintForProfile));
+ () -> context.getString(numericHintForManagedProfile));
} else {
- return context.getString(numericHint);
+ return context.getString(numericHint);
}
}
}
@@ -455,7 +480,7 @@
}
// Only take this argument into account if it belongs to the current profile.
mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
- mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mUserId);
+ mProfileType = getProfileType();
mForFingerprint = intent.getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
mForFace = intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
@@ -602,7 +627,7 @@
if (activity instanceof SettingsActivity) {
final SettingsActivity sa = (SettingsActivity) activity;
String title = Stage.Introduction.getHint(
- getContext(), mIsAlphaMode, getStageType(), mIsManagedProfile);
+ getContext(), mIsAlphaMode, getStageType(), mProfileType);
sa.setTitle(title);
mLayout.setHeaderText(title);
}
@@ -938,7 +963,7 @@
// Hide password requirement view when we are just asking user to confirm the pw.
mPasswordRestrictionView.setVisibility(View.GONE);
setHeaderText(mUiStage.getHint(getContext(), mIsAlphaMode, getStageType(),
- mIsManagedProfile));
+ mProfileType));
setNextEnabled(canInput && length >= LockPatternUtils.MIN_LOCK_PASSWORD_SIZE);
mSkipOrClearButton.setVisibility(toVisibility(canInput && length > 0));
@@ -1116,5 +1141,18 @@
}
}
}
+
+ private ProfileType getProfileType() {
+ UserManager userManager = getContext().createContextAsUser(UserHandle.of(mUserId),
+ /*flags=*/0).getSystemService(UserManager.class);
+ if (userManager.isManagedProfile()) {
+ return ProfileType.Managed;
+ } else if (android.os.Flags.allowPrivateProfile() && userManager.isPrivateProfile()) {
+ return ProfileType.Private;
+ } else if (userManager.isProfile()) {
+ return ProfileType.Other;
+ }
+ return ProfileType.None;
+ }
}
}
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 075dab1..b24a27e 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -478,6 +478,8 @@
.getString(SET_WORK_PROFILE_PATTERN_HEADER,
() -> getString(
R.string.lockpassword_choose_your_profile_pattern_header));
+ } else if (android.os.Flags.allowPrivateProfile() && isPrivateProfile()) {
+ msg = getString(R.string.private_space_choose_your_pattern_header);
} else {
msg = getString(R.string.lockpassword_choose_your_pattern_header);
}
@@ -879,5 +881,11 @@
getActivity().finish();
}
+
+ private boolean isPrivateProfile() {
+ UserManager userManager = getContext().createContextAsUser(UserHandle.of(mUserId),
+ /*flags=*/0).getSystemService(UserManager.class);
+ return userManager.isPrivateProfile();
+ }
}
}
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index 8c73364..09a1855 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -33,6 +33,14 @@
}
@Override
+ public void onStart() {
+ super.onStart();
+ if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
+ finish();
+ }
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS;
}
diff --git a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
index e130e4d..271a219 100644
--- a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
+++ b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
@@ -17,25 +17,43 @@
package com.android.settings.privatespace.onelock;
import android.content.Context;
-import android.text.TextUtils;
+import android.os.UserHandle;
+import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.biometrics.combination.CombinedBiometricStatusPreferenceController;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+import com.android.settingslib.core.lifecycle.Lifecycle;
/** Represents the preference controller to enroll biometrics for private space lock. */
-public class FaceFingerprintUnlockController extends AbstractPreferenceController {
+public class FaceFingerprintUnlockController extends CombinedBiometricStatusPreferenceController {
+ private static final String TAG = "PSBiometricCtrl";
private static final String KEY_SET_UNSET_FACE_FINGERPRINT = "private_space_biometrics";
+ private final int mProfileUserId;
- public FaceFingerprintUnlockController(Context context, SettingsPreferenceFragment host) {
- super(context);
+ public FaceFingerprintUnlockController(Context context, Lifecycle lifecycle) {
+ super(context, KEY_SET_UNSET_FACE_FINGERPRINT, lifecycle);
+ mProfileUserId = getUserId();
+ }
+
+ protected boolean isUserSupported() {
+ return android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+ && mProfileUserId != UserHandle.USER_NULL;
}
@Override
- public boolean isAvailable() {
- return android.os.Flags.allowPrivateProfile();
+ protected int getUserId() {
+ UserHandle privateProfileHandle =
+ PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle();
+ if (privateProfileHandle != null) {
+ return privateProfileHandle.getIdentifier();
+ } else {
+ Log.e(TAG, "Private profile user handle is not expected to be null.");
+ }
+ return UserHandle.USER_NULL;
}
@Override
@@ -44,14 +62,19 @@
}
@Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- return TextUtils.equals(preference.getKey(), getPreferenceKey());
+ protected String getSettingsClassName() {
+ return mCombinedBiometricStatusUtils.getPrivateProfileSettingsClassName();
}
@Override
public void updateState(Preference preference) {
- //TODO(b/308862923) : Add condition to check and enable when separate private lock is set.
- preference.setSummary(mContext.getString(R.string.lock_settings_profile_unified_summary));
- preference.setEnabled(false);
+ if (mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileUserId)) {
+ super.updateState(preference);
+ preference.setEnabled(true);
+ } else {
+ preference.setSummary(
+ mContext.getString(R.string.lock_settings_profile_unified_summary));
+ preference.setEnabled(false);
+ }
}
}
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
new file mode 100644
index 0000000..dc00885
--- /dev/null
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privatespace.onelock;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.biometrics.combination.BiometricsSettingsBase;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+public class PrivateSpaceBiometricSettings extends BiometricsSettingsBase {
+ private static final String TAG = "PSBiometricSettings";
+ private static final String KEY_FACE_SETTINGS = "private_space_face_unlock_settings";
+ private static final String KEY_FINGERPRINT_SETTINGS =
+ "private_space_fingerprint_unlock_settings";
+
+ @Override
+ public void onAttach(Context context) {
+ if (android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
+ super.onAttach(context);
+ UserHandle privateProfileHandle =
+ PrivateSpaceMaintainer.getInstance(context).getPrivateProfileHandle();
+ if (privateProfileHandle != null) {
+ mUserId = privateProfileHandle.getIdentifier();
+ } else {
+ mUserId = -1;
+ Log.e(TAG, "Private profile user handle is not expected to be null.");
+ }
+ }
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.private_space_biometric_settings;
+ }
+
+ @Override
+ public String getFacePreferenceKey() {
+ return KEY_FACE_SETTINGS;
+ }
+
+ @Override
+ public String getFingerprintPreferenceKey() {
+ return KEY_FINGERPRINT_SETTINGS;
+ }
+
+ @Override
+ public String getUnlockPhonePreferenceKey() {
+ return "";
+ }
+
+ @Override
+ public String getUseInAppsPreferenceKey() {
+ return "";
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.PRIVATE_SPACE_SETTINGS;
+ }
+}
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
new file mode 100644
index 0000000..cc22b87
--- /dev/null
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privatespace.onelock;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.util.Log;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+public class PrivateSpaceFacePreferenceController extends BiometricFaceStatusPreferenceController {
+ private static final String TAG = "PrivateSpaceFaceCtrl";
+
+ public PrivateSpaceFacePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ public PrivateSpaceFacePreferenceController(Context context, String key, Lifecycle lifecycle) {
+ super(context, key, lifecycle);
+ }
+
+ @Override
+ protected boolean isUserSupported() {
+ return android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+ && getUserId() != UserHandle.USER_NULL;
+ }
+
+ @Override
+ protected int getUserId() {
+ UserHandle privateProfileHandle =
+ PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle();
+ if (privateProfileHandle != null) {
+ return privateProfileHandle.getIdentifier();
+ } else {
+ Log.e(TAG, "Private profile user handle is not expected to be null.");
+ }
+ return UserHandle.USER_NULL;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
new file mode 100644
index 0000000..f2f0801
--- /dev/null
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privatespace.onelock;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.util.Log;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+public class PrivateSpaceFingerprintPreferenceController
+ extends BiometricFingerprintStatusPreferenceController {
+ private static final String TAG = "PrivateSpaceFingerCtrl";
+
+ public PrivateSpaceFingerprintPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ public PrivateSpaceFingerprintPreferenceController(
+ Context context, String key, Lifecycle lifecycle) {
+ super(context, key, lifecycle);
+ }
+
+ @Override
+ protected boolean isUserSupported() {
+ return android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+ && getUserId() != UserHandle.USER_NULL;
+ }
+
+ @Override
+ protected int getUserId() {
+ UserHandle privateProfileHandle =
+ PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle();
+ if (privateProfileHandle != null) {
+ return privateProfileHandle.getIdentifier();
+ } else {
+ Log.e(TAG, "Private profile user handle is not expected to be null.");
+ }
+ return UserHandle.USER_NULL;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return android.os.Flags.allowPrivateProfile()
+ && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
index 20298a1..efbe9f9 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
@@ -20,6 +20,7 @@
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PIN;
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 android.content.Context;
import android.content.Intent;
@@ -94,6 +95,7 @@
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())
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index 54b0374..fd7d02b 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -31,6 +31,7 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -122,15 +123,15 @@
}
/** Method to handle onActivityResult */
- public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
+ public boolean handleActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (requestCode == UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST
- && resultCode == Activity.RESULT_OK) {
+ && resultCode == Activity.RESULT_OK && data != null) {
mCurrentDevicePassword =
data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
separateLocks();
return true;
} else if (requestCode == UNIFY_PRIVATE_LOCK_WITH_DEVICE_REQUEST
- && resultCode == Activity.RESULT_OK) {
+ && resultCode == Activity.RESULT_OK && data != null) {
mCurrentProfilePassword =
data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
unifyLocks();
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
index 459116a..6af6c38 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
@@ -25,6 +25,7 @@
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -43,6 +44,14 @@
}
@Override
+ public void onStart() {
+ super.onStart();
+ if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
+ finish();
+ }
+ }
+
+ @Override
public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETTINGS;
}
@@ -62,14 +71,14 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new UseOneLockControllerSwitch(context, this));
controllers.add(new PrivateSpaceLockController(context, this));
- controllers.add(new FaceFingerprintUnlockController(context, this));
+ controllers.add(new FaceFingerprintUnlockController(context, getSettingsLifecycle()));
return controllers;
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (use(UseOneLockControllerSwitch.class)
- .handleActivityResult(requestCode, resultCode, data)) {
+ .handleActivityResult(requestCode, resultCode, data)) {
return;
}
super.onActivityResult(requestCode, resultCode, data);
diff --git a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
index 706aeda..a671a45 100644
--- a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
@@ -34,6 +34,7 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.UserHandle;
import android.os.UserManager;
+import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -44,6 +45,7 @@
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -71,6 +73,8 @@
private Context mApplicationContext;
private CombinedBiometricStatusUtils mCombinedBiometricStatusUtils;
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -301,6 +305,17 @@
.isEqualTo(Settings.CombinedBiometricProfileSettingsActivity.class.getName());
}
+ @Test
+ public void getPrivateProfileSettingsClassName_returnsPrivateSpaceBiometricSettings() {
+ when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
+ mSetFlagsRule.enableFlags(
+ android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ assertThat(mCombinedBiometricStatusUtils.getPrivateProfileSettingsClassName())
+ .isEqualTo(Settings.PrivateSpaceBiometricSettingsActivity.class.getName());
+ }
+
private List<Fingerprint> createFingerprintList(int size) {
final List<Fingerprint> fingerprintList = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
diff --git a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
new file mode 100644
index 0000000..f1da363
--- /dev/null
+++ b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privatespace;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.privatespace.onelock.FaceFingerprintUnlockController;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class FaceFingerprintUnlockControllerTest {
+ @Mock private Context mContext;
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ @Mock Lifecycle mLifecycle;
+ @Mock LockPatternUtils mLockPatternUtils;
+
+ private Preference mPreference;
+ private FaceFingerprintUnlockController mFaceFingerprintUnlockController;
+
+ /** Required setup before a test. */
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+ final String preferenceKey = "private_space_biometrics";
+
+ mPreference = new Preference(ApplicationProvider.getApplicationContext());
+ mPreference.setKey(preferenceKey);
+
+ final FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
+ when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
+ .thenReturn(mLockPatternUtils);
+
+ mFaceFingerprintUnlockController =
+ new FaceFingerprintUnlockController(mContext, mLifecycle);
+ }
+
+ /** Tests that the controller is always available. */
+ @Test
+ public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() {
+ mSetFlagsRule.enableFlags(
+ android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(true);
+ }
+
+ /** Tests that the controller is not available when Biometrics flag is not enabled. */
+ @Test
+ public void getAvailabilityStatus_whenBiometricFlagDisabled_returnsFalse() {
+ mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ mSetFlagsRule.disableFlags(
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
+ }
+
+ /** Tests that the controller is not available when private feature flag is not enabled. */
+ @Test
+ public void getAvailabilityStatus_whenPrivateFlagDisabled_returnsFalse() {
+ mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ mSetFlagsRule.enableFlags(
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
+ }
+
+ /** Tests that preference is disabled and summary says same as device lock. */
+ @Test
+ public void getSummary_whenScreenLock() {
+ doReturn(false).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
+ mSetFlagsRule.enableFlags(
+ android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ mFaceFingerprintUnlockController.updateState(mPreference);
+ assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreference.getSummary().toString()).isEqualTo("Same as device screen lock");
+ }
+
+ /** Tests that preference is enabled and summary is not same as device lock. */
+ @Test
+ public void getSummary_whenSeparateProfileLock() {
+ doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
+ mSetFlagsRule.enableFlags(
+ android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+ android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+
+ mFaceFingerprintUnlockController.updateState(mPreference);
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.getSummary().toString()).isNotEqualTo("Same as device screen lock");
+ }
+}