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

Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev

Browse Source 
am: 9afa37ac3c

Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
This commit is contained in:
Ajay Kumar Nadathur Sreenivasan
2017-07-07 17:40:32 +00:00
committed by android-build-merger
parent cfa37bb121 9afa37ac3c
commit d6e1be947e
3 changed files with 156 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -16,9 +16,11 @@
package com.android.settings.fingerprint;
import android.app.Activity;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.widget.Button;
import android.widget.TextView;
@@ -32,6 +34,25 @@ import com.android.settings.password.SetupChooseLockGeneric;
import com.android.settings.password.SetupSkipDialog;
public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";
private boolean mAlreadyHadLockScreenSetup = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null) {
mAlreadyHadLockScreenSetup = isKeyguardSecure();
} else {
mAlreadyHadLockScreenSetup = savedInstanceState.getBoolean(
KEY_LOCK_SCREEN_PRESENT, false);
}
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(KEY_LOCK_SCREEN_PRESENT, mAlreadyHadLockScreenSetup);
}
@Override
protected Intent getChooseLockIntent() {
@@ -70,25 +91,32 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
if (data == null) {
data = new Intent();
}
LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
data.putExtra(SetupChooseLockGeneric.
SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY,
lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
// if lock was already present, do not return intent data since it must have been
// reported in previous attempts
if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST && isKeyguardSecure()
&& !mAlreadyHadLockScreenSetup) {
data = getMetricIntent(data);
}
super.onActivityResult(requestCode, resultCode, data);
}
private Intent getMetricIntent(Intent data) {
if (data == null) {
data = new Intent();
}
LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
data.putExtra(SetupChooseLockGeneric.
SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY,
lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
return data;
}
@Override
protected void onCancelButtonClick() {
KeyguardManager keyguardManager = getSystemService(KeyguardManager.class);
if (keyguardManager.isKeyguardSecure()) {
if (isKeyguardSecure()) {
// If the keyguard is already set up securely (maybe the user added a backup screen
// lock and skipped fingerprint), return RESULT_SKIP directly.
setResult(RESULT_SKIP);
setResult(RESULT_SKIP, mAlreadyHadLockScreenSetup ? null : getMetricIntent(null));
finish();
} else {
setResult(SetupSkipDialog.RESULT_SKIP);
@@ -96,6 +124,22 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
}
}
/**
* Propagate lock screen metrics if the user goes back from the fingerprint setup screen
* after having added lock screen to his device.
*/
@Override
public void onBackPressed() {
if (!mAlreadyHadLockScreenSetup && isKeyguardSecure()) {
setResult(Activity.RESULT_CANCELED, getMetricIntent(null));
}
super.onBackPressed();
}
private boolean isKeyguardSecure() {
return getSystemService(KeyguardManager.class).isKeyguardSecure();
}
@Override
public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;