commit 87de74950dac5ca9b472fcbe8025069c6aba6dae
author Gary Mai <garymai@google.com> Wed Sep 07 20:37:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 07 20:37:42 2016 +0000
tree 9f66a56a9fc35c1e648c8a32757f784344f0371f
parent 870ea400609bcbcc35f87aab701e24bb30d4356b
parent 3e9637f91b3b7f985212e1c9d6d94c996c13100e

Merge "Import new expand icons" into ub-contactsdialer-g-dev

src/com/android/contacts/common/logging/QuickContactEvent.java

diff --git a/src/com/android/contacts/common/logging/QuickContactEvent.java b/src/com/android/contacts/common/logging/QuickContactEvent.java
index 079e435..a1069ae 100644
--- a/src/com/android/contacts/common/logging/QuickContactEvent.java
+++ b/src/com/android/contacts/common/logging/QuickContactEvent.java
@@ -62,7 +62,7 @@
         public static final int UNSTAR = 3;
         public static final int EDIT = 4;
         public static final int ADD = 5;
-        public static final int DELETE = 6;
+        public static final int REMOVE = 6;
         public static final int SHARE = 7;
         public static final int SHORTCUT = 8;
         public static final int HELP = 9;
@@ -71,7 +71,7 @@
         public static final int VIDEOCALL = 12;
         public static final int EMAIL = 13;
         public static final int SIPCALL = 14;
-        public static final int MAP = 15;
+        public static final int ADDRESS = 15;
         public static final int DIRECTIONS = 16;
         public static final int THIRD_PARTY = 17;
     }

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 73c3c78..40bcd55 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -977,7 +977,7 @@
             return;
         }
 
-        mIsRecreatedInstance = (savedInstanceState != null);
+        mIsRecreatedInstance = savedInstanceState != null;
         mShouldLog = true;
 
         // There're 3 states for each permission:
@@ -1364,7 +1364,7 @@
             newContactType = ContactType.UNKNOWN_TYPE;
         }
         if (mShouldLog && mContactType != newContactType) {
-            Logger.logQuickContactEvent( mReferrer, newContactType, CardType.UNKNOWN_CARD,
+            Logger.logQuickContactEvent(mReferrer, newContactType, CardType.UNKNOWN_CARD,
                     actionType, /* thirdPartyAction */ null);
         }
         mContactType = newContactType;
@@ -2114,7 +2114,7 @@
             if (!TextUtils.isEmpty(postalAddress)) {
                 primaryContentDescription.append(res.getString(R.string.map_other)).append(" ");
                 intent = StructuredPostalUtils.getViewPostalAddressIntent(postalAddress);
-                intent.putExtra(EXTRA_ACTION_TYPE, ActionType.MAP);
+                intent.putExtra(EXTRA_ACTION_TYPE, ActionType.ADDRESS);
                 header = postal.getFormattedAddress();
                 entryContextMenuInfo = new EntryContextMenuInfo(header,
                         res.getString(R.string.postalLabelsGroup), dataItem.getMimeType(),
@@ -3114,7 +3114,7 @@
                 return true;
             case R.id.menu_delete:
                 Logger.logQuickContactEvent(mReferrer, mContactType, CardType.UNKNOWN_CARD,
-                        ActionType.DELETE, /* thirdPartyAction */ null);
+                        ActionType.REMOVE, /* thirdPartyAction */ null);
                 if (isContactEditable()) {
                     deleteContact();
                 }