Merge "Fix focus on wrong tab"

2019-12-20 05:55:15 +00:00
parent 506b40078e 91d9942494
commit 6df1b4b5e0
3 changed files with 124 additions and 112 deletions
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -150,7 +150,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
        if (bundle != null) {
            final int extraTab = bundle.getInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, -1);
            if (extraTab != -1) {
-                return WORK_TAB;
+                return extraTab;
            }
            final int userId = bundle.getInt(EXTRA_USER_ID, UserHandle.SYSTEM.getIdentifier());
            final boolean isWorkProfile = UserManager.get(activity).isManagedProfile(userId);