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

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

Merge "Change ProfileType definition"

parents 0eae5829 1e5d8146

src/com/android/settings/Utils.java

+2 −2
Original line number Diff line number Diff line
@@ -1060,9 +1060,9 @@ public final class Utils extends com.android.settingslib.Utils { 
    public static Fragment getTargetFragment(Activity activity, String fragmentName, Bundle args) {

        Fragment f = null;

        final boolean isPersonal = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)

                == ProfileSelectFragment.PERSONAL : false;

                == ProfileSelectFragment.ProfileType.PERSONAL : false;

        final boolean isWork = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)

                == ProfileSelectFragment.WORK : false;

                == ProfileSelectFragment.ProfileType.WORK : false;

        if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.PERSONAL_WORK_PROFILE)

                && UserManager.get(activity).getUserProfiles().size() > 1

                && ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName) != null

src/com/android/settings/accounts/AccountDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class AccountDashboardFragment extends DashboardFragment { 


        final AccountPreferenceController accountPrefController =

                new AccountPreferenceController(context, parent, authorities,

                        ProfileSelectFragment.ALL);

                        ProfileSelectFragment.ProfileType.ALL);

        if (parent != null) {

            parent.getSettingsLifecycle().addObserver(accountPrefController);

        }

src/com/android/settings/accounts/AccountPersonalDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class AccountPersonalDashboardFragment extends DashboardFragment { 


        final AccountPreferenceController accountPrefController =

                new AccountPreferenceController(context, parent, authorities,

                        ProfileSelectFragment.PERSONAL);

                        ProfileSelectFragment.ProfileType.PERSONAL);

        if (parent != null) {

            parent.getSettingsLifecycle().addObserver(accountPrefController);

        }

src/com/android/settings/accounts/AccountPreferenceController.java

+4 −4
Original line number Diff line number Diff line
@@ -277,10 +277,10 @@ public class AccountPreferenceController extends AbstractPreferenceController 
            final int profilesCount = profiles.size();

            for (int i = 0; i < profilesCount; i++) {

                if (profiles.get(i).isManagedProfile()

                        && (mType & ProfileSelectFragment.WORK) != 0) {

                        && (mType & ProfileSelectFragment.ProfileType.WORK) != 0) {

                    updateProfileUi(profiles.get(i));

                } else if (!profiles.get(i).isManagedProfile()

                        && (mType & ProfileSelectFragment.PERSONAL) != 0) {

                        && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {

                    updateProfileUi(profiles.get(i));

                }

            }
@@ -324,7 +324,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
            preferenceGroup.setContentDescription(

                    mContext.getString(R.string.account_settings));

        } else if (userInfo.isManagedProfile()) {

            if (mType == ProfileSelectFragment.ALL) {

            if (mType == ProfileSelectFragment.ProfileType.ALL) {

                preferenceGroup.setTitle(R.string.category_work);

                final String workGroupSummary = getWorkGroupSummary(context, userInfo);

                preferenceGroup.setSummary(workGroupSummary);
@@ -336,7 +336,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                    DISALLOW_REMOVE_MANAGED_PROFILE, UserHandle.myUserId());

            profileData.managedProfilePreference = newManagedProfileSettings();

        } else {

            if (mType == ProfileSelectFragment.ALL) {

            if (mType == ProfileSelectFragment.ProfileType.ALL) {

                preferenceGroup.setTitle(R.string.category_personal);

                preferenceGroup.setContentDescription(

                        mContext.getString(R.string.accessibility_category_personal));

src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment { 


        final AccountPreferenceController accountPrefController =

                new AccountPreferenceController(context, parent, authorities,

                        ProfileSelectFragment.WORK);

                        ProfileSelectFragment.ProfileType.WORK);

        if (parent != null) {

            parent.getSettingsLifecycle().addObserver(accountPrefController);

        }