Merge "Enable icon selection in call log" into lmp-dev
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml
deleted file mode 100644
index 1ba6c57..0000000
--- a/res/drawable/view_pager_tab_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/tab_ripple_color">
- <item android:id="@android:id/mask">
- <color android:color="@android:color/white" />
- </item>
-</ripple>
\ No newline at end of file
diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml
index 3b7609f..0109df7 100644
--- a/res/layout/call_log_activity.xml
+++ b/res/layout/call_log_activity.xml
@@ -19,7 +19,7 @@
android:layout_height="match_parent"
android:id="@+id/calllog_frame"
android:orientation="vertical">
- <com.android.dialer.list.ViewPagerTabs
+ <com.android.contacts.common.list.ViewPagerTabs
android:id="@+id/viewpager_header"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_height"
diff --git a/res/layout/dialer_preferences.xml b/res/layout/dialer_preferences.xml
new file mode 100644
index 0000000..bbb79bc
--- /dev/null
+++ b/res/layout/dialer_preferences.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Layout of a header item in PreferenceActivity. This is modified from the platform
+ preference_header_item-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="48dp"
+ android:background="?android:attr/activatedBackgroundIndicator"
+ android:gravity="center_vertical"
+ android:paddingEnd="?android:attr/scrollbarSize">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dip"
+ android:layout_marginEnd="6dip"
+ android:layout_gravity="center" />
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/preference_side_margin"
+ android:layout_marginEnd="@dimen/preference_side_margin"
+ android:layout_weight="1"
+ android:paddingTop="@dimen/preference_padding_top"
+ android:paddingBottom="@dimen/preference_padding_bottom">
+
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearance"
+ android:textSize="16sp"
+ android:textColor="@color/setting_primary_color"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignStart="@id/title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/setting_secondary_color"
+ android:lineSpacingExtra="@dimen/preference_summary_line_spacing_extra"
+ android:ellipsize="end"
+ android:maxLines="2" />
+
+ </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml
index 1de8364..987c61f 100644
--- a/res/layout/lists_fragment.xml
+++ b/res/layout/lists_fragment.xml
@@ -40,7 +40,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <com.android.dialer.list.ViewPagerTabs
+ <com.android.contacts.common.list.ViewPagerTabs
android:id="@+id/lists_pager_header"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_height"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6aac5c1..2d334ba 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -91,8 +91,7 @@
<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="menu_select_account" msgid="5576598753317289565">"Vybrat účet"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Nastavení"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Nový kontakt"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Všechny kontakty"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Podrobnosti hovoru"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Podrobnosti kontaktu pro <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Nová hlasová zpráva"</string>
<string name="description_num_calls" msgid="1601505153694540074">"Počet hovorů: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>"</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Videohovor"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Přehrávat pomaleji."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Spustit nebo pozastavit přehrávání."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Nastavení hovorů"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Vyzvánění, nastavení hlasové schránky, volání VoIP apod."</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8822158..b4ec5a9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Ajouter une pause de 2 s"</string>
<string name="add_wait" msgid="3360818652790319634">"Ajouter Attendre"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Sélectionnez un compte"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Paramètres"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Nouveau contact"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Tous les contacts"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Détails sur l\'appel"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Coordonnées de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Nouveau message vocal."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Appel vidéo."</string>
<string name="description_send_text_message" msgid="7803126439934046891">"Envoyer un SMS à <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nouveau message vocal"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Démarrer la recherche vocale"</string>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Lire moins vite."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Lancer ou interrompre la lecture."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Paramètres d\'appel"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Sonneries, paramètres de messagerie vocale, appels VoIP, etc."</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 097c0d5..dc7261f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Dodaj pauzu od 2 sek."</string>
<string name="add_wait" msgid="3360818652790319634">"Dodaj čekanje"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Odaberite račun"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Postavke"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Novi kontakt"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Svi kontakti"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Pojedinosti poziva"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Pojedinosti o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Nova govorna pošta."</string>
<string name="description_num_calls" msgid="1601505153694540074">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Videopoziv."</string>
<string name="description_send_text_message" msgid="7803126439934046891">"Slanje tekstualne poruke: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nepreslušana govorna pošta"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Pokretanje glasovnog pretraživanja"</string>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Sporija reprodukcija."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Pokretanje ili pauziranje reprodukcije."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Postavke poziva"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Melodije zvona, postavke govorne pošte, VoIP pozivi itd."</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a216c41..4be26ce 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Ավելացնել 2 վայրկյան դադար"</string>
<string name="add_wait" msgid="3360818652790319634">"Ավելացնել սպասում"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Ընտրեք հաշիվ"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Կարգավորումներ"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Նոր կոնտակտ"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Բոլոր կոնտակտները"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Զանգի մանրամասները"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Նոր ձայնային հաղորդագրություն:"</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> զանգ:"</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Տեսազանգ"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Նվագարկել ավելի դանդաղ:"</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Սկսել կամ դադարեցնել նվագարկումը:"</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Զանգերի կարգավորումներ"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Զանգերանգներ, ձայնային փոստի կարգավորումներ, VoIP զանգեր և այլն"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 14efbb6..385c93e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"ორწამიანი პაუზის დამატება"</string>
<string name="add_wait" msgid="3360818652790319634">"ლოდინის დამატება"</string>
<string name="menu_select_account" msgid="5576598753317289565">"ანგარიშის არჩევა"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"პარამეტრები"</string>
<string name="menu_newContact" msgid="1209922412763274638">"ახალი კონტაქტი"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"ყველა კონტაქტი"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"ზარის დეტალები"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის კონტაქტის დეტალები"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"ახალი ხმოვანი ფოსტა."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ზარი."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"ვიდეოზარი."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"დაკვრის შენელება."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"დაკვრის დაწყება ან პაუზა."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"ზარის პარამეტრები"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"ზარები, ხმოვანი ფოსტის პარამეტრები, VoIP დარეკვა და სხვ."</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 00b2fe0..1d41080 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"2 сек үзіліс қосу"</string>
<string name="add_wait" msgid="3360818652790319634">"Күтуді қосу"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Есептік жазбаны таңдау"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Параметрлер"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Жаңа контакт"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Барлық контактілер"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Қоңырау деректері"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> контакт деректері"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Жаңа дауыс-хабары."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> қоңыраулар."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Бейне қоңырау."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Баяуырақ ойнату."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ойнатуды бастау немесе кідірту."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Қоңырау параметрлері"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Қоңырау әуендері, дауыстық пошта параметрлері, VoIP қоңыраулары, т.б."</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 22bd0cd..49dc8ec 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -118,8 +118,7 @@
<!-- no translation found for add_wait (3360818652790319634) -->
<skip />
<string name="menu_select_account" msgid="5576598753317289565">"Каттоо эсебин тандаңыз"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Жөндөөлөр"</string>
<!-- no translation found for menu_newContact (1209922412763274638) -->
<skip />
<string name="menu_allContacts" msgid="6948308384034051670">"Бардык байланыштар"</string>
@@ -152,8 +151,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> байланыш маалыматтары"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Жаңы үнкат."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> чалуу."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Видео чалуу."</string>
<string name="description_send_text_message" msgid="7803126439934046891">"<xliff:g id="NAME">%1$s</xliff:g> SMS жөнөтүү"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Угула элек үнкат"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Үн менен издеп баштоо"</string>
@@ -237,8 +235,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Жайыраак ойнотуу."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ойнотуп баштоо же бир азга токтотуу"</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Чалуу жөндөөлөрү"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Шыңгырлар, үн почтасынын жөндөөлөрү, VoIP чалуу ж.б."</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 14a3be1..5de5614 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Tambah jeda 2 saat"</string>
<string name="add_wait" msgid="3360818652790319634">"Tambah penungguan"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Pilih Akaun"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Tetapan"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Kenalan baru"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Semua kenalan"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Butiran panggilan"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Butiran hubungan untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Mel suara baharu."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Panggilan video."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Main lebih perlahan."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Mulakan atau jeda main balik."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Tetapan Panggilan"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Nada dering, tetapan mel suara, panggilan VoIP, dll."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 92ae647..ca5ca33 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Добавить двухсекундную паузу"</string>
<string name="add_wait" msgid="3360818652790319634">"Добавить паузу"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Выбрать аккаунт"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Настройки"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Новый контакт"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Все контакты"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Сведения о вызове"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Новое голосовое сообщение."</string>
<string name="description_num_calls" msgid="1601505153694540074">"Вызовов: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Видеовстреча"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Уменьшить скорость воспроизведения."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Начать или приостановить воспроизведение."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Настройки вызовов"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Рингтоны, голосовая почта, IP-телефония и другие настройки"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index f335458..50624c5 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"තත්පර 2 ක විරාමයක් එක් කරන්න"</string>
<string name="add_wait" msgid="3360818652790319634">"රැඳී සිටීම එක් කරන්න"</string>
<string name="menu_select_account" msgid="5576598753317289565">"ගිණුම තෝරන්න"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"සැකසීම්"</string>
<string name="menu_newContact" msgid="1209922412763274638">"නව සම්බන්ධතාවයක්"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"සියලුම සම්බන්ධතා"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"ඇමතුම් විස්තර"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"නව හඬ තැපෑල."</string>
<string name="description_num_calls" msgid="1601505153694540074">"ඇමතුම් <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"වීඩියෝ ඇමතුම."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"හෙමින් ධාවනය කරන්න."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"නැවත ධාවනයෙදී ආරම්භ කරන්න හෝ විරාමය කරන්න."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"ඇමතුම් සැකසීම්"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"රිගින්ටෝන්ස්, හඬ තැපෑල් සැකසීම්, VoIP ඇමතුම, ආදී"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 95460dc..9699f72 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Pridať dvojsekundovú pauzu"</string>
<string name="add_wait" msgid="3360818652790319634">"Pridať čakanie"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Vybrať účet"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Nastavenia"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Nový kontakt"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Všetky kontakty"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Podrobnosti hovoru"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Podrobnosti kontaktu pre <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Nová hlasová správa."</string>
<string name="description_num_calls" msgid="1601505153694540074">"Počet volaní: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Videohovor"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Prehrať pomalšie"</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Spustiť alebo pozastaviť prehrávanie"</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Nastavenia hovorov"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Tóny zvonenia, nastavenia hlasovej schránky, volania VoIP atď."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ac5b56e..2a0cea3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Додај паузу од 2 секунде"</string>
<string name="add_wait" msgid="3360818652790319634">"Додај чекање"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Изабери налог"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Подешавања"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Нови контакт"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Сви контакти"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Детаљи позива"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Детаљи о контакту за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Нова говорна порука."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> позива."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Видео позив."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Спорија репродукција."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Започните или паузирајте репродукцију."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Подешавања позива"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Мелодије звона, подешавања говорне поште, VoIP позивање итд."</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9cb9e12..ecfb8c4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"เพิ่มช่วงคั่น 2 วินาที"</string>
<string name="add_wait" msgid="3360818652790319634">"เพิ่มการรอ"</string>
<string name="menu_select_account" msgid="5576598753317289565">"เลือกบัญชี"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"การตั้งค่า"</string>
<string name="menu_newContact" msgid="1209922412763274638">"สร้างรายชื่อใหม่"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"ที่อยู่ติดต่อทั้งหมด"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"รายละเอียดการโทร"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"รายละเอียดที่อยู่ติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"ข้อความเสียงใหม่"</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> สาย"</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"แฮงเอาท์วิดีโอ"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"เล่นช้าลง"</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"เริ่มหรือหยุดเล่นชั่วคราว"</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"การตั้งค่าการโทร"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"เสียงเรียกเข้า การตั้งค่าข้อความเสียง การโทร VoIP และอื่นๆ"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index af67116..ec63c26 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -87,13 +87,11 @@
<string name="menu_show_missed_only" msgid="154473166059743996">"Ipakita lang ang hindi nasagot"</string>
<string name="menu_show_voicemails_only" msgid="1898421289561435703">"Ipakita lamang ang mga voicemail"</string>
<string name="menu_show_all_calls" msgid="7560347482073345885">"Ipakita ang lahat ng tawag"</string>
- <!-- no translation found for add_contact (4579643070374941999) -->
- <skip />
+ <string name="add_contact" msgid="4579643070374941999">"Idagdag sa mga contact"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Magdagdag ng pag-pause na 2-seg"</string>
<string name="add_wait" msgid="3360818652790319634">"Magdagdag ng paghihintay"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Pumili ng Account"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Mga Setting"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Bagong contact"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Lahat ng contact"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Mga detalye ng tawag"</string>
@@ -115,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"Mga detalye sa pakikipag-ugnayan para kay/sa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Bagong voicemail."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (na) tawag."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Video call."</string>
<string name="description_send_text_message" msgid="7803126439934046891">"Ipadala ang text message kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Hindi pa naririnig na voicemail"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Simulan ang paghahanap gamit ang boses"</string>
@@ -176,10 +173,8 @@
<string name="description_voicemail_action" msgid="8054891873788903063">"Makinig sa voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="description_details_action" msgid="2433827152749491785">"Mga detalye ng tawag para sa/kay <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
<string name="toast_entry_removed" msgid="3389119736202317999">"Tinanggal ang entry sa log ng tawag."</string>
- <!-- no translation found for toast_caller_id_reported (1127087402649645557) -->
- <skip />
- <!-- no translation found for call_log_action_report (561229827189128879) -->
- <skip />
+ <string name="toast_caller_id_reported" msgid="1127087402649645557">"Naiulat ang contact."</string>
+ <string name="call_log_action_report" msgid="561229827189128879">"IULAT"</string>
<string name="call_log_header_today" msgid="3225248682434212981">"Ngayon"</string>
<string name="call_log_header_yesterday" msgid="9139172458834033092">"Kahapon"</string>
<string name="call_log_header_last_week" msgid="5197040511028258038">"Nakaraang linggo"</string>
@@ -191,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Mag-play nang mas mabagal."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Simulan o i-pause ang pag-playback."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Mga Setting ng Tawag"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Mga ringtone, setting ng voicemail, VoIP na pagtawag, atbp"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0d8aa2d..f470922 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"2 saniyelik duraklama ekle"</string>
<string name="add_wait" msgid="3360818652790319634">"Bekleme ekle"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Hesap Seç"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Ayarlar"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Yeni kişi"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Tüm kişiler"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Çağrı ayrıntıları"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> için kişi ayrıntıları"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Yeni sesli mesaj."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> çağrı."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Video görüşmesi."</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Daha yavaş çalın."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Çalmayı başlatın veya duraklatın."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Çağrı Ayarları"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Zil sesleri, sesli mesaj ayarları, VoIP çağrısı vb."</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 1b26f16..81e5e02 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"2 سیکنڈ کا توقف شامل کریں"</string>
<string name="add_wait" msgid="3360818652790319634">"انتظار شامل کریں"</string>
<string name="menu_select_account" msgid="5576598753317289565">"اکاؤنٹ منتخب کریں"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"ترتیبات"</string>
<string name="menu_newContact" msgid="1209922412763274638">"نیا رابطہ"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"سبھی رابطے"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"کال کی تفصیلات"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> کیلئے رابطہ کی تفصیلات"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"نیا صوتی میل۔"</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> کالیں۔"</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"ویڈیو کال۔"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"آہستہ چلائیں۔"</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"پلے بیک شروع یا موقوف کریں۔"</string>
<string name="list_delimeter" msgid="4571593167738725100">"، "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"کال کی ترتیبات"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"رنگ ٹونز، صوتی میل کی ترتیبات، VoIP کالنگ وغیرہ"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index df8d173..83d3274 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"2 soniyalik pauza qo‘shish"</string>
<string name="add_wait" msgid="3360818652790319634">"Kutishni qo‘shish"</string>
<string name="menu_select_account" msgid="5576598753317289565">"Hisob tanlash"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"Sozlamalar"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Yangi kontakt"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Barcha kontaktlar"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Qo‘ng‘roq tafsilotlari"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> uchun kontakt ma’lumotlari"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"Yangi ovozli xabar."</string>
<string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ta qo‘ng‘iroq."</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"Video qo‘ng‘iroq."</string>
<string name="description_send_text_message" msgid="7803126439934046891">"<xliff:g id="NAME">%1$s</xliff:g>ga sms jo‘natish"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Ochilmagan ovozli xabar"</string>
<string name="description_start_voice_search" msgid="520539488194946012">"Ovozli qidiruvni boshlash"</string>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Sekinroq ijro etish."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Ijroni boshlash yoki to‘xtatish"</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"Qo‘ng‘iroq sozlamalari"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"Ringtonlar, ovozli pochta sozlamalari, VoIP qo‘ng‘iroqlari va h.k."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e007777..5dd1e5c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -126,7 +126,7 @@
<string name="payphone" msgid="4864313342828942922">"公用电话"</string>
<string name="dialerKeyboardHintText" msgid="5401660096579787344">"使用键盘拨号"</string>
<string name="dialerDialpadHintText" msgid="5824490365898349041">"拨号以添加通话"</string>
- <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+ <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g>分<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"电话未拨出"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"要设置语音信箱，请转到“菜单”>“设置”。"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"要呼叫语音信箱，请先关闭飞行模式。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f91000b..5513dc8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -91,8 +91,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"暫停時間延長 2 秒"</string>
<string name="add_wait" msgid="3360818652790319634">"延長等待時間"</string>
<string name="menu_select_account" msgid="5576598753317289565">"選取帳戶"</string>
- <!-- no translation found for dialer_settings_label (4305043242594150479) -->
- <skip />
+ <string name="dialer_settings_label" msgid="4305043242594150479">"設定"</string>
<string name="menu_newContact" msgid="1209922412763274638">"新增聯絡人"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"所有聯絡人"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"通話詳細資料"</string>
@@ -114,8 +113,7 @@
<string name="description_contact_details" msgid="51229793651342809">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡詳細資料"</string>
<string name="description_new_voicemail" msgid="2133792360865517746">"新的語音留言。"</string>
<string name="description_num_calls" msgid="1601505153694540074">"通話 <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次。"</string>
- <!-- no translation found for description_video_call (2933838090743214204) -->
- <skip />
+ <string name="description_video_call" msgid="2933838090743214204">"視訊通話。"</string>
<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>
@@ -188,8 +186,6 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"放慢播放速度。"</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"開始或暫停播放。"</string>
<string name="list_delimeter" msgid="4571593167738725100">"、 "</string>
- <!-- no translation found for call_settings_label (2934215322075055446) -->
- <skip />
- <!-- no translation found for call_settings_description (7955465849094897305) -->
- <skip />
+ <string name="call_settings_label" msgid="2934215322075055446">"通話設定"</string>
+ <string name="call_settings_description" msgid="7955465849094897305">"鈴聲、語音信箱設定、VoIP 通話功能等"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0b75de5..d7a929f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -93,7 +93,4 @@
<color name="actionbar_icon_color">#ffffff</color>
<color name="dialer_dialpad_touch_tint">#331dc7db</color>
-
- <color name="tab_ripple_color">@color/dialer_accent_color</color>
- <color name="tab_selected_underline_color">@color/dialer_accent_color</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 32cb852..b7aceef 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -84,7 +84,6 @@
room to the search box-->
<dimen name="action_bar_height">64dp</dimen>
<dimen name="tab_height">43dp</dimen>
- <dimen name="tab_elevation">2dp</dimen>
<!-- actionbar height + tab height -->
<dimen name="actionbar_and_tab_height">107dp</dimen>
@@ -122,7 +121,7 @@
<!-- Height of the call log actions section for each call log entry -->
<dimen name="call_log_action_height">44dp</dimen>
<!-- Z Translation of expanded call log items. -->
- <dimen name="call_log_expanded_translation_z">4dp</dimen>
+ <dimen name="call_log_expanded_translation_z">2dp</dimen>
<dimen name="call_log_day_group_padding_top">15dp</dimen>
<dimen name="call_log_day_group_padding_bottom">9dp</dimen>
@@ -130,4 +129,11 @@
<dimen name="shadow_length">10dp</dimen>
<dimen name="empty_list_message_text_size">16sp</dimen>
+
+ <!-- Dimensions for individual preference cards -->
+ <dimen name="preference_padding_top">18dp</dimen>
+ <dimen name="preference_padding_bottom">16dp</dimen>
+ <dimen name="preference_side_margin">16dp</dimen>
+ <dimen name="preference_list_top_padding">4dp</dimen>
+ <dimen name="preference_summary_line_spacing_extra">4dp</dimen>
</resources>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index a19964b..bf2af13 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -36,6 +36,7 @@
import android.provider.ContactsContract.Intents;
import android.speech.RecognizerIntent;
import android.support.v4.view.ViewPager;
+import android.telecomm.TelecommManager;
import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.TextUtils;
@@ -114,10 +115,6 @@
public static final String SHARED_PREFS_NAME = "com.android.dialer_preferences";
- /** Used to open Call Setting */
- private static final String PHONE_PACKAGE = "com.android.phone";
- private static final String CALL_SETTINGS_CLASS_NAME =
- "com.android.phone.CallFeaturesSetting";
/** @see #getCallOrigin() */
private static final String CALL_ORIGIN_DIALTACTS =
"com.android.dialer.DialtactsActivity";
@@ -926,8 +923,7 @@
/** Returns an Intent to launch Call Settings screen */
public static Intent getCallSettingsIntent() {
- final Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.setClassName(PHONE_PACKAGE, CALL_SETTINGS_CLASS_NAME);
+ final Intent intent = new Intent(TelecommManager.ACTION_SHOW_CALL_SETTINGS);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
return intent;
}
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index f743f7a..4e969e1 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -31,7 +31,7 @@
import com.android.dialer.DialtactsActivity;
import com.android.dialer.R;
-import com.android.dialer.list.ViewPagerTabs;
+import com.android.contacts.common.list.ViewPagerTabs;
import com.android.dialer.voicemail.VoicemailStatusHelper;
import com.android.dialer.voicemail.VoicemailStatusHelperImpl;
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 103eef7..847edd9 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -24,6 +24,7 @@
import android.widget.ListView;
import com.android.contacts.common.GeoUtil;
+import com.android.contacts.common.list.ViewPagerTabs;
import com.android.dialer.DialtactsActivity;
import android.view.View.OnClickListener;
diff --git a/src/com/android/dialer/list/ViewPagerTabStrip.java b/src/com/android/dialer/list/ViewPagerTabStrip.java
deleted file mode 100644
index ac16694..0000000
--- a/src/com/android/dialer/list/ViewPagerTabStrip.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.list;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.android.dialer.R;
-
-public class ViewPagerTabStrip extends LinearLayout {
- private int mSelectedUnderlineThickness;
- private final Paint mSelectedUnderlinePaint;
-
- private int mIndexForSelection;
- private float mSelectionOffset;
-
- public ViewPagerTabStrip(Context context) {
- this(context, null);
- }
-
- public ViewPagerTabStrip(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- final Resources res = context.getResources();
-
- mSelectedUnderlineThickness =
- res.getDimensionPixelSize(R.dimen.tab_selected_underline_height);
- int underlineColor = res.getColor(R.color.tab_selected_underline_color);
- int backgroundColor = res.getColor(R.color.actionbar_background_color);
-
- mSelectedUnderlinePaint = new Paint();
- mSelectedUnderlinePaint.setColor(underlineColor);
-
- setBackgroundColor(backgroundColor);
- setWillNotDraw(false);
- }
-
- /**
- * Notifies this view that view pager has been scrolled. We save the tab index
- * and selection offset for interpolating the position and width of selection
- * underline.
- */
- void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- mIndexForSelection = position;
- mSelectionOffset = positionOffset;
- invalidate();
- }
-
- /**
- * Notifies this view that a new page has been selected in the view pager. We save the tab
- * index and reset the selection offset to 0.
- */
- void onPageSelected(int position) {
- mIndexForSelection = position;
- mSelectionOffset = 0;
- invalidate();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- int childCount = getChildCount();
-
- // Thick colored underline below the current selection
- if (childCount > 0) {
- View selectedTitle = getChildAt(mIndexForSelection);
- int selectedLeft = selectedTitle.getLeft();
- int selectedRight = selectedTitle.getRight();
- if ((mSelectionOffset > 0.0f) &&
- (mIndexForSelection < (getChildCount() - 1))) {
- // Draw the selection partway between the tabs
- View nextTitle = getChildAt(mIndexForSelection + 1);
- int nextLeft = nextTitle.getLeft();
- int nextRight = nextTitle.getRight();
-
- selectedLeft = (int) (mSelectionOffset * nextLeft +
- (1.0f - mSelectionOffset) * selectedLeft);
- selectedRight = (int) (mSelectionOffset * nextRight +
- (1.0f - mSelectionOffset) * selectedRight);
- }
-
- int height = getHeight();
- canvas.drawRect(selectedLeft, height - mSelectedUnderlineThickness,
- selectedRight, height, mSelectedUnderlinePaint);
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/android/dialer/list/ViewPagerTabs.java b/src/com/android/dialer/list/ViewPagerTabs.java
deleted file mode 100644
index 3717369..0000000
--- a/src/com/android/dialer/list/ViewPagerTabs.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.android.dialer.list;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.Outline;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewOutlineProvider;
-import android.widget.FrameLayout;
-import android.widget.HorizontalScrollView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.android.dialer.R;
-
-/**
- * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
- * but allows for the view containing the tabs to be placed anywhere on screen. Text-related
- * attributes can also be assigned in XML - these will get propogated to the child TextViews
- * automatically.
- */
-public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnPageChangeListener {
-
- ViewPager mPager;
- private ViewPagerTabStrip mTabStrip;
-
- /**
- * Linearlayout that will contain the TextViews serving as tabs. This is the only child
- * of the parent HorizontalScrollView.
- */
- final int mTextStyle;
- final ColorStateList mTextColor;
- final int mTextSize;
- final boolean mTextAllCaps;
- int mPrevSelected = -1;
- int mSidePadding;
-
- private static final ViewOutlineProvider VIEW_BOUNDS_OUTLINE_PROVIDER =
- new ViewOutlineProvider() {
- @Override
- public void getOutline(View view, Outline outline) {
- outline.setRect(0, 0, view.getWidth(), view.getHeight());
- }
- };
-
- private static final int TAB_SIDE_PADDING_IN_DPS = 10;
-
- // TODO: This should use <declare-styleable> in the future
- private static final int[] ATTRS = new int[] {
- android.R.attr.textSize,
- android.R.attr.textStyle,
- android.R.attr.textColor,
- android.R.attr.textAllCaps
- };
-
- /**
- * Simulates actionbar tab behavior by showing a toast with the tab title when long clicked.
- */
- private class OnTabLongClickListener implements OnLongClickListener {
- final int mPosition;
-
- public OnTabLongClickListener(int position) {
- mPosition = position;
- }
-
- @Override
- public boolean onLongClick(View v) {
- final int[] screenPos = new int[2];
- getLocationOnScreen(screenPos);
-
- final Context context = getContext();
- final int width = getWidth();
- final int height = getHeight();
- final int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
-
- Toast toast = Toast.makeText(context, mPager.getAdapter().getPageTitle(mPosition),
- Toast.LENGTH_SHORT);
-
- // Show the toast under the tab
- toast.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL,
- (screenPos[0] + width / 2) - screenWidth / 2, screenPos[1] + height);
-
- toast.show();
- return true;
- }
- }
-
- public ViewPagerTabs(Context context) {
- this(context, null);
- }
-
- public ViewPagerTabs(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public ViewPagerTabs(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- setFillViewport(true);
-
- mSidePadding = (int) (getResources().getDisplayMetrics().density * TAB_SIDE_PADDING_IN_DPS);
-
- final TypedArray a = context.obtainStyledAttributes(attrs, ATTRS);
- mTextSize = a.getDimensionPixelSize(0, 0);
- mTextStyle = a.getInt(1, 0);
- mTextColor = a.getColorStateList(2);
- mTextAllCaps = a.getBoolean(3, false);
-
- mTabStrip = new ViewPagerTabStrip(context);
- addView(mTabStrip,
- new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
- a.recycle();
-
- // enable shadow casting from view bounds
- setOutlineProvider(VIEW_BOUNDS_OUTLINE_PROVIDER);
- }
-
- public void setViewPager(ViewPager viewPager) {
- mPager = viewPager;
- addTabs(mPager.getAdapter());
- }
-
- private void addTabs(PagerAdapter adapter) {
- mTabStrip.removeAllViews();
-
- final int count = adapter.getCount();
- for (int i = 0; i < count; i++) {
- addTab(adapter.getPageTitle(i), i);
- }
- }
-
- private void addTab(CharSequence tabTitle, final int position) {
- final TextView textView = new TextView(getContext());
- textView.setText(tabTitle);
- textView.setBackgroundResource(R.drawable.view_pager_tab_background);
- textView.setGravity(Gravity.CENTER);
- textView.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mPager.setCurrentItem(position);
- }
- });
-
- textView.setOnLongClickListener(new OnTabLongClickListener(position));
-
- // Assign various text appearance related attributes to child views.
- if (mTextStyle > 0) {
- textView.setTypeface(textView.getTypeface(), mTextStyle);
- }
- if (mTextSize > 0) {
- textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
- }
- if (mTextColor != null) {
- textView.setTextColor(mTextColor);
- }
- textView.setAllCaps(mTextAllCaps);
- textView.setPadding(mSidePadding, 0, mSidePadding, 0);
- mTabStrip.addView(textView, new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
- LayoutParams.MATCH_PARENT, 1));
- // Default to the first child being selected
- if (position == 0) {
- mPrevSelected = 0;
- textView.setSelected(true);
- }
- }
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- int tabStripChildCount = mTabStrip.getChildCount();
- if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
- return;
- }
-
- mTabStrip.onPageScrolled(position, positionOffset, positionOffsetPixels);
- smoothScrollTo(position, 0);
- }
-
- @Override
- public void onPageSelected(int position) {
- if (mPrevSelected >= 0) {
- mTabStrip.getChildAt(mPrevSelected).setSelected(false);
- }
- final View selectedChild = mTabStrip.getChildAt(position);
- selectedChild.setSelected(true);
-
- // Update scroll position
- final int scrollPos = selectedChild.getLeft() - (getWidth() - selectedChild.getWidth()) / 2;
- smoothScrollTo(scrollPos, 0);
- mPrevSelected = position;
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- }
-}
-
diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 904be82..6d21db0 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -1,11 +1,22 @@
package com.android.dialer.settings;
+import com.google.common.collect.Lists;
+
+import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.preference.PreferenceActivity.Header;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment;
import com.android.dialer.DialtactsActivity;
@@ -16,11 +27,15 @@
public class DialerSettingsActivity extends PreferenceActivity {
protected SharedPreferences mPreferences;
+ private HeaderAdapter mHeaderAdapter;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+ final int topPadding = getResources().getDimensionPixelSize(
+ R.dimen.preference_list_top_padding);
+ getListView().setPadding(0, topPadding, 0, 0);
}
@Override
@@ -51,4 +66,72 @@
protected boolean isValidFragment(String fragmentName) {
return true;
}
+
+ @Override
+ public void setListAdapter(ListAdapter adapter) {
+ if (adapter == null) {
+ super.setListAdapter(null);
+ } else {
+ // We don't have access to the hidden getHeaders() method, so grab the headers from
+ // the intended adapter and then replace it with our own.
+ int headerCount = adapter.getCount();
+ List<Header> headers = Lists.newArrayList();
+ for (int i = 0; i < headerCount; i++) {
+ headers.add((Header) adapter.getItem(i));
+ }
+ mHeaderAdapter = new HeaderAdapter(this, headers);
+ super.setListAdapter(mHeaderAdapter);
+ }
+ }
+
+ /**
+ * This custom {@code ArrayAdapter} is mostly identical to the equivalent one in
+ * {@code PreferenceActivity}, except with a local layout resource.
+ */
+ private static class HeaderAdapter extends ArrayAdapter<Header> {
+ static class HeaderViewHolder {
+ ImageView icon;
+ TextView title;
+ TextView summary;
+ }
+
+ private LayoutInflater mInflater;
+
+ public HeaderAdapter(Context context, List<Header> objects) {
+ super(context, 0, objects);
+ mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ HeaderViewHolder holder;
+ View view;
+
+ if (convertView == null) {
+ view = mInflater.inflate(R.layout.dialer_preferences, parent, false);
+ holder = new HeaderViewHolder();
+ holder.icon = (ImageView) view.findViewById(R.id.icon);
+ holder.title = (TextView) view.findViewById(R.id.title);
+ holder.summary = (TextView) view.findViewById(R.id.summary);
+ view.setTag(holder);
+ } else {
+ view = convertView;
+ holder = (HeaderViewHolder) view.getTag();
+ }
+
+ // All view fields must be updated every time, because the view may be recycled
+ Header header = getItem(position);
+ holder.icon.setImageResource(header.iconRes);
+ holder.title.setText(header.getTitle(getContext().getResources()));
+ CharSequence summary = header.getSummary(getContext().getResources());
+ if (!TextUtils.isEmpty(summary)) {
+ holder.summary.setVisibility(View.VISIBLE);
+ holder.summary.setText(summary);
+ } else {
+ holder.summary.setVisibility(View.GONE);
+ }
+
+ return view;
+ }
+ }
}