summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-06-01 15:56:37 -0700
committerWalter Jang <wjang@google.com>2015-06-01 15:56:37 -0700
commit28c98b7511b4c00b47abcce83a713c9bccf1b74a (patch)
tree63f3ee88b3f848b20274709210a2f6b04e5467cb /src
parent403743a0694aae952f3fd00235b7929dde3e1eca (diff)
downloadpackages_apps_Contacts-28c98b7511b4c00b47abcce83a713c9bccf1b74a.tar.gz
packages_apps_Contacts-28c98b7511b4c00b47abcce83a713c9bccf1b74a.tar.bz2
packages_apps_Contacts-28c98b7511b4c00b47abcce83a713c9bccf1b74a.zip
Can add mulitple email and phones on compact editor again
Bug 21162602 Change-Id: If484b5f3a0de2d6176863c19519ed63a45aa7c1d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/contacts/editor/CompactRawContactsEditorView.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index 88dd96952..fdb29ab4a 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -452,18 +452,18 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O
} else if (Nickname.CONTENT_ITEM_TYPE.equals(mimeType)) {
// Only add nicknames if there is a non-empty one
if (hasNonEmptyValuesDelta(rawContactDelta, mimeType, dataKind)) {
- mNicknames.addView(inflateKindSectionView(
- mNicknames, dataKind, rawContactDelta));
+ mNicknames.addView(inflateKindSectionView(mNicknames, dataKind,
+ rawContactDelta, /* showOneEmptyEditor =*/ false));
}
} else if (Phone.CONTENT_ITEM_TYPE.equals(mimeType)) {
- mPhoneNumbers.addView(inflateKindSectionView(
- mPhoneNumbers, dataKind, rawContactDelta));
+ mPhoneNumbers.addView(inflateKindSectionView(mPhoneNumbers, dataKind,
+ rawContactDelta, /* showOneEmptyEditor =*/ true));
} else if (Email.CONTENT_ITEM_TYPE.equals(mimeType)) {
- mEmails.addView(inflateKindSectionView(
- mEmails, dataKind, rawContactDelta));
+ mEmails.addView(inflateKindSectionView(mEmails, dataKind, rawContactDelta,
+ /* showOneEmptyEditor =*/ true));
} else if (hasNonEmptyValuesDelta(rawContactDelta, mimeType, dataKind)) {
- mOther.addView(inflateKindSectionView(
- mOther, dataKind, rawContactDelta));
+ mOther.addView(inflateKindSectionView(mOther, dataKind, rawContactDelta,
+ /* showOneEmptyEditor =*/ false));
}
}
}
@@ -594,14 +594,14 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O
}
private KindSectionView inflateKindSectionView(ViewGroup viewGroup, DataKind dataKind,
- RawContactDelta rawContactDelta) {
+ RawContactDelta rawContactDelta, boolean showOneEmptyEditor) {
final KindSectionView result = (KindSectionView) mLayoutInflater.inflate(
R.layout.item_kind_section, viewGroup, /* attachToRoot =*/ false);
result.setState(
dataKind,
rawContactDelta,
/* readOnly =*/ false,
- /* showOneEmptyEditor =*/ false,
+ showOneEmptyEditor,
mViewIdGenerator);
return result;
}