diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-15 11:23:20 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-06-15 13:16:11 -0700 |
commit | e224017d69630c3b3aea2667e26ab91bb9ecc0be (patch) | |
tree | da0b64aee475a9d7ec0792e79546e7f2c90dca6e /tests/src/com/android/dialer | |
parent | af049afaef6c2ca581be4214b8d9494117beb48c (diff) |
Fix abundance of "Custom" labels.
Not sure precisely why this changed, but hopefully this logic is
more robust. Show the geocoded location if there is no name to use
and a location is available.
Removed GEOCODE_AS_LABEL, which wasn't really used anymore.
Bug: 21814339
Change-Id: I1343282ef415647853d7995d900a3f50186ad156
Diffstat (limited to 'tests/src/com/android/dialer')
-rw-r--r-- | tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java | 1 | ||||
-rw-r--r-- | tests/src/com/android/dialer/calllog/CallLogFragmentTest.java | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index 9edbbc9b3..2ee38cbe5 100644 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -389,7 +389,6 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { details.date = TEST_DATE; details.duration = TEST_DURATION; details.geocode = TEST_GEOCODE; - details.numberLabel = ContactInfo.GEOCODE_AS_LABEL; } private boolean isVoicemail(String number) { diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index df6719c38..18b78f127 100644 --- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java @@ -227,8 +227,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_WithCachedName() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@value com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_HOME, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) @@ -255,8 +253,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_HomeLabel() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@value com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_HOME, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) @@ -270,8 +266,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_WorkLabel() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@link com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_WORK, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) |