merge in klp-release history after reset to klp-dev
diff --git a/res/drawable-hdpi/no_favorites_banner.png b/res/drawable-hdpi/no_favorites_banner.png
new file mode 100644
index 0000000..a4b09c0
--- /dev/null
+++ b/res/drawable-hdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-mdpi/no_favorites_banner.png b/res/drawable-mdpi/no_favorites_banner.png
new file mode 100644
index 0000000..ac080b9
--- /dev/null
+++ b/res/drawable-mdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xhdpi/no_favorites_banner.png b/res/drawable-xhdpi/no_favorites_banner.png
new file mode 100644
index 0000000..bae4e99
--- /dev/null
+++ b/res/drawable-xhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xxhdpi/no_favorites_banner.png b/res/drawable-xxhdpi/no_favorites_banner.png
new file mode 100644
index 0000000..0e2a4fa
--- /dev/null
+++ b/res/drawable-xxhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 9d63514..fe1e644 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -63,6 +63,11 @@
android:contentDescription="@string/description_start_voice_search"
android:background="?android:attr/selectableItemBackground" />
</LinearLayout>
+ <View
+ android:id="@+id/searchbox_divider"
+ android:layout_height="1dp"
+ android:layout_width="match_parent"
+ android:background="@color/background_dialer_light" />
<FrameLayout
android:layout_height="0dp"
android:layout_weight="1"
diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml
index 4d3abf4..f518f0b 100644
--- a/res/layout/phone_favorites_fragment.xml
+++ b/res/layout/phone_favorites_fragment.xml
@@ -15,19 +15,23 @@
-->
<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="end"
android:clipChildren="false"
android:background="@color/background_dialer_light">
+
<FrameLayout
+ android:id="@+id/contact_tile_frame"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true">
+
<com.android.dialer.list.PhoneFavoriteListView
android:id="@+id/contact_tile_list"
android:layout_width="match_parent"
@@ -37,19 +41,22 @@
android:fadingEdge="none"
android:divider="@null" />
- <TextView
- android:id="@+id/contact_tile_list_empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:layout_marginTop="@dimen/empty_message_top_margin"
- android:textColor="?android:attr/textColorSecondary"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
<ImageView
android:id="@+id/contact_tile_drag_shadow_overlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
</FrameLayout>
-</LinearLayout>
+
+ <include
+ android:id="@+id/phone_no_favorites_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@id/contact_tile_frame"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentBottom="true"
+ layout="@layout/phone_no_favorites"
+ android:visibility="gone"/>
+
+</RelativeLayout>
diff --git a/res/layout/phone_no_favorites.xml b/res/layout/phone_no_favorites.xml
index 9fa5d47..1a0079f 100644
--- a/res/layout/phone_no_favorites.xml
+++ b/res/layout/phone_no_favorites.xml
@@ -14,21 +14,50 @@
limitations under the License.
-->
-<FrameLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
android:minHeight="?android:attr/listPreferredItemHeight">
- <TextView
- android:id="@+id/title"
+ <include
+ android:id="@+id/show_all_contact_button_in_nofav"
+ layout="@layout/show_all_contact_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"/>
+
+ <LinearLayout
+ android:id="@+id/nofavorite_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:layout_gravity="center"
android:gravity="center"
- android:text="@string/listTotalAllContactsZeroStarred"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:attr/textColorSecondary"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="8dp"/>
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:layout_above="@id/show_all_contact_button_in_nofav">
-</FrameLayout>
+ <ImageView
+ android:id="@+id/nofavorite_image"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:gravity="center_horizontal"
+ android:src="@drawable/no_favorites_banner"
+ android:layout_marginBottom="14dp"/>
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:text="@string/no_favorites"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="@color/nofavorite_text_color"/>
+ </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f034413..b47db20 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Voeg by kontakte"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> nuwe gemiste oproepe"</string>
<string name="no_favorites" msgid="5212485868783382971">"Gunstelinge en kontakte \nwat jy gereeld bel, sal hier wys.\nSo, begin bel."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Tik prent om alle getalle te sien of druk en hou om te herorganiseer"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2b18711..0f6be7f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"ወደ ዕውቂያዎች አክል"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> አዲስ ያመለጡ ጥሪዎች"</string>
<string name="no_favorites" msgid="5212485868783382971">"ተወዳጆች እና አብዛኛው ጊዜ\nየሚደውሉላቸው እውቂያዎች እዚህ ይታያሉ።\nስለዚህ መደወል ይጀምሩ።"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"ሁሉንም ቁጥሮች ለማየት ምስሉን መታ ያድርጉ ወይም ቅደም ተከተላቸውን ለማስተካከል ተጭነው ይያዙ"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 29e2a4d..312a839 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Agregar a contactos"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> llamadas perdidas nuevas"</string>
<string name="no_favorites" msgid="5212485868783382971">"Aquí se mostrarán los favoritos y los contactos a los que\nllamas con frecuencia.\nEmpieza a llamar ya."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Presiona la imagen para ver todos los números o mantenla presionada para cambiar el orden."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 20209fd..e001c62 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -158,6 +158,6 @@
<string name="search_shortcut_call_number" msgid="7277194656832895870">"Llamar a <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Añadir a contactos"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> llamadas perdidas nuevas"</string>
- <string name="no_favorites" msgid="5212485868783382971">"Los favoritos y contactos a los que\nllamas con frecuencia se mostrarán aquí.\nEmpieza a llamar ya."</string>
+ <string name="no_favorites" msgid="5212485868783382971">"Los favoritos y contactos a los que\nllamas con frecuencia se mostrarán aquí.\nYa puedes llamar."</string>
<string name="contact_tooltip" msgid="7817483485692282287">"Toca la imagen para ver todos los números o mantenla pulsada para cambiar el orden"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 87c70ab..4f2c6f0 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Lisa kontaktidesse"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> uus/uut vastamata kõne(t)"</string>
<string name="no_favorites" msgid="5212485868783382971">"Siin kuvatakse lemmikud ja kontaktid,\nkellele sageli helistate.\nVõite hakata helistama."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Puudutage kujutist, et näha kõiki numbreid, või vajutage ja hoidke all ümberkorraldamiseks"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index dd003dc..4786b72 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Lisää yhteystietoihin"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> uutta vastaamatonta puhelua"</string>
<string name="no_favorites" msgid="5212485868783382971">"Suosikit ja yhteyshenkilöt, joille\nsoitat usein, näkyvät tässä.\nAla siis soitella."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Napauta kuvaa nähdäksesi kaikki numerot tai järjestä uudelleen painamalla pitkään"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 65a1206..1e031f8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Tambahkan ke kontak"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> panggilan tidak terjawab baru"</string>
<string name="no_favorites" msgid="5212485868783382971">"Favorit & kontak yang\nsering Anda hubungi akan muncul di sini.\nJadi, mulailah menelepon."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Ketuk gambar untuk melihat semua nomor atau tekan terus untuk mengatur ulang"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 05cae38..5ccaf12 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -158,7 +158,6 @@
<string name="search_shortcut_call_number" msgid="7277194656832895870">"<xliff:g id="NUMBER">%s</xliff:g>に発信"</string>
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"連絡先に追加"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g>件の不在着信"</string>
- <string name="no_favorites" msgid="5212485868783382971">"ここにはお気に入りと\n頻繁に通話する\n連絡先が表示されます。"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="no_favorites" msgid="5212485868783382971">"ここにはお気に入りや\n頻繁に通話する\n連絡先が表示されます。"</string>
+ <string name="contact_tooltip" msgid="7817483485692282287">"画像をタップするとすべての番号を表示でき、押し続けると並び替えることができます"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index d51b8be..aaa6434 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"კონტაქტებში დამატება"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> ახალი გაცდენილი ზარი"</string>
<string name="no_favorites" msgid="5212485868783382971">"რჩეულები და ხშირი კონაქტები\nაქ გამოჩნდება.\nასე რომ, დაიწყეთ რეკვა."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"შეეხეთ სურათს ყველა ნომრის სანახავად, ან შეეხეთ და დააყოვნეთ მიმდევრობის შესაცვლელად"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 821d76b..2337ab6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -158,7 +158,6 @@
<string name="search_shortcut_call_number" msgid="7277194656832895870">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string>
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"주소록에 추가"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"새로운 부재중 전화 <xliff:g id="NUMBER">%s</xliff:g>건"</string>
- <string name="no_favorites" msgid="5212485868783382971">"자주 전화하는 즐겨찾기와 연락처가\n여기에 표시됩니다.\n전화해 보세요."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="no_favorites" msgid="5212485868783382971">"자주 전화하는 연락처가\n여기에 표시됩니다.\n전화해 보세요."</string>
+ <string name="contact_tooltip" msgid="7817483485692282287">"이미지를 탭하여 모든 번호를 확인하거나 길게 눌러 재정렬합니다."</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index f444ae8..dfe1b72 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"ເພີ່ມໃສ່ລາຍຊື່ຕິດຕໍ່"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> ສາຍທີ່ບໍ່ໄດ້ຮັບໃໝ່"</string>
<string name="no_favorites" msgid="5212485868783382971">"ລາຍງານທີ່ມັກ & ລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ທ່ານ\nໂທຫາເລື້ອຍໆ ຈະປາກົດຢູ່ບ່ອນນີ້.\nສະນັ້ນ, ທ່ານສາມາດເລີ່ມໂທໄດ້."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"ແຕະຮູບພາບເພື່ອເບິ່ງຈໍານວນຮູບພາບທັງໝົດ ຫຼືແຕະຄ້າງໄວ້ເພື່ອຈັດຮຽງໃໝ່"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f01b3f7..11f9a29 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Pridėti prie kontaktų"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"Naujų praleistų skambučių: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="no_favorites" msgid="5212485868783382971">"Mėgstamiausieji ir kontaktai,\nkuriems dažnai skambinate, bus rodomi čia.\nTad pradėkite skambinti."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Palieskite vaizdą, kad pamatytumėte visus skaičius, arba paspauskite ir palaikykite, kad pakeistumėte tvarką"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 489bbd8..920911f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Pievienot kontaktpersonām"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"Jauni neatbildēti zvani: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="no_favorites" msgid="5212485868783382971">"Šeit tiks rādīta izlase un kontaktpersonas,\nkurām bieži zvanāt.\nVarat sākt zvanīšanu."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Pieskarieties attēlam, lai skatītu visus tālruņa numurus, vai pieskarieties un turiet, lai mainītu secību."</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dcf1fcb..46b9737 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Tambahkan pada kenalan"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> panggilan terlepas baharu"</string>
<string name="no_favorites" msgid="5212485868783382971">"Kegemaran & kenalan yang\nkerap anda hubungi akan ditunjukkan di sini.\nJadi, mulalah membuat panggilan."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Ketik imej untuk melihat semua nombor atau tekan dan tahan untuk menyusun semula"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 36e1c6f..9aca131 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Adicionar aos contatos"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> novas chamadas perdidas"</string>
<string name="no_favorites" msgid="5212485868783382971">"Seus favoritos e os contatos\npara os quais você liga com mais frequência aparecerão aqui.\nComece a ligar!"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Toque na imagem para ver todos os números ou pressione e segure para reordenar"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 41f4374..2f20723 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Adăugați în Agendă"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> (de) apeluri nepreluate noi"</string>
<string name="no_favorites" msgid="5212485868783382971">"Preferințele și persoanele din Agendă pe care \nle apelați frecvent vor fi afișate aici.\nDeci începeți să le apelați."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Atingeți imaginea pentru a vedea toate numerele sau apăsați și țineți apăsat pentru a reordona"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e758435..360b502 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Добавить в контакты"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"Пропущенных вызовов: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="no_favorites" msgid="5212485868783382971">"Здесь будут отображаться избранные элементы\nи контакты, которым вы звоните чаще всего.\nОбщайтесь с удовольствием."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Нажмите на фото, чтобы посмотреть все номера. Чтобы изменить порядок номеров, нажмите и удерживайте фото."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5b783d3..48150f4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Pridať do kontaktov"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"Počet nových zmeškaných hovorov: <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="no_favorites" msgid="5212485868783382971">"Obľúbení ľudia a kontakty,\nktorým často voláte, sa zobrazia tu.\nZačnite teda volať."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Klepnutím na obrázok zobrazíte všetky čísla a pridržaním ich zoradíte"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9fa6fc2..7d12e90 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Ongeza kwenye anwani"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"Simu mpya <xliff:g id="NUMBER">%s</xliff:g> ambazo hazikujibiwa"</string>
<string name="no_favorites" msgid="5212485868783382971">"Vipendwa na anwani \n unazopiga mara nyingi zitaonekana hapa.\nHivyo, anza kupiga."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Gonga picha ili uone nambari zote au bonyeza na ushikilie ili upange upya"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b0b55d9..22ca0e8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"เพิ่มในสมุดติดต่อ"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"สายที่ไม่ได้รับใหม่ <xliff:g id="NUMBER">%s</xliff:g> สาย"</string>
<string name="no_favorites" msgid="5212485868783382971">"รายการโปรดและรายชื่อติดต่อที่คุณ\nโทรหาบ่อยจะแสดงที่นี่\n เริ่มโทรได้"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"แตะรูปภาพเพื่อดูหมายเลขทั้งหมด หรือกดค้างเพื่อจัดลำดับใหม่"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1d511cf..638188c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Idagdag sa mga contact"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> (na) bagong hindi nasagot na tawag"</string>
<string name="no_favorites" msgid="5212485868783382971">"Lalabas dito ang mga paborito at contact na\nmadalas mong tinatawagan.\nKaya, simulan ang pagtawag."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"I-tap ang larawan upang makita ang lahat ng numero at pindutin nang matagal upang ayusing muli"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8de0130..76e9db7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Kişilere ekle"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> yeni cevapsız çağrı"</string>
<string name="no_favorites" msgid="5212485868783382971">"Favoriler ve sık telefon ettiğiniz\nkişiler burada görüntülenir.\nTelefon etmeye başlayın."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Tüm numaraları görmek için resme hafifçe vurun veya yeniden sıralamak için basılı tutun"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a5caa82..d1c2bf4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"Thêm vào danh bạ"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> cuộc gọi nhỡ mới"</string>
<string name="no_favorites" msgid="5212485868783382971">"Địa chỉ liên hệ yêu thích và địa chỉ liên hệ bạn\nthường gọi sẽ hiển thị tại đây.\nVì vậy, hãy bắt đầu gọi."</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"Chạm vào hình ảnh để xem tất cả các số hoặc nhấn và giữ để sắp xếp lại"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 795fcbf..9623767 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"添加到通讯录"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g>个新的未接电话"</string>
<string name="no_favorites" msgid="5212485868783382971">"您收藏的联系人和经常通话\n的联系人都会显示在这里。\n现在就开始与联系人通话吧。"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"点按图片可查看所有号码，按住图片可重新排序"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0767ce3..cb3b3a9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -159,6 +159,5 @@
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"加入通訊錄"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> 通新的未接來電"</string>
<string name="no_favorites" msgid="5212485868783382971">"您的最愛聯絡人和經常通話的聯絡人\n會在這裡顯示，\n請開始通話。"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="contact_tooltip" msgid="7817483485692282287">"輕按相片可查看所有號碼，按住則可重新排序"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9ba36fe..9c9b935 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -158,7 +158,6 @@
<string name="search_shortcut_call_number" msgid="7277194656832895870">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="search_shortcut_add_to_contacts" msgid="1853716708655789069">"新增為聯絡人"</string>
<string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> 通新的未接來電"</string>
- <string name="no_favorites" msgid="5212485868783382971">"您的最愛聯絡人和經常通話的聯絡人\n都會顯示在這裡。\n現在就開始與聯絡人通話吧！"</string>
- <!-- no translation found for contact_tooltip (7817483485692282287) -->
- <skip />
+ <string name="no_favorites" msgid="5212485868783382971">"您最愛的聯絡人和經常通話的聯絡人\n都會顯示在這裡，\n可以直接打給他們！"</string>
+ <string name="contact_tooltip" msgid="7817483485692282287">"輕按圖片即可查看所有號碼，按住圖片則可重新排序"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e64ea4c..439ccc2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -67,4 +67,7 @@
<!-- Undo dialogue color -->
<color name="undo_dialogue_text_color">#4d4d4d</color>
+
+ <!-- Text color for no favorites message -->
+ <color name="nofavorite_text_color">#777777</color>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7387b9..98e5b43 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -457,7 +457,7 @@
<string name="description_start_voice_search">Start voice search</string>
<!-- The string used to represent an unknown location for a phone number in the call log [CHAR LIMIT=3] -->
- <string name="call_log_empty_gecode">-</string>
+ <string name="call_log_empty_gecode">\u0020</string>
<!-- Menu item used to call a contact, containing the number of the contact to call -->
<string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 3e65916..12a0f2b 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -29,8 +29,6 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.provider.CallLog.Calls;
@@ -168,21 +166,6 @@
private DialerDatabaseHelper mDialerDatabaseHelper;
- private static final int EVENT_DELAYED_HIDE_SEARCH = 1;
-
- // Wait this much time (in ms) before hiding the search fragment after clicking on
- // a search result to dial, to avoid jank
- private static final int CLEAR_SEARCH_DELAY = 500;
-
- final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == EVENT_DELAYED_HIDE_SEARCH) {
- hideDialpadAndSearchUi();
- }
- }
- };
-
private class OverflowPopupMenu extends PopupMenu {
public OverflowPopupMenu(Context context, View anchor) {
super(context, anchor);
@@ -209,16 +192,14 @@
// CallLog screen (search UI will be automatically exited).
PhoneNumberInteraction.startInteractionForPhoneCall(
DialtactsActivity.this, dataUri, getCallOrigin());
- mHandler.sendEmptyMessageDelayed(EVENT_DELAYED_HIDE_SEARCH,
- CLEAR_SEARCH_DELAY);
+ hideDialpadAndSearchUi();
}
@Override
public void onCallNumberDirectly(String phoneNumber) {
Intent intent = CallUtil.getCallIntent(phoneNumber, getCallOrigin());
startActivity(intent);
- mHandler.sendEmptyMessageDelayed(EVENT_DELAYED_HIDE_SEARCH,
- CLEAR_SEARCH_DELAY);
+ hideDialpadAndSearchUi();
}
@Override
@@ -515,14 +496,6 @@
mSearchView = (EditText) findViewById(R.id.search_view);
mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener);
mSearchView.setHint(getString(R.string.dialer_hint_find_contact));
- mSearchView.setOnFocusChangeListener(new OnFocusChangeListener() {
- @Override
- public void onFocusChange(View view, boolean hasFocus) {
- if (hasFocus) {
- showInputMethod(view.findFocus());
- }
- }
- });
}
final AnimatorListener mHideListener = new AnimatorListenerAdapter() {
@@ -858,6 +831,10 @@
* Hides the search fragment
*/
private void exitSearchUi() {
+ // See related bug in enterSearchUI();
+ if (getFragmentManager().isDestroyed()) {
+ return;
+ }
// Go all the way back to the favorites fragment, regardless of how many times we
// transitioned between search fragments
final BackStackEntry entry = getFragmentManager().getBackStackEntryAt(0);
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index b2493cf..86540ef 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -534,6 +534,8 @@
} else if (PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)) {
// Sets the primary action to call the number.
views.primaryActionView.setTag(IntentProvider.getReturnCallIntentProvider(number));
+ } else {
+ views.primaryActionView.setTag(null);
}
// Store away the voicemail information so we can play it directly.
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 32ec71c..d4fa7d4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -17,7 +17,9 @@
import android.animation.Animator;
import android.animation.AnimatorSet;
+import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
import android.app.Activity;
import android.app.Fragment;
import android.app.LoaderManager;
@@ -26,7 +28,6 @@
import android.content.Loader;
import android.content.SharedPreferences;
import android.database.Cursor;
-import android.database.MatrixCursor;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
@@ -42,7 +43,6 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ImageView;
import android.widget.ListView;
-import android.widget.TextView;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactTileLoaderFactory;
@@ -74,7 +74,7 @@
PhoneFavoritesTileAdapter.OnDataSetChangedForAnimationListener {
private static final String TAG = PhoneFavoriteFragment.class.getSimpleName();
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
private int mAnimationDuration;
@@ -128,6 +128,7 @@
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
if (DEBUG) Log.d(TAG, "ContactTileLoaderListener#onLoadFinished");
mContactTileAdapter.setContactCursor(data);
+ setEmptyViewVisibility(mContactTileAdapter.getCount() == 0);
}
@Override
@@ -179,9 +180,12 @@
private CallLogAdapter mCallLogAdapter;
private CallLogQueryHandler mCallLogQueryHandler;
+ private View mParentView;
+
private PhoneFavoriteListView mListView;
private View mShowAllContactsButton;
+ private View mShowAllContactsInEmptyViewButton;
private final HashMap<Long, Integer> mItemIdTopMap = new HashMap<Long, Integer>();
private final HashMap<Long, Integer> mItemIdLeftMap = new HashMap<Long, Integer>();
@@ -253,10 +257,9 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final View listLayout = inflater.inflate(
- R.layout.phone_favorites_fragment, container, false);
+ mParentView = inflater.inflate(R.layout.phone_favorites_fragment, container, false);
- mListView = (PhoneFavoriteListView) listLayout.findViewById(R.id.contact_tile_list);
+ mListView = (PhoneFavoriteListView) mParentView.findViewById(R.id.contact_tile_list);
mListView.setItemsCanFocus(true);
mListView.setOnItemClickListener(this);
mListView.setVerticalScrollBarEnabled(false);
@@ -266,10 +269,19 @@
mListView.setOnDragDropListener(mContactTileAdapter);
final ImageView dragShadowOverlay =
- (ImageView) listLayout.findViewById(R.id.contact_tile_drag_shadow_overlay);
+ (ImageView) mParentView.findViewById(R.id.contact_tile_drag_shadow_overlay);
mListView.setDragShadowOverlay(dragShadowOverlay);
- mEmptyView = inflater.inflate(R.layout.phone_no_favorites, mListView, false);
+ mEmptyView = mParentView.findViewById(R.id.phone_no_favorites_view);
+
+ mShowAllContactsInEmptyViewButton = mParentView.findViewById(
+ R.id.show_all_contact_button_in_nofav);
+ mShowAllContactsInEmptyViewButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ showAllContacts();
+ }
+ });
mShowAllContactsButton = inflater.inflate(R.layout.show_all_contact_button, mListView,
false);
@@ -280,7 +292,6 @@
}
});
- mContactTileAdapter.setEmptyView(mEmptyView);
mAdapter = new PhoneFavoriteMergedAdapter(getActivity(), this, mContactTileAdapter,
mCallLogAdapter, mShowAllContactsButton);
@@ -290,7 +301,7 @@
mListView.setFastScrollEnabled(false);
mListView.setFastScrollAlwaysVisible(false);
- return listLayout;
+ return mParentView;
}
public boolean hasFrequents() {
@@ -298,6 +309,15 @@
return mContactTileAdapter.getNumFrequents() > 0;
}
+ /* package */ void setEmptyViewVisibility(final boolean visible) {
+ final int previousVisibility = mEmptyView.getVisibility();
+ final int newVisibility = visible ? View.VISIBLE : View.GONE;
+
+ if (previousVisibility != newVisibility) {
+ mEmptyView.setVisibility(newVisibility);
+ }
+ }
+
@Override
public void onStart() {
super.onStart();
@@ -379,6 +399,9 @@
public void onPause() {
// If there are any pending contact entries that are to be removed, remove them
mContactTileAdapter.removePendingContactEntry();
+ // Wipe the cache to refresh the call shortcut item. This is not that expensive because
+ // it only contains one item.
+ mCallLogAdapter.invalidateCache();
super.onPause();
}
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java
index 4e0b8ff..10b9e9a 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -325,6 +325,11 @@
}
final ContactTileRow tile = (ContactTileRow) child;
+
+ if (tile.getTileAdapter().hasPotentialRemoveEntryIndex()) {
+ return false;
+ }
+
final int itemIndex = tile.getItemIndex(x, y);
if (itemIndex != -1 && mOnDragDropListener != null) {
final PhoneFavoriteTileView tileView =
@@ -386,7 +391,8 @@
// Draw the drag shadow at its last known location if the drag shadow exists.
if (mDragShadowOverlay != null) {
- mDragShadowOverlay.setLayoutParams(getDragShadowLayoutParams());
+ mDragShadowOverlay.setX(mDragShadowLeft);
+ mDragShadowOverlay.setY(mDragShadowTop);
}
final ContactTileRow tile = (ContactTileRow) child;
diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index cf2aeee..3347437 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -116,14 +116,12 @@
}
@Override
- public boolean isEmpty() {
- // This adapter will always contain at least the all contacts button
- return false;
- }
-
- @Override
public int getCount() {
- return mContactTileAdapter.getCount() + mCallLogAdapter.getCount() + 1;
+ if (mContactTileAdapter.getCount() > 0) {
+ return mContactTileAdapter.getCount() + mCallLogAdapter.getCount() + 1;
+ } else {
+ return mCallLogAdapter.getCount();
+ }
}
@Override
@@ -198,7 +196,7 @@
public View getView(int position, View convertView, ViewGroup parent) {
final int callLogAdapterCount = mCallLogAdapter.getCount();
- if (position == getCount() - 1) {
+ if ((position == getCount() - 1) && (mContactTileAdapter.getCount() > 0)) {
return mShowAllContactsButton;
}
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index 882d3c6..ce18a2b 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -73,8 +73,6 @@
private Context mContext;
private Resources mResources;
- private View mEmptyView;
-
/** Contact data stored in cache. This is used to populate the associated view. */
protected ArrayList<ContactEntry> mContactEntries = null;
/** Back up of the temporarily removed Contact during dragging. */
@@ -362,15 +360,10 @@
return mNumFrequents;
}
- private boolean isEmptyView(int position) {
- return position == 0 && (mContactEntries == null || mContactEntries.isEmpty());
- }
-
@Override
public int getCount() {
if (mContactEntries == null || mContactEntries.isEmpty()) {
- // empty view
- return 1;
+ return 0;
}
int total = mContactEntries.size();
@@ -493,7 +486,7 @@
@Override
public boolean isEnabled(int position) {
- return !isEmptyView(position);
+ return getCount() > 0;
}
@Override
@@ -512,10 +505,6 @@
int itemViewType = getItemViewType(position);
- if (itemViewType == ViewTypes.EMPTY) {
- return mEmptyView;
- }
-
ContactTileRow contactTileRowView = (ContactTileRow) convertView;
ArrayList<ContactEntry> contactList = getItem(position);
@@ -547,7 +536,6 @@
@Override
public int getItemViewType(int position) {
- if (isEmptyView(position)) return ViewTypes.EMPTY;
if (position < getRowCount(getMaxContactsInTiles())) {
return ViewTypes.TOP;
} else {
@@ -679,6 +667,10 @@
mPotentialRemoveEntryIndex = -1;
}
+ public boolean hasPotentialRemoveEntryIndex() {
+ return isIndexInBound(mPotentialRemoveEntryIndex);
+ }
+
/**
* Clears all temporary variables at a new interaction.
*/
@@ -815,7 +807,7 @@
contactTile.setPaddingRelative(0, 0,
childIndex >= mColumnCount - 1 ? 0 : mPaddingInPixels, 0);
entryIndex = getFirstContactEntryIndexForPosition(mPosition) + childIndex;
- SwipeHelper.setSwipeable(contactTile, true);
+ SwipeHelper.setSwipeable(contactTile, false);
break;
case ViewTypes.FREQUENT:
contactTile.setHorizontalDividerVisibility(
@@ -1164,10 +1156,9 @@
}
protected static class ViewTypes {
- public static final int COUNT = 3;
public static final int FREQUENT = 0;
public static final int TOP = 1;
- public static final int EMPTY = 2;
+ public static final int COUNT = 2;
}
@Override
@@ -1216,8 +1207,4 @@
setInDragging(false);
handleDrop();
}
-
- public void setEmptyView(View emptyView) {
- mEmptyView = emptyView;
- }
}
