Merge "Use MoreObjects.toStringHelper instead of Objects (1/2)" into ub-contactsdialer-h-dev
diff --git a/src/com/android/contacts/common/logging/ListEvent.java b/src/com/android/contacts/common/logging/ListEvent.java
index 7d019dd..47979bf 100644
--- a/src/com/android/contacts/common/logging/ListEvent.java
+++ b/src/com/android/contacts/common/logging/ListEvent.java
@@ -15,7 +15,7 @@
*/
package com.android.contacts.common.logging;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* Describes how user view and use a list
@@ -83,7 +83,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("actionType", actionType)
.add("listType", listType)
.add("count", count)
diff --git a/src/com/android/contacts/common/logging/QuickContactEvent.java b/src/com/android/contacts/common/logging/QuickContactEvent.java
index a1069ae..f19646f 100644
--- a/src/com/android/contacts/common/logging/QuickContactEvent.java
+++ b/src/com/android/contacts/common/logging/QuickContactEvent.java
@@ -15,7 +15,7 @@
*/
package com.android.contacts.common.logging;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* Describes how user views and takes action in Quick contact
@@ -78,7 +78,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("referrer", referrer)
.add("contactType", contactType)
.add("cardType", cardType)
diff --git a/src/com/android/contacts/common/logging/SearchState.java b/src/com/android/contacts/common/logging/SearchState.java
index f4719e4..d1224b4 100644
--- a/src/com/android/contacts/common/logging/SearchState.java
+++ b/src/com/android/contacts/common/logging/SearchState.java
@@ -18,7 +18,7 @@
import android.os.Parcel;
import android.os.Parcelable;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* Describes the results of a user search for a particular contact.
@@ -70,7 +70,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("queryLength", queryLength)
.add("numPartitions", numPartitions)
.add("numResults", numResults)
diff --git a/src/com/android/contacts/group/GroupMetaData.java b/src/com/android/contacts/group/GroupMetaData.java
index 3fe87d8..d9c0c27 100644
--- a/src/com/android/contacts/group/GroupMetaData.java
+++ b/src/com/android/contacts/group/GroupMetaData.java
@@ -28,7 +28,7 @@
import com.android.contacts.common.model.AccountTypeManager;
import com.android.contacts.common.model.account.AccountType;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/** Meta data for a contact group. */
public final class GroupMetaData implements Parcelable {
@@ -127,7 +127,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("accountName", accountName)
.add("accountType", accountType)
.add("dataSet", dataSet)