commit 4249372d4fcdac8023d4b73a984d56743c0cd558
author Paul Soulos <psoulos@google.com> Mon Oct 13 05:00:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 13 05:00:20 2014 +0000
tree a51a20b89cbad2a97a49324fd8a221c33738663b
parent 5d4bd6d50c2486d8d21a4eff45b294ba7d343c4b
parent 2e255f876a977559a6e00e866f4f23f6020d152d

am 2e255f87: am de3dc40d: am 97b1e2d6: Fixes a renaming bug (renamed instantiation without refactoring uses)

* commit '2e255f876a977559a6e00e866f4f23f6020d152d':
  Fixes a renaming bug (renamed instantiation without refactoring uses)

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 268b151..b7270e8 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1510,12 +1510,12 @@
                                             dataItem, secondDataItem, alternateContentDescription,
                                             header, text, context);
 
-                            populateGPlusOrHangoutsDataItemModel(bundle);
-                            intent = bundle.intent;
-                            alternateIntent = bundle.alternateIntent;
-                            alternateContentDescription = bundle.alternateContentDescription;
-                            header = bundle.header;
-                            text = bundle.text;
+                            populateGPlusOrHangoutsDataItemModel(itemModel);
+                            intent = itemModel.intent;
+                            alternateIntent = itemModel.alternateIntent;
+                            alternateContentDescription = itemModel.alternateContentDescription;
+                            header = itemModel.header;
+                            text = itemModel.text;
                         } else {
                             if (GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE.equals(
                                     intent.getDataString())) {
@@ -1531,17 +1531,17 @@
                         if (secondDataItem != null) {
                             icon = res.getDrawable(R.drawable.ic_hangout_24dp);
                             alternateIcon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
-                            final GPlusOrHangoutsDataItemModel bundle =
+                            final GPlusOrHangoutsDataItemModel itemModel =
                                     new GPlusOrHangoutsDataItemModel(intent, alternateIntent,
                                             dataItem, secondDataItem, alternateContentDescription,
                                             header, text, context);
 
-                            populateGPlusOrHangoutsDataItemModel(bundle);
-                            intent = bundle.intent;
-                            alternateIntent = bundle.alternateIntent;
-                            alternateContentDescription = bundle.alternateContentDescription;
-                            header = bundle.header;
-                            text = bundle.text;
+                            populateGPlusOrHangoutsDataItemModel(itemModel);
+                            intent = itemModel.intent;
+                            alternateIntent = itemModel.alternateIntent;
+                            alternateContentDescription = itemModel.alternateContentDescription;
+                            header = itemModel.header;
+                            text = itemModel.text;
                         } else {
                             if (HANGOUTS_DATA_5_VIDEO.equals(intent.getDataString())) {
                                 icon = res.getDrawable(R.drawable.ic_hangout_video_24dp);