diff options
| -rwxr-xr-x[-rw-r--r--] | res/layout/editor_account_selector.xml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/editor/CompactRawContactsEditorView.java | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/editor/EditorUiUtils.java | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/editor/RawContactEditorView.java | 5 | ||||
| -rw-r--r-- | src/com/android/contacts/group/GroupEditorFragment.java | 7 |
5 files changed, 16 insertions, 5 deletions
diff --git a/res/layout/editor_account_selector.xml b/res/layout/editor_account_selector.xml index 2f883f276..3ca93d4cf 100644..100755 --- a/res/layout/editor_account_selector.xml +++ b/res/layout/editor_account_selector.xml @@ -35,7 +35,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/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java index 6a4256129..e04343c63 100644..100755 --- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java +++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java @@ -28,6 +28,8 @@ import com.android.contacts.common.model.account.AccountType; import com.android.contacts.common.model.account.AccountType.EditField; import com.android.contacts.common.model.account.AccountType.EditType; import com.android.contacts.common.model.account.AccountWithDataSet; +import com.android.contacts.common.model.account.PhoneAccountType; +import com.android.contacts.common.model.account.SimAccountType; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.SimContactsConstants; import com.android.contacts.common.MoreContactUtils; @@ -372,7 +374,8 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O return; } vlog("Account info loaded"); - if (accountInfo.first == null) { + if (accountInfo.first == null || SimAccountType.ACCOUNT_TYPE.equals(accountType. + accountType)|| PhoneAccountType.ACCOUNT_TYPE.equals(accountType.accountType)) { mAccountNameView.setVisibility(View.GONE); } else { mAccountNameView.setVisibility(View.VISIBLE); diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java index 78f7a42d2..33bc47418 100644..100755 --- a/src/com/android/contacts/editor/EditorUiUtils.java +++ b/src/com/android/contacts/editor/EditorUiUtils.java @@ -88,7 +88,7 @@ public class EditorUiUtils { */ public static Pair<String,String> getAccountInfo(Context context, boolean isProfile, String accountName, AccountType accountType) { - CharSequence accountTypeDisplayLabel = accountType.getDisplayLabel(context); + CharSequence accountTypeDisplayLabel = accountType.getDisplayLabel(context, accountName); if (isProfile) { if (TextUtils.isEmpty(accountName)) { diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java index 917a0680b..2741f2a68 100644..100755 --- a/src/com/android/contacts/editor/RawContactEditorView.java +++ b/src/com/android/contacts/editor/RawContactEditorView.java @@ -37,6 +37,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; @@ -197,7 +199,8 @@ public class RawContactEditorView extends BaseRawContactEditorView { // Hide this view so the other text view will be centered vertically mAccountHeaderNameTextView.setVisibility(View.GONE); } else { - if (accountInfo.first == null) { + if (accountInfo.first == null || SimAccountType.ACCOUNT_TYPE.equals(type.accountType) + || PhoneAccountType.ACCOUNT_TYPE.equals(type.accountType)) { mAccountHeaderNameTextView.setVisibility(View.GONE); } else { mAccountHeaderNameTextView.setVisibility(View.VISIBLE); diff --git a/src/com/android/contacts/group/GroupEditorFragment.java b/src/com/android/contacts/group/GroupEditorFragment.java index 25ff4747e..c8131dc8c 100644 --- a/src/com/android/contacts/group/GroupEditorFragment.java +++ b/src/com/android/contacts/group/GroupEditorFragment.java @@ -68,6 +68,7 @@ import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; import com.android.contacts.common.model.account.AccountType; import com.android.contacts.common.model.account.AccountWithDataSet; +import com.android.contacts.common.model.account.PhoneAccountType; import com.android.contacts.common.editor.SelectAccountDialogFragment; import com.android.contacts.group.SuggestedMemberListAdapter.SuggestedMember; import com.android.contacts.common.model.AccountTypeManager; @@ -423,9 +424,13 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog ImageView accountIcon = (ImageView) editorView.findViewById(R.id.account_icon); TextView accountTypeTextView = (TextView) editorView.findViewById(R.id.account_type); TextView accountNameTextView = (TextView) editorView.findViewById(R.id.account_name); - if (!TextUtils.isEmpty(mAccountName)) { + if (!TextUtils.isEmpty(mAccountName) + && !SimContactsConstants.PHONE_NAME.equals(mAccountName)) { accountNameTextView.setText( mContext.getString(R.string.from_account_format, mAccountName)); + accountNameTextView.setVisibility(View.VISIBLE); + } else { + accountNameTextView.setVisibility(View.GONE); } accountTypeTextView.setText(accountTypeDisplayLabel); accountIcon.setImageDrawable(accountType.getDisplayIcon(mContext)); |