Merge "Update string for work profile face unlock" into qt-r1-dev (5d8cd009) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -888,6 +888,8 @@
		<string name="security_settings_face_preference_summary_none">Set up face unlock</string>
		<!-- Title shown for menu item that launches face settings or enrollment. [CHAR LIMIT=32] -->
		<string name="security_settings_face_preference_title">Face unlock</string>
		<!-- Title shown for menu item that launches face settings or enrollment, for work profile [CHAR LIMIT=50] -->
		<string name="security_settings_face_profile_preference_title">Face unlock for work</string>
		<!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->
		<string name="security_settings_face_enroll_education_title">How to set up face unlock</string>
		<!-- Introduction title shown in face enrollment education screen for accessibility [CHAR LIMI=40]-->

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ package com.android.settings.biometrics.face;
		import android.content.Context;
		import android.os.UserHandle;

		import com.android.settings.R;

		import androidx.preference.Preference;

		public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {

		public static final String KEY_FACE_SETTINGS = "face_settings_profile";
		@@ -37,4 +41,11 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC
		protected int getUserId() {
		return mProfileChallengeUserId;
		}

		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		preference.setTitle(mContext.getResources().getString(
		R.string.security_settings_face_profile_preference_title));
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,11 @@ public class FaceSettings extends DashboardFragment {
		mUserId = getActivity().getIntent().getIntExtra(
		Intent.EXTRA_USER_ID, UserHandle.myUserId());

		if (mUserManager.getUserInfo(mUserId).isManagedProfile()) {
		getActivity().setTitle(getActivity().getResources().getString(
		R.string.security_settings_face_profile_preference_title));
		}

		Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
		Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);
		Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);