Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15c6f183 authored by yaolu's avatar yaolu Committed by android-build-merger
Browse files

Update QuickContactEvent field names to match proto file (1/2)

am: 7a09c70a

Change-Id: I00b70363693b4c573922cbfa3f9506eff5fe6183
parents 1f1c3eaf 7a09c70a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public final class QuickContactEvent {
        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 final class QuickContactEvent {
        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;
    }
+4 −4
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ public class QuickContactActivity extends ContactsActivity
            return;
        }

        mIsRecreatedInstance = (savedInstanceState != null);
        mIsRecreatedInstance = savedInstanceState != null;
        mShouldLog = true;

        // There're 3 states for each permission:
@@ -2069,7 +2069,7 @@ public class QuickContactActivity extends ContactsActivity
            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(),
@@ -3070,7 +3070,7 @@ public class QuickContactActivity extends ContactsActivity
                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();
                }