From f5277ba54a05b69e71556f8f900d621d69cfa2b7 Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Thu, 7 Nov 2019 14:53:54 +0800 Subject: [PATCH] Modify account page multiple profile UI - Extend the tab width to 50% - Hide category title in two tab mode Bug: 141601408 Test: manual Change-Id: I73a1a64c704f7a74c200803efef97cdac5534aa7 --- res/layout/profile_select_tablayout.xml | 1 - .../accounts/AccountPreferenceController.java | 20 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/res/layout/profile_select_tablayout.xml b/res/layout/profile_select_tablayout.xml index 8c0ca8c080d..3e83bb9b2c4 100644 --- a/res/layout/profile_select_tablayout.xml +++ b/res/layout/profile_select_tablayout.xml @@ -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" /> diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 8e3e7022e7d..6e1727b004d 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -329,19 +329,23 @@ public class AccountPreferenceController extends AbstractPreferenceController preferenceGroup.setContentDescription( mContext.getString(R.string.account_settings)); } else if (userInfo.isManagedProfile()) { - preferenceGroup.setTitle(R.string.category_work); - String workGroupSummary = getWorkGroupSummary(context, userInfo); - preferenceGroup.setSummary(workGroupSummary); - preferenceGroup.setContentDescription( - mContext.getString(R.string.accessibility_category_work, workGroupSummary)); + if (mType == ProfileSelectFragment.ALL) { + preferenceGroup.setTitle(R.string.category_work); + 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 { - preferenceGroup.setTitle(R.string.category_personal); - preferenceGroup.setContentDescription( - mContext.getString(R.string.accessibility_category_personal)); + 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) {