diff options
| -rw-r--r-- | res/xml/security_settings_picker.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml index 87e69e0..6ed7d5f 100644 --- a/res/xml/security_settings_picker.xml +++ b/res/xml/security_settings_picker.xml @@ -19,37 +19,31 @@ <PreferenceScreen android:key="unlock_set_off" android:title="@string/unlock_set_unlock_off_title" - android:summary="@string/unlock_set_unlock_off_summary" android:persistent="false"/> <PreferenceScreen android:key="unlock_set_none" android:title="@string/unlock_set_unlock_none_title" - android:summary="@string/unlock_set_unlock_none_summary" android:persistent="false"/> <PreferenceScreen android:key="unlock_set_biometric_weak" android:title="@string/unlock_set_unlock_biometric_weak_title" - android:summary="@string/unlock_set_unlock_biometric_weak_summary" android:persistent="false"/> <PreferenceScreen android:key="unlock_set_pattern" android:title="@string/unlock_set_unlock_pattern_title" - android:summary="@string/unlock_set_unlock_pattern_summary" android:persistent="false"/> <PreferenceScreen android:key="unlock_set_pin" android:title="@string/unlock_set_unlock_pin_title" - android:summary="@string/unlock_set_unlock_pin_summary" android:persistent="false"/> <PreferenceScreen android:key="unlock_set_password" android:title="@string/unlock_set_unlock_password_title" - android:summary="@string/unlock_set_unlock_password_summary" android:persistent="false"/> </PreferenceScreen> diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 110635f..990b6cc 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -58,6 +58,8 @@ public class ChooseLockGeneric extends PreferenceActivity { private static final String CONFIRM_CREDENTIALS = "confirm_credentials"; public static final String MINIMUM_QUALITY_KEY = "minimum_quality"; + private static final boolean ALWAY_SHOW_TUTORIAL = true; + private ChooseLockSettingsHelper mChooseLockSettingsHelper; private DevicePolicyManager mDPM; private KeyStore mKeyStore; @@ -282,11 +284,12 @@ public class ChooseLockGeneric extends PreferenceActivity { R.string.backup_lock_settings_picker_title); fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - boolean showTutorial = !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen(); + boolean showTutorial = ALWAY_SHOW_TUTORIAL || + !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen(); Intent intent = new Intent(); intent.setClassName("com.android.facelock", showTutorial ? "com.android.facelock.FaceLockTutorial" - : "com.android.facelock.SetupFaceLock"); + : "com.android.facelock.SetupFaceLock"); PendingIntent pending = PendingIntent.getActivity(getActivity(), 0, fallBackIntent, 0); intent.putExtra("PendingIntent", pending); return intent; |