Switching account type and name in contact list customization UI
Change-Id: Iad8055261c2cb16f2bae0db5c55e41b45f20a9ee
diff --git a/res/layout/display_group.xml b/res/layout/custom_contact_list_filter_account.xml
similarity index 100%
rename from res/layout/display_group.xml
rename to res/layout/custom_contact_list_filter_account.xml
diff --git a/res/layout/display_child.xml b/res/layout/custom_contact_list_filter_group.xml
similarity index 100%
rename from res/layout/display_child.xml
rename to res/layout/custom_contact_list_filter_group.xml
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 99a961d..03f9b89 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -527,12 +527,34 @@
mChildWithPhones = withPhones;
}
- /** {@inheritDoc} */
+ @Override
+ public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
+ ViewGroup parent) {
+ if (convertView == null) {
+ convertView = mInflater.inflate(
+ R.layout.custom_contact_list_filter_account, parent, false);
+ }
+
+ final TextView text1 = (TextView)convertView.findViewById(android.R.id.text1);
+ final TextView text2 = (TextView)convertView.findViewById(android.R.id.text2);
+
+ final AccountDisplay account = (AccountDisplay)this.getGroup(groupPosition);
+
+ final AccountType accountType = mAccountTypes.getAccountType(account.mType);
+
+ text1.setText(accountType.getDisplayLabel(mContext));
+ text2.setText(account.mName);
+ text2.setVisibility(account.mName == null ? View.GONE : View.VISIBLE);
+
+ return convertView;
+ }
+
@Override
public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
if (convertView == null) {
- convertView = mInflater.inflate(R.layout.display_child, parent, false);
+ convertView = mInflater.inflate(
+ R.layout.custom_contact_list_filter_group, parent, false);
}
final TextView text1 = (TextView)convertView.findViewById(android.R.id.text1);
@@ -561,27 +583,6 @@
}
@Override
- public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
- ViewGroup parent) {
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.display_group, parent, false);
- }
-
- final TextView text1 = (TextView)convertView.findViewById(android.R.id.text1);
- final TextView text2 = (TextView)convertView.findViewById(android.R.id.text2);
-
- final AccountDisplay account = (AccountDisplay)this.getGroup(groupPosition);
-
- final AccountType accountType = mAccountTypes.getAccountType(account.mType);
-
- text1.setText(account.mName);
- text2.setText(accountType.getDisplayLabel(mContext));
- text2.setVisibility(account.mName == null ? View.GONE : View.VISIBLE);
-
- return convertView;
- }
-
- @Override
public Object getChild(int groupPosition, int childPosition) {
final AccountDisplay account = mAccounts.get(groupPosition);
final boolean validChild = childPosition >= 0