diff options
author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-25 16:21:27 -0700 |
---|---|---|
committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-05 09:17:11 -0700 |
commit | 8a1a13a03b2d48e51d7b36e7592793422a791350 (patch) | |
tree | 3e5b56faafd990b6cbe394deb004757615b062eb /tests/src | |
parent | 3c5601055bf5edd4609861d16c836405dff14b44 (diff) | |
download | android_packages_apps_Dialer-8a1a13a03b2d48e51d7b36e7592793422a791350.tar.gz android_packages_apps_Dialer-8a1a13a03b2d48e51d7b36e7592793422a791350.tar.bz2 android_packages_apps_Dialer-8a1a13a03b2d48e51d7b36e7592793422a791350.zip |
Fix call log and contact lookup
Call log lookup was broken by InCallApi introduction.
Contact custom number labels weren't synced to dialer database, causing
the label to be shown as "custom" instead of the correct string during T9
dialpad search.
Use InCallApi plugin name as label if available, becauase some
plugins use the label column for strings that are too long to be
considered a label.
Ticket CD-460
Change-Id: I38bbbdbee23598e5d6ca6347ed77ae9c318a1c6b
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/dialer/calllog/CallLogAdapterTest.java | 3 | ||||
-rw-r--r-- | tests/src/com/android/dialer/database/SmartDialPrefixTest.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java index d3f7be33b..d3272b2e3 100644 --- a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java @@ -60,7 +60,8 @@ public class CallLogAdapterTest extends AndroidTestCase { ContactInfoHelper fakeContactInfoHelper = new ContactInfoHelper(getContext(), TEST_COUNTRY_ISO) { @Override - public ContactInfo lookupNumber(String number, String countryIso) { + public ContactInfo lookupNumber(String number, String countryIso, + boolean isInCallPluginContactId) { ContactInfo info = new ContactInfo(); info.number = number; info.formattedNumber = number; diff --git a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java index 6c63889f4..53d219748 100644 --- a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java +++ b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java @@ -137,13 +137,13 @@ public class SmartDialPrefixTest extends AndroidTestCase { private ContactNumber constructNewContactWithDummyIds(MatrixCursor contactCursor, MatrixCursor nameCursor, String number, int id, String displayName) { return constructNewContact(contactCursor, nameCursor, id, number, id, String.valueOf(id), - displayName, 0, 0, 0, 0, 0, 0, 0, null, 0); + displayName, 0, 0, 0, 0, 0, 0, 0, null, 0, null); } private ContactNumber constructNewContact(MatrixCursor contactCursor, MatrixCursor nameCursor, int id, String number, int contactId, String lookupKey, String displayName, int photoId, int lastTimeUsed, int timesUsed, int starred, int isSuperPrimary, int inVisibleGroup, - int isPrimary, String mimetype, int phoneType) { + int isPrimary, String mimetype, int phoneType, String phoneLabel) { assertNotNull(contactCursor); assertNotNull(nameCursor); @@ -159,7 +159,7 @@ public class SmartDialPrefixTest extends AndroidTestCase { nameCursor.addRow(new Object[]{displayName, contactId}); return new ContactNumber(contactId, id, displayName, number, lookupKey, 0, mimetype, - phoneType); + phoneType, phoneLabel); } private ArrayList<ContactNumber> getLooseMatchesFromDb(String query) { |