summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src-bind/com/android/contactsbind/FeatureHighlightHelper.java4
-rw-r--r--src/com/android/contacts/activities/PeopleActivity.java3
-rw-r--r--src/com/android/contacts/list/DefaultContactBrowseListFragment.java4
3 files changed, 10 insertions, 1 deletions
diff --git a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
index c2461413f..be1833d67 100644
--- a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
+++ b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
@@ -26,4 +26,8 @@ public final class FeatureHighlightHelper {
public static boolean showHamburgerFeatureHighlight(final FragmentActivity activity) {
return false;
}
+
+ public static boolean tryRemoveHighlight(final FragmentActivity activity) {
+ return false;
+ }
}
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 4464c44e7..9a0aba59f 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -659,9 +659,10 @@ public class PeopleActivity extends ContactsDrawerActivity implements ProviderSt
}
} 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()) {
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 310d4d943..f92e0abab 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -269,6 +269,10 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
}
}
+ 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