From ab146531c0710ad46ac347d280b14c798f732a12 Mon Sep 17 00:00:00 2001 From: linyuh Date: Tue, 19 Dec 2017 11:28:51 -0800 Subject: Support dual alphabets in smart dial. Bug: 30215380,70633239 Test: CompositeSmartDialMapTest, LatinSmartDialMapTest, RussianSmartDialMapTest, SmartDialNameMatcherTest PiperOrigin-RevId: 179580982 Change-Id: I5e4c3e61f0dfdc6ca1e80a93bb985ffec08dd8b0 --- java/com/android/dialer/database/DialerDatabaseHelper.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'java/com/android/dialer/database') diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java index 113e86314..b0bd62a34 100644 --- a/java/com/android/dialer/database/DialerDatabaseHelper.java +++ b/java/com/android/dialer/database/DialerDatabaseHelper.java @@ -535,7 +535,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { insert.executeInsert(); final String contactPhoneNumber = updatedContactCursor.getString(PhoneQuery.PHONE_NUMBER); final ArrayList numberPrefixes = - SmartDialPrefix.parseToNumberTokens(contactPhoneNumber); + SmartDialPrefix.parseToNumberTokens(mContext, contactPhoneNumber); for (String numberPrefix : numberPrefixes) { numberInsert.bindLong(1, updatedContactCursor.getLong(PhoneQuery.PHONE_CONTACT_ID)); @@ -578,7 +578,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { while (nameCursor.moveToNext()) { /** Computes a list of prefixes of a given contact name. */ final ArrayList namePrefixes = - SmartDialPrefix.generateNamePrefixes(nameCursor.getString(columnIndexName)); + SmartDialPrefix.generateNamePrefixes(mContext, nameCursor.getString(columnIndexName)); for (String namePrefix : namePrefixes) { insert.bindLong(1, nameCursor.getLong(columnIndexContactId)); @@ -912,8 +912,9 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { /** * If the contact has either the name or number that matches the query, add to the result. */ - final boolean nameMatches = nameMatcher.matches(displayName); - final boolean numberMatches = (nameMatcher.matchesNumber(phoneNumber, query) != null); + final boolean nameMatches = nameMatcher.matches(mContext, displayName); + final boolean numberMatches = + (nameMatcher.matchesNumber(mContext, phoneNumber, query) != null); if (nameMatches || numberMatches) { /** If a contact has not been added, add it to the result and the hash set. */ duplicates.add(contactMatch); -- cgit v1.2.3