merge in klp-release history after reset to klp-dev
diff --git a/res/drawable-xxhdpi/ic_fav_undo_dk.png b/res/drawable-xxhdpi/ic_fav_undo_dk.png
index a37d2bd..4b7dfc4 100644
--- a/res/drawable-xxhdpi/ic_fav_undo_dk.png
+++ b/res/drawable-xxhdpi/ic_fav_undo_dk.png
Binary files differ
diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index 672abf1..d3f86cf 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -33,8 +33,8 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/call_log_outer_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
- android:paddingTop="4dip"
- android:paddingBottom="4dip"
+ android:paddingTop="0dip"
+ android:paddingBottom="0dip"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
<ImageView android:layout_width="wrap_content"
@@ -45,6 +45,14 @@
android:layout_height="wrap_content"
android:id="@+id/badge_text"
android:textColor="@color/dialpad_primary_text_color"
- android:layout_gravity="center_vertical"/>
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"/>
+ <ImageView android:id="@+id/dismiss_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dip"
+ android:src="@drawable/ic_close_dk"
+ android:background="?android:attr/selectableItemBackground"
+ android:visibility="gone"/>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index be57db8..55732ed 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Изпращане на SMS до <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Непрослушана гласова поща"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Стартиране на гласово търсене"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Неизвестен"</string>
<string name="voicemail" msgid="3851469869202611441">"Гласова поща"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 279ab60..0e2b3e4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -89,7 +89,7 @@
<string name="menu_show_missed_only" msgid="154473166059743996">"Zobrazit pouze zmeškané"</string>
<string name="menu_show_voicemails_only" msgid="1898421289561435703">"Zobrazit pouze hlas. schránku"</string>
<string name="menu_show_all_calls" msgid="7560347482073345885">"Zobrazit všechny hovory"</string>
- <string name="add_2sec_pause" msgid="9214012315201040129">"Přidat 2s pauzu"</string>
+ <string name="add_2sec_pause" msgid="9214012315201040129">"Přidat pauzu 2 s"</string>
<string name="add_wait" msgid="3360818652790319634">"Přidat čekání"</string>
<string name="call_settings" msgid="7666474782093693667">"Nastavení"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Nový kontakt"</string>
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Odeslat textovou zprávu kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nevyslechnutá hlasová zpráva"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Spustit hlasové vyhledávání"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Zavolat na číslo <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Neznámé"</string>
<string name="voicemail" msgid="3851469869202611441">"Hlasová schránka"</string>
@@ -137,7 +136,7 @@
<string name="dialer_hint_find_contact" msgid="8798845521253672403">"Zadejte jméno nebo tel. číslo"</string>
<string name="call_log_all_title" msgid="3566738938889333307">"Všechny"</string>
<string name="call_log_missed_title" msgid="4541142293870638971">"Zmeškané"</string>
- <string name="recentMissed_empty" msgid="5427113551557296665">"Nemáte žádné nedávné zmeškané hovory."</string>
+ <string name="recentMissed_empty" msgid="5427113551557296665">"Nemáte žádné nedávno zmeškané hovory."</string>
<string name="recentVoicemails_empty" msgid="5163114119598014048">"Nemáte žádné nedávné hlasové zprávy."</string>
<string name="show_all_contacts" msgid="1732256558071778056">"Zobrazit všechny kontakty"</string>
<string name="show_favorites_only" msgid="5520072531022614595">"Zobrazit pouze oblíbené"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cfd2551..3e4a4da 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"ارسال پیام متنی به <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"پست صوتی شنیده نشده"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"شروع جستجوی صوتی"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"ناشناس"</string>
<string name="voicemail" msgid="3851469869202611441">"پست صوتی"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a83543e..c3ab3ab 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"ტესქტური შეტყობინების გაგზავნა <xliff:g id="NAME">%1$s</xliff:g>-ისთვის"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"მოსასმენი ხმოვანი ფოსტა"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"ხმოვანი ძიების დაწყება"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
<string name="unknown" msgid="740067747858270469">"უცნობი"</string>
<string name="voicemail" msgid="3851469869202611441">"ხმოვანი ფოსტა"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5d63581..9a17a5a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"<xliff:g id="NAME">%1$s</xliff:g>님에게 문자 메시지 보내기"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"듣지 않은 음성사서함"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"음성 검색 시작"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string>
<string name="unknown" msgid="740067747858270469">"알 수 없음"</string>
<string name="voicemail" msgid="3851469869202611441">"음성사서함"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 2c9e05c..cdad34e 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"ຂໍ້ຄວາມສຽງທີ່ຍັງບໍ່ໄດ້ຟັງ"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"ເລີ່ມການຊອກຫາດ້ວຍສຽງ"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"ໂທຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"ບໍ່ຮູ້ຈັກ"</string>
<string name="voicemail" msgid="3851469869202611441">"ຂໍ້ຄວາມສຽງ"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 74c2a47..dba757f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Hantar mesej teks kepada <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Mel suara belum didengar"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Mulakan carian suara"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Tidak diketahui"</string>
<string name="voicemail" msgid="3851469869202611441">"Mel suara"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0d151a7..b59ae7f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Send tekstmelding til <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Ikke avspilt talepost"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Start talesøk"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Ukjent"</string>
<string name="voicemail" msgid="3851469869202611441">"Telefonsvarer"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 98cd74a..792bbe7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Trimiteţi un mesaj text către <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Mesaje vocale neascultate"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Începeţi căutarea vocală"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Apelaţi <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Necunoscut"</string>
<string name="voicemail" msgid="3851469869202611441">"Mesagerie vocală"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dcc8c98..b30df7d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Отправить текстовое сообщение: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Непрослушанные сообщения голосовой почты"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Начать голосовой поиск"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Неизвестно"</string>
<string name="voicemail" msgid="3851469869202611441">"Голосовая почта"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 820e186..aa9d831 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Poslať textovú správu kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nevypočutá hlasová správa"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Spustenie hlasového vyhľadávania"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Volať <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Neznáme"</string>
<string name="voicemail" msgid="3851469869202611441">"Hlasová schránka"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fb38508..079d391 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Pošlji SMS osebi <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Neodprta glasovna pošta"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Začni glasovno iskanje"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Neznano"</string>
<string name="voicemail" msgid="3851469869202611441">"Glasovna pošta"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 343fb23..67a1cc1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Tuma ujumbe wa maandishi kwa <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Barua sauti ambayo haijasikizwa"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Anza kutafuta kwa kutamka"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Haijulikani"</string>
<string name="voicemail" msgid="3851469869202611441">"Ujumbe wa sauti"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a4ba5ef..8275f29 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"Şu kişiye kısa mesaj gönder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Dinlenilmemiş sesli mesaj"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Sesli arama başlat"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"Çağrı yap: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"Bilinmiyor"</string>
<string name="voicemail" msgid="3851469869202611441">"Sesli Mesaj"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc20283..4ec6bb4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -115,8 +115,7 @@
<string name="description_send_text_message" msgid="7803126439934046891">"向<xliff:g id="NAME">%1$s</xliff:g>发送短信"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"未收听的语音邮件"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"开始语音搜索"</string>
- <!-- no translation found for call_log_empty_gecode (2019639420045039861) -->
- <skip />
+ <string name="call_log_empty_gecode" msgid="2019639420045039861">" "</string>
<string name="menu_callNumber" msgid="997146291983360266">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="unknown" msgid="740067747858270469">"未知"</string>
<string name="voicemail" msgid="3851469869202611441">"语音信箱"</string>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 12a0f2b..42cbbf4 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -147,6 +147,7 @@
private boolean mInDialpadSearch;
private boolean mInRegularSearch;
+ private boolean mClearSearchOnPause;
/**
* True if the dialpad is only temporarily showing due to being in call
@@ -192,14 +193,14 @@
// CallLog screen (search UI will be automatically exited).
PhoneNumberInteraction.startInteractionForPhoneCall(
DialtactsActivity.this, dataUri, getCallOrigin());
- hideDialpadAndSearchUi();
+ mClearSearchOnPause = true;
}
@Override
public void onCallNumberDirectly(String phoneNumber) {
Intent intent = CallUtil.getCallIntent(phoneNumber, getCallOrigin());
startActivity(intent);
- hideDialpadAndSearchUi();
+ mClearSearchOnPause = true;
}
@Override
@@ -329,6 +330,15 @@
}
@Override
+ protected void onPause() {
+ if (mClearSearchOnPause) {
+ hideDialpadAndSearchUi();
+ mClearSearchOnPause = false;
+ }
+ super.onPause();
+ }
+
+ @Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString(KEY_SEARCH_QUERY, mSearchQuery);
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 4bc1787..b2e5206 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -640,7 +640,13 @@
if (!mIsCallLog) {
final int numMissed = getNumMissedCalls(callType);
final ViewStub stub = (ViewStub) view.findViewById(R.id.link_stub);
+
if (shouldShowBadge(numMissed, info, details)) {
+ // Do not process if the data has not changed (optimization since bind view is
+ // called multiple times due to contact lookup).
+ if (numMissed == mNumMissedCallsShown) {
+ return;
+ }
// stub will be null if it was already inflated.
if (stub != null) {
@@ -718,11 +724,6 @@
*/
protected boolean shouldShowBadge(int numMissedCalls, ContactInfo info,
PhoneCallDetails details) {
- // Do not process if the data has not changed (optimization since bind view is called
- // multiple times due to contact lookup).
- if (numMissedCalls == mNumMissedCallsShown) {
- return false;
- }
return numMissedCalls > 0;
}
diff --git a/src/com/android/dialer/calllog/ContactInfo.java b/src/com/android/dialer/calllog/ContactInfo.java
index 2006744..601f552 100644
--- a/src/com/android/dialer/calllog/ContactInfo.java
+++ b/src/com/android/dialer/calllog/ContactInfo.java
@@ -42,6 +42,8 @@
public static String GEOCODE_AS_LABEL = "";
+ public int sourceType = 0;
+
@Override
public int hashCode() {
// Uses only name and contactUri to determine hashcode.
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index cb3d994..14e1bed 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -118,12 +118,12 @@
// Check if we already know the name associated with this number.
String name = names.get(newCall.number);
if (name == null) {
- // Look it up in the database.
- name = mNameLookupQuery.query(newCall.number);
+ name = mPhoneNumberHelper.getDisplayName(newCall.number,
+ newCall.numberPresentation).toString();
// If we cannot lookup the contact, use the number instead.
- if (name == null) {
- name = mPhoneNumberHelper.getDisplayNumber(newCall.number,
- newCall.numberPresentation, "").toString();
+ if (TextUtils.isEmpty(name)) {
+ // Look it up in the database.
+ name = mNameLookupQuery.query(newCall.number);
if (TextUtils.isEmpty(name)) {
name = newCall.number;
}
diff --git a/src/com/android/dialer/calllog/PhoneNumberHelper.java b/src/com/android/dialer/calllog/PhoneNumberHelper.java
index 9e1d816..336facb 100644
--- a/src/com/android/dialer/calllog/PhoneNumberHelper.java
+++ b/src/com/android/dialer/calllog/PhoneNumberHelper.java
@@ -33,14 +33,7 @@
mResources = resources;
}
- /**
- * Returns the string to display for the given phone number.
- *
- * @param number the number to display
- * @param formattedNumber the formatted number if available, may be null
- */
- public CharSequence getDisplayNumber(CharSequence number,
- int presentation, CharSequence formattedNumber) {
+ /* package */ CharSequence getDisplayName(CharSequence number, int presentation) {
if (presentation == Calls.PRESENTATION_UNKNOWN) {
return mResources.getString(R.string.unknown);
}
@@ -50,12 +43,34 @@
if (presentation == Calls.PRESENTATION_PAYPHONE) {
return mResources.getString(R.string.payphone);
}
- if (TextUtils.isEmpty(number)) {
- return "";
- }
if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {
return mResources.getString(R.string.voicemail);
}
+ if (PhoneNumberUtilsWrapper.isLegacyUnknownNumbers(number)) {
+ return mResources.getString(R.string.unknown);
+ }
+ return "";
+ }
+
+ /**
+ * Returns the string to display for the given phone number.
+ *
+ * @param number the number to display
+ * @param formattedNumber the formatted number if available, may be null
+ */
+ public CharSequence getDisplayNumber(CharSequence number,
+ int presentation, CharSequence formattedNumber) {
+
+ final CharSequence displayName = getDisplayName(number, presentation);
+
+ if (!TextUtils.isEmpty(displayName)) {
+ return displayName;
+ }
+
+ if (TextUtils.isEmpty(number)) {
+ return "";
+ }
+
if (TextUtils.isEmpty(formattedNumber)) {
return number;
} else {
diff --git a/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java b/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java
index c397f0a..9913c20 100644
--- a/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java
+++ b/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java
@@ -20,15 +20,21 @@
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
+import com.google.android.collect.Sets;
+
+import java.util.Set;
+
/**
*
*/
public class PhoneNumberUtilsWrapper {
+ private static final Set<String> LEGACY_UNKNOWN_NUMBERS = Sets.newHashSet("-1", "-2", "-3");
+
/** Returns true if it is possible to place a call to the given number. */
public static boolean canPlaceCallsTo(CharSequence number, int presentation) {
return presentation == CallLog.Calls.PRESENTATION_ALLOWED
- && !TextUtils.isEmpty(number);
+ && !TextUtils.isEmpty(number) && !isLegacyUnknownNumbers(number);
}
/**
@@ -71,6 +77,13 @@
if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {
return false;
}
+ if (isLegacyUnknownNumbers(number.toString())) {
+ return false;
+ }
return true;
}
+
+ public static boolean isLegacyUnknownNumbers(CharSequence number) {
+ return LEGACY_UNKNOWN_NUMBERS.contains(number.toString());
+ }
}
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index e46a8d3..46364b2 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -807,6 +807,9 @@
}
private void keyPressed(int keyCode) {
+ if (getView().getTranslationY() != 0) {
+ return;
+ }
switch (keyCode) {
case KeyEvent.KEYCODE_1:
playTone(ToneGenerator.TONE_DTMF_1, TONE_LENGTH_INFINITE);
diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java
index 21c8c31..9f4e6be 100644
--- a/src/com/android/dialer/list/RegularSearchFragment.java
+++ b/src/com/android/dialer/list/RegularSearchFragment.java
@@ -15,7 +15,11 @@
*/
package com.android.dialer.list;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
import com.android.contacts.common.list.ContactEntryListAdapter;
+import com.android.contacts.common.list.PinnedHeaderListView;
import com.android.dialerbind.ObjectFactory;
import com.android.dialer.service.CachedNumberLookupService;
@@ -36,6 +40,11 @@
}
@Override
+ protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
+ super.onCreateView(inflater, container);
+ ((PinnedHeaderListView) getListView()).setScrollToSectionOnHeaderTouch(true);
+ }
+
protected ContactEntryListAdapter createListAdapter() {
RegularSearchListAdapter adapter = new RegularSearchListAdapter(getActivity());
adapter.setDisplayPhotos(true);
