commit 60ca24d89fea34b1b7b8f4a4bc53ffaa3adfbcc3
author Wenyi Wang <wenyiw@google.com> Tue Sep 13 21:50:47 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Tue Sep 13 23:05:14 2016 -0700
tree 05b952b1f48ad4a142c17b57180f6429a00c22a4
parent 6fa5e1718008b6296310ab9713b4fbf85180c54d
parent 51819e8072cc7c01f704fab1d19b9bc359e7d528

resolve merge conflicts of 51819e8 to master

Change-Id: Ic4ca267c2f2726763aba2921940f4d8d32d3eb14

src-bind/com/android/contactsbind/FeatureHighlightHelper.java

diff --git a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
index c246141..be1833d 100644
--- a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
+++ b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
@@ -26,4 +26,8 @@
     public static boolean showHamburgerFeatureHighlight(final FragmentActivity activity) {
         return false;
     }
+
+    public static boolean tryRemoveHighlight(final FragmentActivity activity) {
+        return false;
+    }
 }

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 4464c44..9a0aba5 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -659,9 +659,10 @@
             }
         } else if (isDuplicatesView()) {
             switchToAllContacts();
+        } else if (mAllFragment.tryRemoveHighlight()) {
+            return;
         } else if (isAllFragmentInSelectionMode()) {
             mAllFragment.getActionBarAdapter().setSelectionMode(false);
-            mAllFragment.displayCheckBoxes(false);
         } else if (isAllFragmentInSearchMode()) {
             mAllFragment.getActionBarAdapter().setSearchMode(false);
             if (mAllFragment.wasSearchResultClicked()) {

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 310d4d9..f92e0ab 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -269,6 +269,10 @@
         }
     }
 
+    public boolean tryRemoveHighlight() {
+        return FeatureHighlightHelper.tryRemoveHighlight(mActivity);
+    }
+
     private void bindListHeader(int numberOfContacts) {
         final ContactListFilter filter = getFilter();
         // If the phone has at least one Google account whose sync status is unsyncable or pending