From bf62e70ee6eeac77f66da22b80b481c2a55a57a5 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Tue, 25 May 2021 15:04:57 +0800 Subject: [PATCH] Apply sliding transition for lock screen The flow of changing lock screen is combined with Settings and SUW pages together where their implementation are different, which causes the page-to-page transition inconsistent. Sub-setting pages will apply shared axis transition while SUW pages will keep the slide in/out transition. In order to make these 2 types of page work together, we intent to use slide in/out transition in the lock screen. Fix: 174434707 Test: visual verified Change-Id: I827211e45bcbfdfc558c9d95e6814e62b339b4aa --- .../android/settings/password/ChooseLockSettingsHelper.java | 4 ++++ .../security/ChangeScreenLockPreferenceController.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 5ed43fa21fb..77fcbed6493 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -34,7 +34,9 @@ import androidx.fragment.app.Fragment; import com.android.internal.widget.LockPatternUtils; import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; +import com.android.settings.core.SettingsBaseActivity; import com.android.settings.core.SubSettingLauncher; +import com.android.settingslib.transition.SettingsTransitionHelper; import com.google.android.setupcompat.util.WizardManagerHelper; @@ -359,6 +361,8 @@ public final class ChooseLockSettingsHelper { requestGatekeeperPasswordHandle); intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName()); + intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE, + SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE); Intent inIntent = mFragment != null ? mFragment.getActivity().getIntent() : mActivity.getIntent(); diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 7ea9879047d..5439fef2238 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -42,6 +42,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.transition.SettingsTransitionHelper; public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, GearPreference.OnGearClickListener { @@ -138,6 +139,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont new SubSettingLauncher(mContext) .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setSourceMetricsCategory(mHost.getMetricsCategory()) + .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE) .launch(); return true; }