Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90184341 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply sliding transition for lock screen" into sc-dev

parents 37947fc4 bf62e70e

src/com/android/settings/password/ChooseLockSettingsHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/security/ChangeScreenLockPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }