am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev (e9639b1d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ChooseLockGeneric.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -109,12 +109,19 @@ public class ChooseLockGeneric extends SettingsActivity {
		@Override
		public void onRemovalSucceeded(Fingerprint fingerprint) {
		Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
		if (mFingerprintManager.getEnrolledFingerprints().size() == 0) {
		finish();
		}
		}

		@Override
		public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
		Activity activity = getActivity();
		if (activity != null) {
		Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
		}
		finish();
		}
		};

		@Override
		@@ -490,18 +497,18 @@ public class ChooseLockGeneric extends SettingsActivity {
		mChooseLockSettingsHelper.utils().clearLock(UserHandle.myUserId());
		mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled,
		UserHandle.myUserId());
		removeAllFingerprintTemplates();
		removeAllFingerprintTemplatesAndFinish();
		getActivity().setResult(Activity.RESULT_OK);
		finish();
		} else {
		removeAllFingerprintTemplates();
		finish();
		removeAllFingerprintTemplatesAndFinish();
		}
		}

		private void removeAllFingerprintTemplates() {
		private void removeAllFingerprintTemplatesAndFinish() {
		if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
		mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
		} else {
		finish();
		}
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -505,7 +505,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		}

		public void finish() {
		getActivity().onBackPressed();
		Activity activity = getActivity();
		if (activity != null) {
		activity.onBackPressed();
		}
		}

		public boolean startFragment(Fragment caller, String fragmentClass, int titleRes,