change the display name for SIM and phone account

- change the account name and icon for SIM and phone account
- change the SIM name for Ip call

Change-Id: Ieb9626bdf89b646b0073e307e855f7e3e95bd91e

4 files changed, 13 insertions, 6 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6dfc778d0..5c3a69998 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -457,7 +457,8 @@
         <activity android:name=".group.local.GroupEditActivity" />
 
         <activity android:name=".group.local.MemberListActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Holo.Light">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout/editor_account_header_with_dropdown.xml b/res/layout/editor_account_header_with_dropdown.xml
index 86ee9fa9c..605d6d531 100644
--- a/res/layout/editor_account_header_with_dropdown.xml
+++ b/res/layout/editor_account_header_with_dropdown.xml
@@ -30,7 +30,7 @@
 
     <LinearLayout
         android:id="@+id/account"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_width="0dip"
         android:layout_weight="1"
         android:orientation="vertical"
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 4eb1c6f58..cce39b106 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -2048,13 +2048,15 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen
             // add limit length to show IP call item
             if (selectedEntry.data.length() > MAX_NUM_LENGTH) {
                 if (MoreContactUtils.isMultiSimEnable(mContext, MSimConstants.SUB1)) {
-                    String sub1Name = MoreContactUtils.getSimSpnName(MSimConstants.SUB1);
+                    String sub1Name = MoreContactUtils.getMultiSimAliasesName(
+                            mContext, MSimConstants.SUB1);
                     menu.add(ContextMenu.NONE, ContextMenuIds.IPCALL1, ContextMenu.NONE,
                             mContext.getString(com.android.contacts.common.R.string
                             .ip_call_by_slot, sub1Name));
                 }
                 if (MoreContactUtils.isMultiSimEnable(mContext, MSimConstants.SUB2)) {
-                    String sub2Name = MoreContactUtils.getSimSpnName(MSimConstants.SUB2);
+                    String sub2Name = MoreContactUtils.getMultiSimAliasesName(
+                            mContext, MSimConstants.SUB2);
                     menu.add(ContextMenu.NONE, ContextMenuIds.IPCALL2, ContextMenu.NONE,
                             mContext.getString(com.android.contacts.common.R.string
                             .ip_call_by_slot, sub2Name));
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 362c670b7..8bf1a25b4 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -44,6 +44,8 @@ import android.widget.TextView;
 import com.android.contacts.GroupMetaDataLoader;
 import com.android.contacts.R;
 import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.common.model.account.PhoneAccountType;
+import com.android.contacts.common.model.account.SimAccountType;
 import com.android.contacts.common.model.account.AccountType.EditType;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.model.RawContactDelta;
@@ -246,11 +248,13 @@ public class RawContactEditorView extends BaseRawContactEditorView {
             }
         } else {
             String accountName = state.getAccountName();
-            CharSequence accountType = type.getDisplayLabel(mContext);
+            String account = state.getAccountType();
+            CharSequence accountType = type.getDisplayLabel(mContext, accountName);
             if (TextUtils.isEmpty(accountType)) {
                 accountType = mContext.getString(R.string.account_phone);
             }
-            if (!TextUtils.isEmpty(accountName)) {
+            if (!TextUtils.isEmpty(accountName) && !SimAccountType.ACCOUNT_TYPE.equals(account)
+                    && !PhoneAccountType.ACCOUNT_TYPE.equals(account)) {
                 mAccountNameTextView.setVisibility(View.VISIBLE);
                 mAccountNameTextView.setText(
                         mContext.getString(R.string.from_account_format, accountName));