Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworks lock screen flows.

Browse Source 
This also adds frp warning dialogs in case the user skips lock
screen setup initially.

bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
This commit is contained in:
Udam Saini
2016-02-03 17:31:11 -08:00
parent 40f4bf2a1f
commit 8ef4c62003
17 changed files with 538 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,13 @@ package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.support.v14.preference.PreferenceFragment;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupChooseLockGeneric;
import com.android.settings.SetupWizardUtils;
@@ -53,18 +56,31 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
@Override
protected void initViews() {
SetupWizardUtils.setImmersiveMode(this);
final View buttonBar = findViewById(R.id.button_bar);
if (buttonBar != null) {
buttonBar.setVisibility(View.GONE);
}
getNavigationBar().setNavigationBarListener(this);
Button nextButton = getNavigationBar().getNextButton();
nextButton.setText(null);
nextButton.setEnabled(false);
}
@Override
protected Button getNextButton() {
return getNavigationBar().getNextButton();
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()));
}
super.onActivityResult(requestCode, resultCode, data);
}
@Override
protected void onCancelButtonClick() {
SetupSkipDialog dialog = SetupSkipDialog.newInstance(
getIntent().getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
dialog.show(getFragmentManager());
}
@Override
@@ -74,7 +90,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
@Override
public void onNavigateNext() {
onNextButtonClick();
// next is handled via the onNextButtonClick method in FingerprintEnrollIntroduction
}
@Override