Merge "Modify account page multiple profile UI" (504d2d3c) · Commits · e / os / android_packages_apps_Settings

res/layout/profile_select_tablayout.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		app:tabMaxWidth="0dp"
		app:tabGravity="fill"
		app:tabMode="fixed"
		app:tabIndicatorFullWidth="false"
		app:tabIndicatorColor="@*android:color/accent_device_default"
		app:tabSelectedTextColor="@*android:color/accent_device_default"
		app:tabTextColor="?android:attr/textColorSecondary" />

+12 −8

Original line number	Diff line number	Diff line
		@@ -329,20 +329,24 @@ public class AccountPreferenceController extends AbstractPreferenceController
		preferenceGroup.setContentDescription(
		mContext.getString(R.string.account_settings));
		} else if (userInfo.isManagedProfile()) {
		if (mType == ProfileSelectFragment.ALL) {
		preferenceGroup.setTitle(R.string.category_work);
		String workGroupSummary = getWorkGroupSummary(context, userInfo);
		final String workGroupSummary = getWorkGroupSummary(context, userInfo);
		preferenceGroup.setSummary(workGroupSummary);
		preferenceGroup.setContentDescription(
		mContext.getString(R.string.accessibility_category_work, workGroupSummary));
		}
		profileData.removeWorkProfilePreference = newRemoveWorkProfilePreference();
		mHelper.enforceRestrictionOnPreference(profileData.removeWorkProfilePreference,
		DISALLOW_REMOVE_MANAGED_PROFILE, UserHandle.myUserId());
		profileData.managedProfilePreference = newManagedProfileSettings();
		} else {
		if (mType == ProfileSelectFragment.ALL) {
		preferenceGroup.setTitle(R.string.category_personal);
		preferenceGroup.setContentDescription(
		mContext.getString(R.string.accessibility_category_personal));
		}
		}
		final PreferenceScreen screen = mParent.getPreferenceScreen();
		if (screen != null) {
		screen.addPreference(preferenceGroup);