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

Commit 252d1f19 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Launch full screen private space setup on Fold when unfolded" into main

parents d18aba07 b35fa82b

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.homepage.DeepLinkHomepageActivityInternal; 
import com.android.settings.homepage.SettingsHomepageActivity;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.ChooseLockPattern;

import com.android.settings.privatespace.PrivateSpaceSetupActivity;

import com.android.settings.remoteauth.RemoteAuthActivity;

import com.android.settings.remoteauth.RemoteAuthActivityInternal;
@@ -264,6 +265,7 @@ public class ActivityEmbeddingRulesController { 
        addActivityFilter(activityFilters, RemoteAuthActivity.class);

        addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);

        addActivityFilter(activityFilters, ChooseLockPattern.class);

        addActivityFilter(activityFilters, PrivateSpaceSetupActivity.class);

        String action = mContext.getString(R.string.config_avatar_picker_action);

        addActivityFilter(activityFilters, new Intent(action));

src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ public class SetupPreFinishDelayFragment extends InstrumentedFragment { 
        sHandler.postDelayed(mRunnable, MAX_DELAY_BEFORE_SETUP_FINISH);

    }



    @Override

    public void onDestroy() {

        sHandler.removeCallbacks(mRunnable);

        super.onDestroy();

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.PRIVATE_SPACE_SETUP_PRE_FINISH;