commit 5a00de39004d298de4daee3e183add5eff17102c
author Gary Mai <garymai@google.com> Wed Oct 19 18:20:41 2016 -0700
committer Gary Mai <garymai@google.com> Thu Oct 20 12:02:43 2016 -0700
tree 57172cd4f8c5de770c385287e55f674f8e55441e
parent 2694dee49ad3d7856215faa97aa416ab67fc0d27

Update logic on when raw contact picker dialog is shown

Shouldn't be based on count of raw contacts, but whether writable
raw contacts exist.

Test:
Edit me profile that has 2 G+ accounts linked (where the me profile
has not already been created)
Edit an aggregate composed of 2 read-only accounts.
Edit aggregate of 1 write 1 read
Edit 1 read-only
Edit 1 write

Bug: 32289543
Bug: 31826229
Bug: 31088704
Change-Id: Ib01445b59fa9fc882a6d32d24f39917d726e6174

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

diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 038a8de..1b37dab 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -206,7 +206,6 @@
     private RawContactDeltaList mRawContactDeltas;
     private RawContactDelta mCurrentRawContactDelta;
     private long mRawContactIdToDisplayAlone = -1;
-    private boolean mIsEditingReadOnlyRawContactWithNewContact;
     private Map<String, KindSectionData> mKindSectionDataMap = new HashMap<>();
     private Set<String> mSortedMimetypes = new TreeSet<>(new MimeTypeComparator());
 
@@ -429,11 +428,10 @@
     public void setState(RawContactDeltaList rawContactDeltas,
             MaterialColorMapUtils.MaterialPalette materialPalette, ViewIdGenerator viewIdGenerator,
             boolean hasNewContact, boolean isUserProfile, AccountWithDataSet primaryAccount,
-            long rawContactIdToDisplayAlone, boolean isEditingReadOnlyRawContactWithNewContact) {
+            long rawContactIdToDisplayAlone) {
 
         mRawContactDeltas = rawContactDeltas;
         mRawContactIdToDisplayAlone = rawContactIdToDisplayAlone;
-        mIsEditingReadOnlyRawContactWithNewContact = isEditingReadOnlyRawContactWithNewContact;
 
         mKindSectionViewMap.clear();
         mKindSectionViews.removeAllViews();