Write null into file ID when removing photo
Writing null into the file ID of the photos value delta
'after' will prevent the editor from trying to read it after a
rotation.
Have the photo editor view hold on to the MaterialPalette so we
use the same color for the default once a photo is removed.
Test: Manual usage of removing a photo from a contact with one and
rotating.
Bug: 25978539
Change-Id: I84c4b22c4064de1d788b08921a5c0164475865af
diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index 057a988..dd7d587 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -384,6 +384,7 @@
public void removePhoto() {
mPhotoValuesDelta.setFromTemplate(true);
mPhotoValuesDelta.put(Photo.PHOTO, (byte[]) null);
+ mPhotoValuesDelta.put(Photo.PHOTO_FILE_ID, (String) null);
mPhotoView.removePhoto();
}
@@ -940,7 +941,8 @@
return;
}
// Set the photo view
- mPhotoView.setPhoto(superPrimaryDelta, mMaterialPalette);
+ mPhotoView.setPalette(mMaterialPalette);
+ mPhotoView.setPhoto(superPrimaryDelta);
if (isReadOnlyRawContact()) {
mPhotoView.setReadOnly(true);