PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joseph Vincent
2024-04-16 10:48:30 +00:00
committed by Android (Google) Code Review
parent d18aba0792 b35fa82b3d
commit 252d1f19ff
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
View File

@@ -50,6 +50,7 @@ import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockPattern; import com.android.settings.password.ChooseLockPattern;
import com.android.settings.privatespace.PrivateSpaceSetupActivity;
import com.android.settings.remoteauth.RemoteAuthActivity; import com.android.settings.remoteauth.RemoteAuthActivity;
import com.android.settings.remoteauth.RemoteAuthActivityInternal; import com.android.settings.remoteauth.RemoteAuthActivityInternal;
@@ -264,6 +265,7 @@ public class ActivityEmbeddingRulesController {
addActivityFilter(activityFilters, RemoteAuthActivity.class); addActivityFilter(activityFilters, RemoteAuthActivity.class);
addActivityFilter(activityFilters, RemoteAuthActivityInternal.class); addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
addActivityFilter(activityFilters, ChooseLockPattern.class); addActivityFilter(activityFilters, ChooseLockPattern.class);
addActivityFilter(activityFilters, PrivateSpaceSetupActivity.class);
String action = mContext.getString(R.string.config_avatar_picker_action); String action = mContext.getString(R.string.config_avatar_picker_action);
addActivityFilter(activityFilters, new Intent(action)); addActivityFilter(activityFilters, new Intent(action));

6
src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java
View File

@@ -123,6 +123,12 @@ public class SetupPreFinishDelayFragment extends InstrumentedFragment {
sHandler.postDelayed(mRunnable, MAX_DELAY_BEFORE_SETUP_FINISH); sHandler.postDelayed(mRunnable, MAX_DELAY_BEFORE_SETUP_FINISH);
} }
@Override
public void onDestroy() {
sHandler.removeCallbacks(mRunnable);
super.onDestroy();
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.PRIVATE_SPACE_SETUP_PRE_FINISH; return SettingsEnums.PRIVATE_SPACE_SETUP_PRE_FINISH;