Merge "Fix NPE if SmartDialLoaderTask has null context"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c39ee5..502184c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,10 +51,8 @@
<application
android:label="@string/applicationLabel"
- android:icon="@mipmap/ic_launcher_contacts"
- android:taskAffinity="android.task.contacts"
- android:hardwareAccelerated="true"
- >
+ android:icon="@mipmap/ic_launcher_phone"
+ android:hardwareAccelerated="true">
<!-- The entrance point for Phone UI.
stateAlwaysHidden is set to suppress keyboard show up on
@@ -68,7 +66,6 @@
android:icon="@mipmap/ic_launcher_phone"
android:screenOrientation="nosensor"
android:enabled="@*android:bool/config_voice_capable"
- android:taskAffinity="android.task.contacts.phone"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
<intent-filter>
<action android:name="android.intent.action.DIAL" />
@@ -130,7 +127,6 @@
android:theme="@style/CallDetailActivityTheme"
android:screenOrientation="portrait"
android:icon="@mipmap/ic_launcher_phone"
- android:taskAffinity="android.task.contacts.phone"
>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
diff --git a/res/mipmap-hdpi/ic_launcher_phone.png b/res/mipmap-hdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..5a3dff1
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_phone.png b/res/mipmap-mdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..9ea0d8c
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_phone.png b/res/mipmap-xhdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..e97836c
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_phone.png b/res/mipmap-xxhdpi/ic_launcher_phone.png
new file mode 100644
index 0000000..1594e4e
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index eb0b371..86a383a 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -77,8 +77,6 @@
/** Whether there is at least one voicemail source installed. */
private boolean mVoicemailSourcesAvailable = false;
- /** Whether we are currently filtering over voicemail. */
- private boolean mShowingVoicemailOnly = false;
private VoicemailStatusHelper mVoicemailStatusHelper;
private View mStatusMessageView;
@@ -317,10 +315,6 @@
public void startCallsQuery() {
mAdapter.setLoading(true);
mCallLogQueryHandler.fetchCalls(mCallTypeFilter);
- if (mShowingVoicemailOnly) {
- mShowingVoicemailOnly = false;
- getActivity().invalidateOptionsMenu();
- }
}
private void startVoicemailStatusQuery() {
@@ -340,10 +334,49 @@
// menu items are ready if the first item is non-null.
if (itemDeleteAll != null) {
itemDeleteAll.setEnabled(mAdapter != null && !mAdapter.isEmpty());
- menu.findItem(R.id.show_voicemails_only).setVisible(mVoicemailSourcesAvailable);
+
+ showAllFilterMenuOptions(menu);
+ hideCurrentFilterMenuOption(menu);
+
+ // Only hide if not available. Let the above calls handle showing.
+ if (!mVoicemailSourcesAvailable) {
+ menu.findItem(R.id.show_voicemails_only).setVisible(false);
+ }
}
}
+ private void hideCurrentFilterMenuOption(Menu menu) {
+ MenuItem item = null;
+ switch (mCallTypeFilter) {
+ case CallLogQueryHandler.CALL_TYPE_ALL:
+ item = menu.findItem(R.id.show_all_calls);
+ break;
+ case Calls.INCOMING_TYPE:
+ item = menu.findItem(R.id.show_incoming_only);
+ break;
+ case Calls.OUTGOING_TYPE:
+ item = menu.findItem(R.id.show_outgoing_only);
+ break;
+ case Calls.MISSED_TYPE:
+ item = menu.findItem(R.id.show_missed_only);
+ break;
+ case Calls.VOICEMAIL_TYPE:
+ menu.findItem(R.id.show_voicemails_only);
+ break;
+ }
+ if (item != null) {
+ item.setVisible(false);
+ }
+ }
+
+ private void showAllFilterMenuOptions(Menu menu) {
+ menu.findItem(R.id.show_all_calls).setVisible(true);
+ menu.findItem(R.id.show_incoming_only).setVisible(true);
+ menu.findItem(R.id.show_outgoing_only).setVisible(true);
+ menu.findItem(R.id.show_missed_only).setVisible(true);
+ menu.findItem(R.id.show_voicemails_only).setVisible(true);
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -375,7 +408,6 @@
registerPhoneCallReceiver();
mCallLogQueryHandler.fetchCalls(Calls.VOICEMAIL_TYPE);
updateFilterTypeAndHeader(Calls.VOICEMAIL_TYPE);
- mShowingVoicemailOnly = true;
return true;
case R.id.show_all_calls:
@@ -383,7 +415,6 @@
unregisterPhoneCallReceiver();
mCallLogQueryHandler.fetchCalls(CallLogQueryHandler.CALL_TYPE_ALL);
updateFilterTypeAndHeader(CallLogQueryHandler.CALL_TYPE_ALL);
- mShowingVoicemailOnly = false;
return true;
default:
diff --git a/src/com/android/dialer/dialpad/SmartDialLoaderTask.java b/src/com/android/dialer/dialpad/SmartDialLoaderTask.java
index b4613b3..8321837 100644
--- a/src/com/android/dialer/dialpad/SmartDialLoaderTask.java
+++ b/src/com/android/dialer/dialpad/SmartDialLoaderTask.java
@@ -50,13 +50,11 @@
private class Contact {
final String mDisplayName;
- final String mStrippedDisplayName;
final String mLookupKey;
final long mId;
public Contact(long id, String displayName, String lookupKey) {
mDisplayName = displayName;
- mStrippedDisplayName = SmartDialNameMatcher.stripDiacritics(displayName);
mLookupKey = lookupKey;
mId = id;
}
@@ -230,9 +228,9 @@
int count = 0;
for (int i = 0; i < sContactsCache.size(); i++) {
final Contact contact = sContactsCache.get(i);
- final String strippedDisplayName = contact.mStrippedDisplayName;
+ final String displayName = contact.mDisplayName;
- if (!mNameMatcher.matches(strippedDisplayName)) {
+ if (!mNameMatcher.matches(displayName)) {
continue;
}
// Matched; create SmartDialEntry.
diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index 4a340f9..1253a56 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -46,6 +46,339 @@
'9', '9', '9', '9' // W,X,Y,Z -> 9
};
+ /*
+ * The switch statement in this function was generated using the python code:
+ * from unidecode import unidecode
+ * for i in range(192, 564):
+ * char = unichr(i)
+ * decoded = unidecode(char)
+ * # Unicode characters that decompose into multiple characters i.e.
+ * # into ss are not supported for now
+ * if (len(decoded) == 1 and decoded.isalpha()):
+ * print "case '" + char + "': return '" + unidecode(char) + "';"
+ *
+ * This gives us a way to map characters containing accents/diacritics to their
+ * alphabetic equivalents. The unidecode library can be found at:
+ * http://pypi.python.org/pypi/Unidecode/0.04.1
+ */
+ private static char remapAccentedChars(char c) {
+ switch (c) {
+ case 'À': return 'A';
+ case 'Á': return 'A';
+ case 'Â': return 'A';
+ case 'Ã': return 'A';
+ case 'Ä': return 'A';
+ case 'Å': return 'A';
+ case 'Ç': return 'C';
+ case 'È': return 'E';
+ case 'É': return 'E';
+ case 'Ê': return 'E';
+ case 'Ë': return 'E';
+ case 'Ì': return 'I';
+ case 'Í': return 'I';
+ case 'Î': return 'I';
+ case 'Ï': return 'I';
+ case 'Ð': return 'D';
+ case 'Ñ': return 'N';
+ case 'Ò': return 'O';
+ case 'Ó': return 'O';
+ case 'Ô': return 'O';
+ case 'Õ': return 'O';
+ case 'Ö': return 'O';
+ case '×': return 'x';
+ case 'Ø': return 'O';
+ case 'Ù': return 'U';
+ case 'Ú': return 'U';
+ case 'Û': return 'U';
+ case 'Ü': return 'U';
+ case 'Ý': return 'U';
+ case 'à': return 'a';
+ case 'á': return 'a';
+ case 'â': return 'a';
+ case 'ã': return 'a';
+ case 'ä': return 'a';
+ case 'å': return 'a';
+ case 'ç': return 'c';
+ case 'è': return 'e';
+ case 'é': return 'e';
+ case 'ê': return 'e';
+ case 'ë': return 'e';
+ case 'ì': return 'i';
+ case 'í': return 'i';
+ case 'î': return 'i';
+ case 'ï': return 'i';
+ case 'ð': return 'd';
+ case 'ñ': return 'n';
+ case 'ò': return 'o';
+ case 'ó': return 'o';
+ case 'ô': return 'o';
+ case 'õ': return 'o';
+ case 'ö': return 'o';
+ case 'ø': return 'o';
+ case 'ù': return 'u';
+ case 'ú': return 'u';
+ case 'û': return 'u';
+ case 'ü': return 'u';
+ case 'ý': return 'y';
+ case 'ÿ': return 'y';
+ case 'Ā': return 'A';
+ case 'ā': return 'a';
+ case 'Ă': return 'A';
+ case 'ă': return 'a';
+ case 'Ą': return 'A';
+ case 'ą': return 'a';
+ case 'Ć': return 'C';
+ case 'ć': return 'c';
+ case 'Ĉ': return 'C';
+ case 'ĉ': return 'c';
+ case 'Ċ': return 'C';
+ case 'ċ': return 'c';
+ case 'Č': return 'C';
+ case 'č': return 'c';
+ case 'Ď': return 'D';
+ case 'ď': return 'd';
+ case 'Đ': return 'D';
+ case 'đ': return 'd';
+ case 'Ē': return 'E';
+ case 'ē': return 'e';
+ case 'Ĕ': return 'E';
+ case 'ĕ': return 'e';
+ case 'Ė': return 'E';
+ case 'ė': return 'e';
+ case 'Ę': return 'E';
+ case 'ę': return 'e';
+ case 'Ě': return 'E';
+ case 'ě': return 'e';
+ case 'Ĝ': return 'G';
+ case 'ĝ': return 'g';
+ case 'Ğ': return 'G';
+ case 'ğ': return 'g';
+ case 'Ġ': return 'G';
+ case 'ġ': return 'g';
+ case 'Ģ': return 'G';
+ case 'ģ': return 'g';
+ case 'Ĥ': return 'H';
+ case 'ĥ': return 'h';
+ case 'Ħ': return 'H';
+ case 'ħ': return 'h';
+ case 'Ĩ': return 'I';
+ case 'ĩ': return 'i';
+ case 'Ī': return 'I';
+ case 'ī': return 'i';
+ case 'Ĭ': return 'I';
+ case 'ĭ': return 'i';
+ case 'Į': return 'I';
+ case 'į': return 'i';
+ case 'İ': return 'I';
+ case 'ı': return 'i';
+ case 'Ĵ': return 'J';
+ case 'ĵ': return 'j';
+ case 'Ķ': return 'K';
+ case 'ķ': return 'k';
+ case 'ĸ': return 'k';
+ case 'Ĺ': return 'L';
+ case 'ĺ': return 'l';
+ case 'Ļ': return 'L';
+ case 'ļ': return 'l';
+ case 'Ľ': return 'L';
+ case 'ľ': return 'l';
+ case 'Ŀ': return 'L';
+ case 'ŀ': return 'l';
+ case 'Ł': return 'L';
+ case 'ł': return 'l';
+ case 'Ń': return 'N';
+ case 'ń': return 'n';
+ case 'Ņ': return 'N';
+ case 'ņ': return 'n';
+ case 'Ň': return 'N';
+ case 'ň': return 'n';
+ case 'Ō': return 'O';
+ case 'ō': return 'o';
+ case 'Ŏ': return 'O';
+ case 'ŏ': return 'o';
+ case 'Ő': return 'O';
+ case 'ő': return 'o';
+ case 'Ŕ': return 'R';
+ case 'ŕ': return 'r';
+ case 'Ŗ': return 'R';
+ case 'ŗ': return 'r';
+ case 'Ř': return 'R';
+ case 'ř': return 'r';
+ case 'Ś': return 'S';
+ case 'ś': return 's';
+ case 'Ŝ': return 'S';
+ case 'ŝ': return 's';
+ case 'Ş': return 'S';
+ case 'ş': return 's';
+ case 'Š': return 'S';
+ case 'š': return 's';
+ case 'Ţ': return 'T';
+ case 'ţ': return 't';
+ case 'Ť': return 'T';
+ case 'ť': return 't';
+ case 'Ŧ': return 'T';
+ case 'ŧ': return 't';
+ case 'Ũ': return 'U';
+ case 'ũ': return 'u';
+ case 'Ū': return 'U';
+ case 'ū': return 'u';
+ case 'Ŭ': return 'U';
+ case 'ŭ': return 'u';
+ case 'Ů': return 'U';
+ case 'ů': return 'u';
+ case 'Ű': return 'U';
+ case 'ű': return 'u';
+ case 'Ų': return 'U';
+ case 'ų': return 'u';
+ case 'Ŵ': return 'W';
+ case 'ŵ': return 'w';
+ case 'Ŷ': return 'Y';
+ case 'ŷ': return 'y';
+ case 'Ÿ': return 'Y';
+ case 'Ź': return 'Z';
+ case 'ź': return 'z';
+ case 'Ż': return 'Z';
+ case 'ż': return 'z';
+ case 'Ž': return 'Z';
+ case 'ž': return 'z';
+ case 'ſ': return 's';
+ case 'ƀ': return 'b';
+ case 'Ɓ': return 'B';
+ case 'Ƃ': return 'B';
+ case 'ƃ': return 'b';
+ case 'Ɔ': return 'O';
+ case 'Ƈ': return 'C';
+ case 'ƈ': return 'c';
+ case 'Ɖ': return 'D';
+ case 'Ɗ': return 'D';
+ case 'Ƌ': return 'D';
+ case 'ƌ': return 'd';
+ case 'ƍ': return 'd';
+ case 'Ɛ': return 'E';
+ case 'Ƒ': return 'F';
+ case 'ƒ': return 'f';
+ case 'Ɠ': return 'G';
+ case 'Ɣ': return 'G';
+ case 'Ɩ': return 'I';
+ case 'Ɨ': return 'I';
+ case 'Ƙ': return 'K';
+ case 'ƙ': return 'k';
+ case 'ƚ': return 'l';
+ case 'ƛ': return 'l';
+ case 'Ɯ': return 'W';
+ case 'Ɲ': return 'N';
+ case 'ƞ': return 'n';
+ case 'Ɵ': return 'O';
+ case 'Ơ': return 'O';
+ case 'ơ': return 'o';
+ case 'Ƥ': return 'P';
+ case 'ƥ': return 'p';
+ case 'ƫ': return 't';
+ case 'Ƭ': return 'T';
+ case 'ƭ': return 't';
+ case 'Ʈ': return 'T';
+ case 'Ư': return 'U';
+ case 'ư': return 'u';
+ case 'Ʊ': return 'Y';
+ case 'Ʋ': return 'V';
+ case 'Ƴ': return 'Y';
+ case 'ƴ': return 'y';
+ case 'Ƶ': return 'Z';
+ case 'ƶ': return 'z';
+ case 'ƿ': return 'w';
+ case 'Ǎ': return 'A';
+ case 'ǎ': return 'a';
+ case 'Ǐ': return 'I';
+ case 'ǐ': return 'i';
+ case 'Ǒ': return 'O';
+ case 'ǒ': return 'o';
+ case 'Ǔ': return 'U';
+ case 'ǔ': return 'u';
+ case 'Ǖ': return 'U';
+ case 'ǖ': return 'u';
+ case 'Ǘ': return 'U';
+ case 'ǘ': return 'u';
+ case 'Ǚ': return 'U';
+ case 'ǚ': return 'u';
+ case 'Ǜ': return 'U';
+ case 'ǜ': return 'u';
+ case 'Ǟ': return 'A';
+ case 'ǟ': return 'a';
+ case 'Ǡ': return 'A';
+ case 'ǡ': return 'a';
+ case 'Ǥ': return 'G';
+ case 'ǥ': return 'g';
+ case 'Ǧ': return 'G';
+ case 'ǧ': return 'g';
+ case 'Ǩ': return 'K';
+ case 'ǩ': return 'k';
+ case 'Ǫ': return 'O';
+ case 'ǫ': return 'o';
+ case 'Ǭ': return 'O';
+ case 'ǭ': return 'o';
+ case 'ǰ': return 'j';
+ case 'Dz': return 'D';
+ case 'Ǵ': return 'G';
+ case 'ǵ': return 'g';
+ case 'Ƿ': return 'W';
+ case 'Ǹ': return 'N';
+ case 'ǹ': return 'n';
+ case 'Ǻ': return 'A';
+ case 'ǻ': return 'a';
+ case 'Ǿ': return 'O';
+ case 'ǿ': return 'o';
+ case 'Ȁ': return 'A';
+ case 'ȁ': return 'a';
+ case 'Ȃ': return 'A';
+ case 'ȃ': return 'a';
+ case 'Ȅ': return 'E';
+ case 'ȅ': return 'e';
+ case 'Ȇ': return 'E';
+ case 'ȇ': return 'e';
+ case 'Ȉ': return 'I';
+ case 'ȉ': return 'i';
+ case 'Ȋ': return 'I';
+ case 'ȋ': return 'i';
+ case 'Ȍ': return 'O';
+ case 'ȍ': return 'o';
+ case 'Ȏ': return 'O';
+ case 'ȏ': return 'o';
+ case 'Ȑ': return 'R';
+ case 'ȑ': return 'r';
+ case 'Ȓ': return 'R';
+ case 'ȓ': return 'r';
+ case 'Ȕ': return 'U';
+ case 'ȕ': return 'u';
+ case 'Ȗ': return 'U';
+ case 'ȗ': return 'u';
+ case 'Ș': return 'S';
+ case 'ș': return 's';
+ case 'Ț': return 'T';
+ case 'ț': return 't';
+ case 'Ȝ': return 'Y';
+ case 'ȝ': return 'y';
+ case 'Ȟ': return 'H';
+ case 'ȟ': return 'h';
+ case 'Ȥ': return 'Z';
+ case 'ȥ': return 'z';
+ case 'Ȧ': return 'A';
+ case 'ȧ': return 'a';
+ case 'Ȩ': return 'E';
+ case 'ȩ': return 'e';
+ case 'Ȫ': return 'O';
+ case 'ȫ': return 'o';
+ case 'Ȭ': return 'O';
+ case 'ȭ': return 'o';
+ case 'Ȯ': return 'O';
+ case 'ȯ': return 'o';
+ case 'Ȱ': return 'O';
+ case 'ȱ': return 'o';
+ case 'Ȳ': return 'Y';
+ case 'ȳ': return 'y';
+ default: return c;
+ }
+ }
+
private final ArrayList<SmartDialMatchPosition> mMatchPositions = Lists.newArrayList();
public SmartDialNameMatcher(String query) {
@@ -153,6 +486,8 @@
// Keep going until we reach the end of displayName
while (nameStart < nameLength && queryStart < queryLength) {
char ch = displayName.charAt(nameStart);
+ // Strip diacritics from accented characters if any
+ ch = remapAccentedChars(ch);
if ((ch >= 'A') && (ch <= 'Z')) {
// Simply change the ascii code to the lower case version instead of using
// toLowerCase for efficiency
diff --git a/tests/src/com/android/dialer/SmartDialNameMatcherTest.java b/tests/src/com/android/dialer/SmartDialNameMatcherTest.java
index babae55..492e5b4 100644
--- a/tests/src/com/android/dialer/SmartDialNameMatcherTest.java
+++ b/tests/src/com/android/dialer/SmartDialNameMatcherTest.java
@@ -106,7 +106,6 @@
final SmartDialNameMatcher matcher = new SmartDialNameMatcher(query);
final ArrayList<SmartDialMatchPosition> matchPositions =
new ArrayList<SmartDialMatchPosition>();
- displayName = SmartDialNameMatcher.stripDiacritics(displayName);
final boolean matches = matcher.matchesCombination(
displayName, query, matchPositions);
Log.d(TAG, "query=" + query + " text=" + displayName
