commit 62e6e4d8ed36623fc3d601438b3616e72bad0d64
author Tingting Wang <tingtingw@google.com> Mon Nov 16 18:55:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 16 18:55:23 2015 +0000
tree 9f21179e50e76870ace82e2f7bf4eb514c3c18e1
parent 3184fc86688ca9a769072d7c4288afd5438e0c53
parent d482e0c41f5ebc7a11b781f6dcfbaed1f4f7ba3a

Merge "Show visible and non deleted editor view to Editor UI." into ub-contactsdialer-a-dev

src/com/android/contacts/editor/CompactRawContactsEditorView.java

diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index eadebc8..0ccc2a7 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -464,7 +464,7 @@
     public void updatePhoto(Uri photoUri) {
         mPhotoValuesDelta.setFromTemplate(false);
         // Unset primary for all photos
-        unsetSuperPrimaryFromAllWritablePhotos();
+        unsetSuperPrimaryFromAllPhotos();
         // Mark the currently displayed photo as primary
         mPhotoValuesDelta.setSuperPrimary(true);
 
@@ -487,14 +487,12 @@
         mPhotoView.setFullSizedPhoto(photoUri);
     }
 
-    private void unsetSuperPrimaryFromAllWritablePhotos() {
+    private void unsetSuperPrimaryFromAllPhotos() {
         final List<KindSectionData> kindSectionDataList =
                 mKindSectionDataMap.get(Photo.CONTENT_ITEM_TYPE);
         for (KindSectionData kindSectionData : kindSectionDataList) {
-            if (kindSectionData.getAccountType().areContactsWritable()) {
-                for (ValuesDelta valuesDelta : kindSectionData.getNonEmptyValuesDeltas()) {
-                    valuesDelta.setSuperPrimary(false);
-                }
+            for (ValuesDelta valuesDelta : kindSectionData.getNonEmptyValuesDeltas()) {
+                valuesDelta.setSuperPrimary(false);
             }
         }
     }
@@ -587,7 +585,7 @@
         final ValuesDelta valuesDelta = valuesDeltaList.get(photo.valuesDeltaListIndex);
         valuesDelta.setFromTemplate(false);
         // Unset primary for all photos
-        unsetSuperPrimaryFromAllWritablePhotos();
+        unsetSuperPrimaryFromAllPhotos();
         // Mark the currently displayed photo as primary
         valuesDelta.setSuperPrimary(true);
         // Update the UI