Merge commit '428824eaca7ed60c14add0a1d45edfe4535059bb' into manual_merge_428824e (5a49696d) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsDrawerActivity.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ import com.android.contacts.editor.CompactContactEditorFragment;
		import com.android.contacts.editor.SelectAccountDialogFragment;
		import com.android.contacts.group.GroupListItem;
		import com.android.contacts.group.GroupMembersFragment;
		import com.android.contacts.group.GroupMetadata;
		import com.android.contacts.group.GroupMetaData;
		import com.android.contacts.group.GroupNameEditDialogFragment;
		import com.android.contacts.group.GroupUtil;
		import com.android.contacts.group.GroupsFragment;
		@@ -343,7 +343,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i
		subMenu.removeGroup(R.id.nav_groups_items);
		mGroupMenuMap = new HashMap<>();

		final GroupMetadata groupMetaData = getGroupMetadata();
		final GroupMetaData groupMetaData = getGroupMetaData();

		if (groupListItems != null) {
		// Add each group
		@@ -406,15 +406,15 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i
		}
		}

		public void updateGroupMenu(GroupMetadata groupMetadata) {
		public void updateGroupMenu(GroupMetaData groupMetaData) {
		clearCheckedMenus();
		if (groupMetadata != null && mGroupMenuMap != null
		&& mGroupMenuMap.get(groupMetadata.groupId) != null) {
		setMenuChecked(mGroupMenuMap.get(groupMetadata.groupId), true);
		if (groupMetaData != null && mGroupMenuMap != null
		&& mGroupMenuMap.get(groupMetaData.groupId) != null) {
		setMenuChecked(mGroupMenuMap.get(groupMetaData.groupId), true);
		}
		}

		protected GroupMetadata getGroupMetadata() {
		protected GroupMetaData getGroupMetaData() {
		return null;
		}

src/com/android/contacts/GroupMetaDataLoader.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import com.android.contacts.group.GroupUtil;
		*/
		public final class GroupMetaDataLoader extends CursorLoader {

		private final static String[] COLUMNS = new String[] {
		public final static String[] COLUMNS = new String[] {
		Groups.ACCOUNT_NAME,
		Groups.ACCOUNT_TYPE,
		Groups.DATA_SET,

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ import com.android.contacts.common.util.ImplicitIntentsUtil;
		import com.android.contacts.common.widget.FloatingActionButtonController;
		import com.android.contacts.editor.EditorIntents;
		import com.android.contacts.group.GroupMembersFragment;
		import com.android.contacts.group.GroupMetadata;
		import com.android.contacts.group.GroupMetaData;
		import com.android.contacts.group.GroupUtil;
		import com.android.contacts.list.ContactsIntentResolver;
		import com.android.contacts.list.ContactsRequest;
		@@ -921,7 +921,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements ProviderSt
		}

		@Override
		protected GroupMetadata getGroupMetadata() {
		return mMembersFragment == null ? null : mMembersFragment.getGroupMetadata();
		protected GroupMetaData getGroupMetaData() {
		return mMembersFragment == null ? null : mMembersFragment.getGroupMetaData();
		}
		}

src/com/android/contacts/common/GroupMetaData.java

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/
		package com.android.contacts.common;

		/**
		* Meta-data for a contact group. We load all groups associated with the contact's
		* constituent accounts.
		*/
		public final class GroupMetaData {
		private String mAccountName;
		private String mAccountType;
		private String mDataSet;
		private long mGroupId;
		private String mTitle;
		private boolean mDefaultGroup;
		private boolean mFavorites;

		public GroupMetaData(String accountName, String accountType, String dataSet, long groupId,
		String title, boolean defaultGroup, boolean favorites) {
		this.mAccountName = accountName;
		this.mAccountType = accountType;
		this.mDataSet = dataSet;
		this.mGroupId = groupId;
		this.mTitle = title;
		this.mDefaultGroup = defaultGroup;
		this.mFavorites = favorites;
		}

		public String getAccountName() {
		return mAccountName;
		}

		public String getAccountType() {
		return mAccountType;
		}

		public String getDataSet() {
		return mDataSet;
		}

		public long getGroupId() {
		return mGroupId;
		}

		public String getTitle() {
		return mTitle;
		}

		public boolean isDefaultGroup() {
		return mDefaultGroup;
		}

		public boolean isFavorites() {
		return mFavorites;
		}
		}
		No newline at end of file

src/com/android/contacts/common/model/Contact.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,16 +24,15 @@ import android.provider.ContactsContract.Data;
		import android.provider.ContactsContract.Directory;
		import android.provider.ContactsContract.DisplayNameSources;

		import com.android.contacts.common.GroupMetaData;
		import com.android.contacts.common.model.account.AccountType;
		import com.android.contacts.common.util.DataStatus;
		import com.android.contacts.group.GroupMetaData;

		import com.google.common.annotations.VisibleForTesting;
		import com.google.common.collect.ImmutableList;
		import com.google.common.collect.ImmutableMap;

		import java.util.ArrayList;
		import java.util.Collections;

		/**
		* A Contact represents a single person or logical entity as perceived by the user. The information