Fix 5466557: Removed secondary screenlock settings labels

Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
This commit is contained in:
Danielle Millett
2011-10-17 19:21:19 -04:00
parent 7a33de4c00
commit 80412e70db
2 changed files with 5 additions and 8 deletions

View File

@@ -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;