Update summary for Passwords and Accounts.

Bug: 169455298
Test: manual - disable silky home and check summary
Test: make RunSettingsRoboTests
Change-Id: Id4574f5865c57ec6a5cd010412a59411ab9af546
This commit is contained in:
Ahaan Ugale
2021-03-23 22:29:12 -07:00
parent 9b183778f2
commit 2c80a7ca98
3 changed files with 4 additions and 66 deletions

View File

@@ -17,19 +17,11 @@
package com.android.settings.accounts;
import android.content.Context;
import android.icu.text.ListFormatter;
import android.os.UserHandle;
import android.text.BidiFormatter;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settingslib.accounts.AuthenticatorHelper;
import java.util.ArrayList;
import java.util.List;
public class TopLevelAccountEntryPreferenceController extends BasePreferenceController {
public TopLevelAccountEntryPreferenceController(Context context, String preferenceKey) {
@@ -47,29 +39,6 @@ public class TopLevelAccountEntryPreferenceController extends BasePreferenceCont
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
return null;
}
final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,
UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);
final String[] types = authHelper.getEnabledAccountTypes();
final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
final List<CharSequence> summaries = new ArrayList<>();
if (types == null || types.length == 0) {
summaries.add(mContext.getString(R.string.account_dashboard_default_summary));
} else {
// Show up to 3 account types, ignore any null value
int accountToAdd = Math.min(3, types.length);
for (int i = 0; i < types.length && accountToAdd > 0; i++) {
final CharSequence label = authHelper.getLabelForType(mContext, types[i]);
if (TextUtils.isEmpty(label)) {
continue;
}
summaries.add(bidiFormatter.unicodeWrap(label));
accountToAdd--;
}
}
return ListFormatter.getInstance().format(summaries);
return mContext.getString(R.string.account_dashboard_default_summary);
}
}