From 4f56df3c7fd35bd268f24a2e0404f18a451a5a56 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 29 Sep 2009 16:04:08 -0700
Subject: [PATCH] Added source label name to account name hsection.

Internal Bug: 2154925
---
 res/drawable-hdpi/bg_infobar_new.9.png               | Bin 0 -> 95 bytes
 res/drawable-mdpi/bg_infobar_new.9.png               | Bin 0 -> 159 bytes
 res/layout-finger/tab_account_name.xml               |   2 +-
 res/values/strings.xml                               |   2 +-
 src/com/android/contacts/ViewContactActivity.java    |   5 ++++-
 src/com/android/contacts/ui/EditContactActivity.java |   4 +++-
 6 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable-hdpi/bg_infobar_new.9.png
 create mode 100644 res/drawable-mdpi/bg_infobar_new.9.png

diff --git a/res/drawable-hdpi/bg_infobar_new.9.png b/res/drawable-hdpi/bg_infobar_new.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..104ced98c626f3376477a6e295ef9fe57c599fcd
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^tU#>J!3HFcb2r@pQfi(qjv*Ddk`o#l{`0(W2n_sa
t&+}O5kG+;h?ZN+x8I3$x0vTdN86s5<M7&yiVk1xogQu&X%Q~loCID!)91H*e

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/bg_infobar_new.9.png b/res/drawable-mdpi/bg_infobar_new.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3a83d4c8109025d600cea09ec740963e10e4690
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^tUxTy!3HF^Y<A@XQfZzpjv*Dd=AQQCI$*%#d@)90
zvGM)?^Ik1FabZ$b;KAE9InUo6+`IidTV_ml<CoVG&*v<VFYIBwbfcR6=EkjTo08Xx
z9^nuStg7r;Dl$Q~_?$wors@RQ<Q@g<HUWpSFZY`FJxZ=BWi-kto4=pMJp*VXgQu&X
J%Q~loCIE{sJz@X=

literal 0
HcmV?d00001

diff --git a/res/layout-finger/tab_account_name.xml b/res/layout-finger/tab_account_name.xml
index c9e1745..dc99af1 100644
--- a/res/layout-finger/tab_account_name.xml
+++ b/res/layout-finger/tab_account_name.xml
@@ -17,7 +17,7 @@
 <!-- looks like Widget.TextView.ListSeparator -->
 <TextView  xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/account_name"
-    android:background="@drawable/section_dark"
+    android:background="@drawable/bg_infobar_new"
     android:layout_width="fill_parent"
     android:layout_height="@dimen/account_name_height"
     android:layout_below="@+id/tab_scroll_view"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35c0bf8..6411578 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1156,6 +1156,6 @@
     <string name="split_explanation">Make this data its own contact.</string>
     
     <!-- Formatting string for account name -->
-    <string name="account_name_format">From account: <xliff:g id="account" example="user@gmail.com">%s</xliff:g></string>
+    <string name="account_name_format">From <xliff:g id="source" example="Gmail">%1$s</xliff:g> account: <xliff:g id="account" example="user@gmail.com">%2$s</xliff:g></string>
 
 </resources>
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 @@ public class ViewContactActivity extends Activity
                     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();
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 @@ public final class EditContactActivity extends Activity implements View.OnClickL
         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);
-- 
2.11.0