commit be5e1b109ce134c7f3f45cd4fc27b69454d7ad31
author Walter Jang <wjang@google.com> Sat Oct 17 11:38:29 2015 -0700
committer Walter Jang <wjang@google.com> Sat Oct 17 11:38:29 2015 -0700
tree e1dbaf9ac83250694fa77e261d70431d324e4b73
parent 9488a766fd27dfe5324205a95e9465aacc470e58

Show "local only" account name for me profile

Bug 24988734

Change-Id: Ief827757e148d240ec74b46c1dfbb11c1c68a18c

src/com/android/contacts/editor/CompactRawContactsEditorView.java

diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index e02e35a..900889e 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -781,9 +781,13 @@
         }
 
         // Get the account information for the primary raw contact delta
-        final Pair<String,String> accountInfo = EditorUiUtils.getAccountInfo(getContext(),
-                mIsUserProfile, mPrimaryRawContactDelta.getAccountName(),
-                mPrimaryRawContactDelta.getAccountType(mAccountTypeManager));
+        final Pair<String,String> accountInfo = mIsUserProfile
+                ? EditorUiUtils.getLocalAccountInfo(getContext(),
+                        mPrimaryRawContactDelta.getAccountName(),
+                        mPrimaryRawContactDelta.getAccountType(mAccountTypeManager))
+                : EditorUiUtils.getAccountInfo(getContext(),
+                        mPrimaryRawContactDelta.getAccountName(),
+                        mPrimaryRawContactDelta.getAccountType(mAccountTypeManager));
 
         // The account header and selector show the same information so both shouldn't be visible
         // at the same time
@@ -801,12 +805,39 @@
             mAccountSelectorContainer.setVisibility(View.GONE);
             addRawContactAccountSelector(rawContactDeltas);
         } else {
-            addAccountHeader(accountInfo);
+            if (mIsUserProfile) {
+                addLocalAccountHeader(accountInfo);
+            } else {
+                addAccountHeader(accountInfo);
+            }
             mAccountSelectorContainer.setVisibility(View.GONE);
         }
     }
 
+    private void addLocalAccountHeader(Pair<String,String> accountInfo) {
+        // Set the account name
+        final String accountName = TextUtils.isEmpty(accountInfo.first)
+                ? accountInfo.second : accountInfo.first;
+        mAccountHeaderName.setVisibility(View.VISIBLE);
+        mAccountHeaderName.setText(accountName);
+
+        // Set the account type
+        final String selectorTitle = getResources().getString(
+                R.string.compact_editor_account_selector_title);
+        mAccountHeaderType.setText(selectorTitle);
+
+        // Set the icon
+        final AccountType primaryAccountType =
+                mPrimaryRawContactDelta.getRawContactAccountType(getContext());
+        mAccountHeaderIcon.setImageDrawable(primaryAccountType.getDisplayIcon(getContext()));
+
+        // Set the content description
+        mAccountHeaderContainer.setContentDescription(
+                EditorUiUtils.getAccountInfoContentDescription(accountName, selectorTitle));
+    }
+
     private void addAccountHeader(Pair<String,String> accountInfo) {
+        // Set the account name
         if (TextUtils.isEmpty(accountInfo.first)) {
             // Hide this view so the other text view will be centered vertically
             mAccountHeaderName.setVisibility(View.GONE);
@@ -815,14 +846,17 @@
             mAccountHeaderName.setText(accountInfo.first);
         }
 
+        // Set the account type
         final String selectorTitle = getResources().getString(
                 R.string.compact_editor_account_selector_title);
         mAccountHeaderType.setText(selectorTitle);
 
+        // Set the icon
         final AccountType primaryAccountType = mPrimaryRawContactDelta.getRawContactAccountType(
                 getContext());
         mAccountHeaderIcon.setImageDrawable(primaryAccountType.getDisplayIcon(getContext()));
 
+        // Set the content description
         mAccountHeaderContainer.setContentDescription(
                 EditorUiUtils.getAccountInfoContentDescription(
                         accountInfo.first, selectorTitle));