summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/editor/CompactContactEditorFragment.java
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-06-01 12:17:06 -0700
committerWalter Jang <wjang@google.com>2015-06-03 13:27:53 -0700
commitac679af994faece43536f1e8b2613f30c50300e1 (patch)
tree829f4126293b2d868742fbef0acc7b4b55334cbb /src/com/android/contacts/editor/CompactContactEditorFragment.java
parenta267ba3b0b7a2f8bbcc308bc94b9e92986faa333 (diff)
downloadpackages_apps_Contacts-ac679af994faece43536f1e8b2613f30c50300e1.tar.gz
packages_apps_Contacts-ac679af994faece43536f1e8b2613f30c50300e1.tar.bz2
packages_apps_Contacts-ac679af994faece43536f1e8b2613f30c50300e1.zip
Pass the preferred photo ID into the contact editor
Bug 21498424 Change-Id: I35e8fa3cff4d963f8017bdd596132fe749479a17
Diffstat (limited to 'src/com/android/contacts/editor/CompactContactEditorFragment.java')
-rw-r--r--src/com/android/contacts/editor/CompactContactEditorFragment.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 10efe1008..64bcf8683 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -201,7 +201,7 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl
// Add input fields for the loaded Contact
final CompactRawContactsEditorView editorView = getContent();
editorView.setListener(this);
- editorView.setState(mState, getMaterialPalette(), mViewIdGenerator);
+ editorView.setState(mState, getMaterialPalette(), mViewIdGenerator, mPhotoId);
// Set up the photo widget
mPhotoHandler = createPhotoHandler();
@@ -357,7 +357,8 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl
final Intent intent = isInsert
? EditorIntents.createInsertContactIntent(
mState, getDisplayName(), getPhoneticName(), mUpdatedPhotos)
- : EditorIntents.createEditContactIntent(mLookupUri, getMaterialPalette());
+ : EditorIntents.createEditContactIntent(mLookupUri, getMaterialPalette(),
+ mPhotoId);
ImplicitIntentsUtil.startActivityInApp(getActivity(), intent);
getActivity().finish();