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

Merge "Update string for work profile face unlock" into qt-r1-dev am: 5d8cd009fa

Browse Source 
am: 031affb92b

Change-Id: I96e9000612480acb44f7a8ec3c9c3c50d97075a8
This commit is contained in:
Kevin Chyn
2019-06-14 18:36:41 -07:00
committed by android-build-merger
parent 1213ce063f 031affb92b
commit ad363b091f
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -888,6 +888,8 @@
<string name="security_settings_face_preference_summary_none">Set up face unlock</string> <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] --> <!-- Title shown for menu item that launches face settings or enrollment. [CHAR LIMIT=32] -->
<string name="security_settings_face_preference_title">Face unlock</string> <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] --> <!-- 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> <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]--> <!-- Introduction title shown in face enrollment education screen for accessibility [CHAR LIMI=40]-->

11
src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
View File

@@ -19,6 +19,10 @@ package com.android.settings.biometrics.face;
import android.content.Context; import android.content.Context;
import android.os.UserHandle; import android.os.UserHandle;
import com.android.settings.R;
import androidx.preference.Preference;
public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController { public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {
public static final String KEY_FACE_SETTINGS = "face_settings_profile"; public static final String KEY_FACE_SETTINGS = "face_settings_profile";
@@ -37,4 +41,11 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC
protected int getUserId() { protected int getUserId() {
return mProfileChallengeUserId; 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
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -119,6 +119,11 @@ public class FaceSettings extends DashboardFragment {
mUserId = getActivity().getIntent().getIntExtra( mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId()); 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 keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY); Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);
Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY); Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);