diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-14 04:14:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-14 04:14:24 +0000 |
| commit | 52f627f9efc6038bce4fe97b63e95a3c2d3f8a90 (patch) | |
| tree | 4d30a15c86e9a5889c8bbda3d14db9a5bd1201e1 /src/com/android/settings/accounts/AccountPreferenceController.java | |
| parent | 8b9f1d4f9e094985d27e98e2cdbd76fada5036eb (diff) | |
| parent | 6663bed71c6bff345e633cf465f3773c6cf9812c (diff) | |
| download | packages_apps_Settings-52f627f9efc6038bce4fe97b63e95a3c2d3f8a90.tar.gz packages_apps_Settings-52f627f9efc6038bce4fe97b63e95a3c2d3f8a90.tar.bz2 packages_apps_Settings-52f627f9efc6038bce4fe97b63e95a3c2d3f8a90.zip | |
Merge "Account settings: Fix duplicate title and extra padding." into sc-dev
Diffstat (limited to 'src/com/android/settings/accounts/AccountPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/accounts/AccountPreferenceController.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 036df27687..42b2334f23 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -80,7 +80,6 @@ public class AccountPreferenceController extends AbstractPreferenceController private static final int ORDER_NEXT_TO_LAST = 1001; private static final int ORDER_NEXT_TO_NEXT_TO_LAST = 1000; - private static final String PREF_KEY_ACCOUNTS = "accounts_category"; private static final String PREF_KEY_ADD_ACCOUNT = "add_account"; private static final String PREF_KEY_REMOVE_PROFILE = "remove_profile"; private static final String PREF_KEY_WORK_PROFILE_SETTING = "work_profile_setting"; @@ -324,6 +323,7 @@ public class AccountPreferenceController extends AbstractPreferenceController mHelper.createAccessiblePreferenceCategory( mFragment.getPreferenceManager().getContext()); preferenceGroup.setOrder(mAccountProfileOrder++); + preferenceGroup.setTitle(R.string.account_settings); // default title; may be modified below if (isSingleProfile()) { final String title = context.getString(R.string.account_for_section_header, BidiFormatter.getInstance().unicodeWrap(userInfo.name)); @@ -349,10 +349,8 @@ public class AccountPreferenceController extends AbstractPreferenceController } } final PreferenceScreen screen = mFragment.getPreferenceScreen(); - final PreferenceGroup accounts = - screen == null ? null : screen.findPreference(PREF_KEY_ACCOUNTS); - if (accounts != null) { - accounts.addPreference(preferenceGroup); + if (screen != null) { + screen.addPreference(preferenceGroup); } profileData.preferenceGroup = preferenceGroup; if (userInfo.isEnabled()) { |