From 9312dc83fae9b6bc8715f799586a95a1412908c1 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Thu, 3 Jun 2021 20:32:40 +0800 Subject: [PATCH] Apply sliding transition to biometric settings Bug: 187542491 Test: rebuild Change-Id: Ife645785a37c4ac838204d0613dffd5a5911a47e --- .../biometrics/BiometricStatusPreferenceController.java | 4 ++++ .../biometrics/combination/BiometricsSettingsBase.java | 4 ++++ .../biometrics/fingerprint/FingerprintEnrollFinish.java | 1 + .../security/ChangeProfileScreenLockPreferenceController.java | 2 ++ .../security/LockUnificationPreferenceController.java | 4 ++++ 5 files changed, 15 insertions(+) diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java index 70f0baf3de5..801dd03bf48 100644 --- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java @@ -30,7 +30,9 @@ import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; +import com.android.settings.core.SettingsBaseActivity; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.transition.SettingsTransitionHelper; public abstract class BiometricStatusPreferenceController extends BasePreferenceController { @@ -127,6 +129,8 @@ public abstract class BiometricStatusPreferenceController extends BasePreference } intent.putExtra(Intent.EXTRA_USER_ID, userId); intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true); + intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE, + SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE); context.startActivity(intent); return true; } diff --git a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java index d8197c02abb..68473674220 100644 --- a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java +++ b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java @@ -34,9 +34,11 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricUtils; +import com.android.settings.core.SettingsBaseActivity; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.password.ChooseLockGeneric; import com.android.settings.password.ChooseLockSettingsHelper; +import com.android.settingslib.transition.SettingsTransitionHelper; /** * Base fragment with the confirming credential functionality for combined biometrics settings. @@ -203,6 +205,8 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { true); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true); + intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE, + SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE); if (mUserId != UserHandle.USER_NULL) { intent.putExtra(Intent.EXTRA_USER_ID, mUserId); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index a989eef93f7..80a6f0555e2 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -153,6 +153,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { intent.putExtra(Intent.EXTRA_USER_ID, mUserId); intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge); startActivity(intent); + overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out); } private void onAddAnotherButtonClick(View view) { diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java index 54b78be65fa..8e1a4f8dd8f 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -30,6 +30,7 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.password.ChooseLockGeneric; +import com.android.settingslib.transition.SettingsTransitionHelper; public class ChangeProfileScreenLockPreferenceController extends ChangeScreenLockPreferenceController { @@ -81,6 +82,7 @@ public class ChangeProfileScreenLockPreferenceController extends .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setSourceMetricsCategory(mHost.getMetricsCategory()) .setArguments(extras) + .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE) .launch(); return true; diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index 98a3c6ff3de..b6e215c8bf7 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -26,6 +26,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -43,6 +44,7 @@ import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.transition.SettingsTransitionHelper; /** * Controller for password unification/un-unification flows. @@ -173,6 +175,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setSourceMetricsCategory(mHost.getMetricsCategory()) .setArguments(extras) + .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE) .launch(); } @@ -229,6 +232,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr .setTitleRes(R.string.lock_settings_picker_title) .setSourceMetricsCategory(mHost.getMetricsCategory()) .setArguments(extras) + .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE) .launch(); }