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 ab81780..0ccc2a7 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -708,7 +708,7 @@
 
                 vlog("parse: " + i + " " + dataKind.mimeType + " " +
                         kindSectionData.getValuesDeltas().size() + " value(s) " +
-                        kindSectionData.getNonEmptyValuesDeltas().size() + " non-empty value(s)" +
+                        kindSectionData.getNonEmptyValuesDeltas().size() + " non-empty value(s) " +
                         kindSectionData.getVisibleValuesDeltas().size() +
                         " visible value(s)");
             }

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

diff --git a/src/com/android/contacts/editor/KindSectionData.java b/src/com/android/contacts/editor/KindSectionData.java
index bd9f687..7e2899f 100644
--- a/src/com/android/contacts/editor/KindSectionData.java
+++ b/src/com/android/contacts/editor/KindSectionData.java
@@ -53,12 +53,12 @@
         return valuesDeltas == null ? new ArrayList<ValuesDelta>() : valuesDeltas;
     }
 
-    /** Returns visible and non no-op ValuesDeltas for the data kind this section represents. */
+    /** Returns visible and non deleted ValuesDeltas for the data kind this section represents. */
     public List<ValuesDelta> getVisibleValuesDeltas() {
         final ArrayList<ValuesDelta> valuesDeltas = new ArrayList<> ();
         for (ValuesDelta valuesDelta : getValuesDeltas()) {
             // Same conditions as KindSectionView#rebuildFromState
-            if (valuesDelta.isVisible() && !valuesDelta.isNoop()) {
+            if (valuesDelta.isVisible() && !valuesDelta.isDelete()) {
                 valuesDeltas.add(valuesDelta);
             }
         }