diff options
author | Udam Saini <udam@google.com> | 2016-01-26 15:48:37 -0800 |
---|---|---|
committer | Udam Saini <udam@google.com> | 2016-01-26 15:48:37 -0800 |
commit | cce5339da7b8fa348bdd7296500006d0b4b26b78 (patch) | |
tree | 909909f8fff388c23f7e39c687a2f82ee872742d /src/com | |
parent | 679fde4c1505f03dd7f1f8a61c88aaf054e33e56 (diff) | |
download | packages_apps_Settings-cce5339da7b8fa348bdd7296500006d0b4b26b78.tar.gz packages_apps_Settings-cce5339da7b8fa348bdd7296500006d0b4b26b78.tar.bz2 packages_apps_Settings-cce5339da7b8fa348bdd7296500006d0b4b26b78.zip |
Removes fingerprint onboard screen
This screen isn't used anymore. This also fixes some fingerprint
work in setup wizard to use the userId instead.
Change-Id: Icb1debaf7b2766069a53a75eab6152d6b816b03c
Diffstat (limited to 'src/com')
5 files changed, 11 insertions, 185 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index c1347f53cd..54cd21880d 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -86,6 +86,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { if (token != null) { intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); } + if (mUserId != UserHandle.USER_NULL) { + intent.putExtra(Intent.EXTRA_USER_ID, mUserId); + } startActivityForResult(intent, FINGERPRINT_FIND_SENSOR_REQUEST); } @@ -95,9 +98,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { protected Intent getFindSensorIntent() { Intent intent = new Intent(this, FingerprintEnrollFindSensor.class); - if (mUserId != UserHandle.USER_NULL) { - intent.putExtra(Intent.EXTRA_USER_ID, mUserId); - } return intent; } diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java deleted file mode 100644 index 1b80589c17..0000000000 --- a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.settings.fingerprint; - -import android.app.admin.DevicePolicyManager; -import android.content.Intent; -import android.hardware.fingerprint.FingerprintManager; -import android.os.Bundle; -import android.os.UserHandle; - -import com.android.internal.logging.MetricsLogger; -import com.android.settings.ChooseLockGeneric; -import com.android.settings.ChooseLockSettingsHelper; -import com.android.settings.R; - -/** - * Onboarding activity for fingerprint enrollment. - */ -public class FingerprintEnrollOnboard extends FingerprintEnrollBase { - - private static final int CHOOSE_LOCK_GENERIC_REQUEST = 1; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.fingerprint_enroll_onboard); - setHeaderText(R.string.security_settings_fingerprint_enroll_onboard_title); - } - - @Override - protected void onNextButtonClick() { - launchChooseLock(); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST && resultCode == RESULT_FINISHED) { - byte[] token = data.getByteArrayExtra( - ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); - setResult(RESULT_FINISHED); - launchFindSensor(token); - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } - - private void launchChooseLock() { - Intent intent = getChooseLockIntent(); - long challenge = getSystemService(FingerprintManager.class).preEnroll(); - intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY, - DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); - intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true); - if (mUserId != UserHandle.USER_NULL) { - intent.putExtra(Intent.EXTRA_USER_ID, mUserId); - } - startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST); - } - - protected Intent getChooseLockIntent() { - return new Intent(this, ChooseLockGeneric.class); - } - - private void launchFindSensor(byte[] token) { - Intent intent = getFindSensorIntent(); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); - if (mUserId != UserHandle.USER_NULL) { - intent.putExtra(Intent.EXTRA_USER_ID, mUserId); - } - startActivity(intent); - finish(); - } - - protected Intent getFindSensorIntent() { - return new Intent(this, FingerprintEnrollFindSensor.class); - } - - @Override - protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD; - } -} diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 505d140a9c..74a280c874 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -18,6 +18,7 @@ package com.android.settings.fingerprint; import android.content.Intent; import android.content.res.Resources; +import android.os.UserHandle; import android.view.View; import android.widget.Button; @@ -39,6 +40,9 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso protected Intent getEnrollingIntent() { Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken); + if (mUserId != UserHandle.USER_NULL) { + intent.putExtra(Intent.EXTRA_USER_ID, mUserId); + } SetupWizardUtils.copySetupExtras(getIntent(), intent); return intent; } diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java index 8f37a111a2..bbd0c1a3cd 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java @@ -18,6 +18,7 @@ package com.android.settings.fingerprint; import android.content.Intent; import android.content.res.Resources; +import android.os.UserHandle; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -35,6 +36,9 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish protected Intent getEnrollingIntent() { Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken); + if (mUserId != UserHandle.USER_NULL) { + intent.putExtra(Intent.EXTRA_USER_ID, mUserId); + } SetupWizardUtils.copySetupExtras(getIntent(), intent); return intent; } diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java deleted file mode 100644 index 7fca35a1a1..0000000000 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.settings.fingerprint; - -import android.content.Intent; -import android.content.res.Resources; -import android.view.View; -import android.widget.Button; - -import com.android.internal.logging.MetricsLogger; -import com.android.settings.R; -import com.android.settings.SetupChooseLockGeneric; -import com.android.settings.SetupWizardUtils; -import com.android.setupwizardlib.view.NavigationBar; - -public class SetupFingerprintEnrollOnboard extends FingerprintEnrollOnboard - implements NavigationBar.NavigationBarListener { - - @Override - protected Intent getChooseLockIntent() { - Intent intent = new Intent(this, SetupChooseLockGeneric.class); - SetupWizardUtils.copySetupExtras(getIntent(), intent); - return intent; - } - - @Override - protected Intent getFindSensorIntent() { - final Intent intent = new Intent(this, SetupFingerprintEnrollFindSensor.class); - SetupWizardUtils.copySetupExtras(getIntent(), intent); - return intent; - } - - @Override - protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent()); - super.onApplyThemeResource(theme, resid, first); - } - - @Override - protected void initViews() { - SetupWizardUtils.setImmersiveMode(this); - - final View nextButton = findViewById(R.id.next_button); - if (nextButton != null) { - nextButton.setVisibility(View.GONE); - } - - getNavigationBar().setNavigationBarListener(this); - } - - @Override - protected Button getNextButton() { - return getNavigationBar().getNextButton(); - } - - @Override - public void onNavigateBack() { - onBackPressed(); - } - - @Override - public void onNavigateNext() { - onNextButtonClick(); - } - - @Override - protected int getMetricsCategory() { - return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD_SETUP; - } -} |