From 9c1a1cb884d5afd43a7bc51fe7def5b597904eeb Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Mon, 25 Apr 2022 12:39:51 +0800 Subject: [PATCH] Relaunch the account page after removing a work account Removing a work account goes back the previous page. However, this closes Settings app in dual pane mode since the account page is in the 2nd layer. Bug: 223755141 Test: manual, robotest Change-Id: I40407cb052c0474f62254bcb2216e33496c901c8 --- .../settings/accounts/AccountPreferenceController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 29198fb1e02..145898869fb 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -623,6 +623,12 @@ public class AccountPreferenceController extends AbstractPreferenceController if (action.equals(Intent.ACTION_MANAGED_PROFILE_REMOVED) || action.equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) { if (mFragment instanceof AccountWorkProfileDashboardFragment) { + new SubSettingLauncher(context) + .setDestination(AccountDashboardFragment.class.getName()) + .setSourceMetricsCategory(mFragment.getMetricsCategory()) + .setTitleRes(-1) + .setIsSecondLayerPage(true) + .launch(); mFragment.getActivity().finish(); } else { // Clean old state