Merge "Update theme transition for fingerprint in U" into udc-dev (c49b5084) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import static android.provider.Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED;
		import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_DENIED;
		import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_GRANTED;

		import static com.google.android.setupdesign.transition.TransitionHelper.TRANSITION_FADE_THROUGH;

		import android.annotation.NonNull;
		import android.app.Activity;
		import android.app.admin.DevicePolicyManager;
		@@ -55,6 +57,7 @@ import com.android.settings.password.ChooseLockPattern;
		import com.android.settings.password.ChooseLockSettingsHelper;

		import com.google.android.setupcompat.util.WizardManagerHelper;
		import com.google.android.setupdesign.transition.TransitionHelper;

		import java.util.List;

		@@ -457,6 +460,9 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
		final boolean isOk =
		isSuccessfulConfirmOrChooseCredential(requestCode, resultCode);
		if (isOk && (mHasFeatureFace \|\| mHasFeatureFingerprint)) {
		// Apply forward animation during the transition from ChooseLock/ConfirmLock to
		// SetupFingerprintEnrollIntroduction/FingerprintEnrollmentActivity
		TransitionHelper.applyForwardTransition(this, TRANSITION_FADE_THROUGH);
		updateGatekeeperPasswordHandle(data);
		if (mHasFeatureFingerprint) {
		launchFingerprintOnlyEnroll();
		@@ -473,6 +479,10 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
		mIsSingleEnrolling = false;
		if ((resultCode == BiometricEnrollBase.RESULT_SKIP
		\|\| resultCode == BiometricEnrollBase.RESULT_FINISHED) && mHasFeatureFace) {
		// Apply forward animation during the transition from
		// SetupFingerprintEnroll*/FingerprintEnrollmentActivity to
		// SetupFaceEnrollIntroduction
		TransitionHelper.applyForwardTransition(this, TRANSITION_FADE_THROUGH);
		launchFaceOnlyEnroll();
		} else {
		finishOrLaunchHandToParent(resultCode);

src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.Intent;
		import android.os.UserHandle;
		import android.view.View;

		import com.android.settings.R;
		import com.android.settings.password.ChooseLockSettingsHelper;

		/**
		@@ -120,7 +119,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
		intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
		}
		startActivity(intent);
		overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
		finish();
		}

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -267,9 +267,11 @@ public class FingerprintEnrollmentActivity extends FragmentActivity {
		} else {
		getSupportFragmentManager().beginTransaction()
		.setReorderingAllowed(true)
		.setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color,
		R.anim.shared_x_axis_activity_open_exit,
		R.anim.shared_x_axis_activity_close_enter_dynamic_color,
		R.anim.shared_x_axis_activity_close_exit)
		.replace(R.id.fragment_container_view, fragmentClass, null, tag)
		.setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out,
		R.anim.sud_slide_back_in, R.anim.sud_slide_back_out)
		.addToBackStack(tag)
		.commit();
		}
		@@ -373,20 +375,24 @@ public class FingerprintEnrollmentActivity extends FragmentActivity {
		// Replace enrolling page
		getSupportFragmentManager().beginTransaction()
		.setReorderingAllowed(true)
		.setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color,
		R.anim.shared_x_axis_activity_open_exit,
		R.anim.shared_x_axis_activity_close_enter_dynamic_color,
		R.anim.shared_x_axis_activity_close_exit)
		.replace(R.id.fragment_container_view, FingerprintEnrollFinishFragment.class,
		null, FINISH_TAG)
		.setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out,
		R.anim.sud_slide_back_in, R.anim.sud_slide_back_out)
		.commit();
		} else {
		// Remove Enrolling page from backstack, and add Finish page. Latest backstack will
		// be changed from Intro->FindSensor->Enrolling to Intro->FindSensor->Finish
		getSupportFragmentManager().beginTransaction()
		.setReorderingAllowed(true)
		.setCustomAnimations(R.anim.shared_x_axis_activity_open_enter_dynamic_color,
		R.anim.shared_x_axis_activity_open_exit,
		R.anim.shared_x_axis_activity_close_enter_dynamic_color,
		R.anim.shared_x_axis_activity_close_exit)
		.replace(R.id.fragment_container_view, FingerprintEnrollFinishFragment.class,
		null, FINISH_TAG)
		.setCustomAnimations(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out,
		R.anim.sud_slide_back_in, R.anim.sud_slide_back_out)
		.addToBackStack(FINISH_TAG)
		.commit();
		}