Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60ca24d8 authored Sep 13, 2016 by Wenyi Wang

resolve merge conflicts of 51819e80 to master

Change-Id: Ic4ca267c2f2726763aba2921940f4d8d32d3eb14

parents 6fa5e171 51819e80

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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()) {

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -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