Merge "Transferring display name logic to GAL provider" into honeycomb

This commit is contained in:
Dmitri Plotnikov 2011-01-27 10:47:10 -08:00 committed by Android (Google) Code Review
commit fc902559c4

View File

@ -224,7 +224,17 @@ public class ExchangeDirectoryProvider extends ContentProvider {
row[i] = R.string.exchange_name; row[i] = R.string.exchange_name;
} }
} else if (column.equals(Directory.DISPLAY_NAME)) { } else if (column.equals(Directory.DISPLAY_NAME)) {
// If the account name is an email address, extract
// the domain name and use it as the directory display name
final String accountName = account.name;
int atIndex = accountName.indexOf('@');
if (atIndex != -1 && atIndex < accountName.length() - 2) {
final char firstLetter = Character.toUpperCase(
accountName.charAt(atIndex + 1));
row[i] = firstLetter + accountName.substring(atIndex + 2);
} else {
row[i] = account.name; row[i] = account.name;
}
} else if (column.equals(Directory.EXPORT_SUPPORT)) { } else if (column.equals(Directory.EXPORT_SUPPORT)) {
row[i] = Directory.EXPORT_SUPPORT_SAME_ACCOUNT_ONLY; row[i] = Directory.EXPORT_SUPPORT_SAME_ACCOUNT_ONLY;
} else if (column.equals(Directory.SHORTCUT_SUPPORT)) { } else if (column.equals(Directory.SHORTCUT_SUPPORT)) {