commit 4f56df3c7fd35bd268f24a2e0404f18a451a5a56
author Tadashi G. Takaoka <takaoka@google.com> Tue Sep 29 16:04:08 2009 -0700
committer Tadashi G. Takaoka <takaoka@google.com> Tue Sep 29 17:35:22 2009 -0700
tree 624e6ecb55e44b931c2026d952e4d18c9f79e294
parent b4a7298b882999372b9a44415c1387ee49fba323

Added source label name to account name hsection.

Internal Bug: 2154925

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index a0f7061..c27262d 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -947,8 +947,11 @@
                     continue;
                 }
 
+                final ContactsSource source = sources.getInflatedSource(accountType,
+                        ContactsSource.LEVEL_SUMMARY);
                 final String accountName = entValues.getAsString(RawContacts.ACCOUNT_NAME);
-                mAccountName.setText(getString(R.string.account_name_format, accountName));
+                mAccountName.setText(getString(R.string.account_name_format,
+                        source.getDisplayLabel(this), accountName));
 
                 for (NamedContentValues subValue : entity.getSubValues()) {
                     ViewEntry entry = new ViewEntry();

src/com/android/contacts/ui/EditContactActivity.java

diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java
index 9290b96..450f4a9 100644
--- a/src/com/android/contacts/ui/EditContactActivity.java
+++ b/src/com/android/contacts/ui/EditContactActivity.java
@@ -402,7 +402,9 @@
         final ContactsSource source = sources.getInflatedSource(accountType,
                 ContactsSource.LEVEL_CONSTRAINTS);
 
-        mAccountName.setText(getString(R.string.account_name_format, accountName));
+        mAccountName.setText(getString(R.string.account_name_format,
+                source.getDisplayLabel(this), accountName));
+        mAccountName.setVisibility(View.VISIBLE);
 
         // Assign editor state based on entity and source
         mEditor.setState(entity, source);