commit 5a49696d7f82a395980ed918f3e86c93222734d4
author Walter Jang <wjang@google.com> Fri Sep 09 18:32:50 2016 -0700
committer Walter Jang <wjang@google.com> Fri Sep 09 18:32:50 2016 -0700
tree 5b093ff234b90d60c1964f0e0613dd2122733fb7
parent 453a110b63aa3d7d9672a4f600db6733d75e51c1
parent 428824eaca7ed60c14add0a1d45edfe4535059bb

Merge commit '428824eaca7ed60c14add0a1d45edfe4535059bb' into manual_merge_428824e

Change-Id: I049ee9066aaa7ccd29cd9efddc46850f7fa3f018

src/com/android/contacts/ContactsDrawerActivity.java

diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 2d7bb34..45898fb 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -59,7 +59,7 @@
 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 @@
         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 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;
     }