diff options
107 files changed, 433 insertions, 280 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml index 4463f2f24..fa0bda02a 100644 --- a/res/anim/slide_in.xml +++ b/res/anim/slide_in.xml @@ -17,4 +17,4 @@ android:interpolator="@interpolator/ease_in_interpolator" android:duration="@integer/dialpad_slide_in_duration" android:fromYDelta="67%p" - android:toYDelta="0" />
\ No newline at end of file + android:toYDelta="0" /> diff --git a/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml new file mode 100644 index 000000000..11b764a36 --- /dev/null +++ b/res/anim/slide_in_right.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="67%p" + android:toXDelta="0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="@integer/dialpad_slide_in_duration"/> diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml index 88687f477..e5d7ed4b9 100644 --- a/res/anim/slide_out.xml +++ b/res/anim/slide_out.xml @@ -17,4 +17,4 @@ android:interpolator="@interpolator/ease_out_interpolator" android:duration="@integer/dialpad_slide_out_duration" android:fromYDelta="0" - android:toYDelta="80%p" />
\ No newline at end of file + android:toYDelta="80%p" /> diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml new file mode 100644 index 000000000..72304a4b2 --- /dev/null +++ b/res/anim/slide_out_right.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="0" + android:toXDelta="80%" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="@integer/dialpad_slide_out_duration"/> diff --git a/res/drawable-hdpi/fab_ic_call.png b/res/drawable-hdpi/fab_ic_call.png Binary files differindex 548a391a6..7bf83fa6a 100644 --- a/res/drawable-hdpi/fab_ic_call.png +++ b/res/drawable-hdpi/fab_ic_call.png diff --git a/res/drawable-hdpi/fab_ic_dial.png b/res/drawable-hdpi/fab_ic_dial.png Binary files differindex a856632c9..3cad4c660 100644 --- a/res/drawable-hdpi/fab_ic_dial.png +++ b/res/drawable-hdpi/fab_ic_dial.png diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_teal_background.png Binary files differindex 88e849596..e2f01e87a 100644 --- a/res/drawable-hdpi/fab_teal_background.png +++ b/res/drawable-hdpi/fab_teal_background.png diff --git a/res/drawable-hdpi/ic_ab_search.png b/res/drawable-hdpi/ic_ab_search.png Binary files differindex 3702846fd..d86b2195a 100644 --- a/res/drawable-hdpi/ic_ab_search.png +++ b/res/drawable-hdpi/ic_ab_search.png diff --git a/res/drawable-hdpi/ic_arrow_back_24dp.png b/res/drawable-hdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 86cb89463..000000000 --- a/res/drawable-hdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_close_dk.png b/res/drawable-hdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index f5e378fbc..000000000 --- a/res/drawable-hdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-mdpi/fab_ic_call.png b/res/drawable-mdpi/fab_ic_call.png Binary files differindex ff7b345e1..790f93590 100644 --- a/res/drawable-mdpi/fab_ic_call.png +++ b/res/drawable-mdpi/fab_ic_call.png diff --git a/res/drawable-mdpi/fab_ic_dial.png b/res/drawable-mdpi/fab_ic_dial.png Binary files differindex 3a2324534..4c854e1a1 100644 --- a/res/drawable-mdpi/fab_ic_dial.png +++ b/res/drawable-mdpi/fab_ic_dial.png diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_teal_background.png Binary files differindex 3a37b274b..c95d1240e 100644 --- a/res/drawable-mdpi/fab_teal_background.png +++ b/res/drawable-mdpi/fab_teal_background.png diff --git a/res/drawable-mdpi/ic_ab_search.png b/res/drawable-mdpi/ic_ab_search.png Binary files differindex cc9f9117f..2b23b1ec5 100644 --- a/res/drawable-mdpi/ic_ab_search.png +++ b/res/drawable-mdpi/ic_ab_search.png diff --git a/res/drawable-mdpi/ic_arrow_back_24dp.png b/res/drawable-mdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index dc81cd1d4..000000000 --- a/res/drawable-mdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_close_dk.png b/res/drawable-mdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 13f68ee36..000000000 --- a/res/drawable-mdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-xhdpi/fab_ic_call.png b/res/drawable-xhdpi/fab_ic_call.png Binary files differindex 2bff65e0a..6bd53f5c5 100644 --- a/res/drawable-xhdpi/fab_ic_call.png +++ b/res/drawable-xhdpi/fab_ic_call.png diff --git a/res/drawable-xhdpi/fab_ic_dial.png b/res/drawable-xhdpi/fab_ic_dial.png Binary files differindex 36940170d..398a03cee 100644 --- a/res/drawable-xhdpi/fab_ic_dial.png +++ b/res/drawable-xhdpi/fab_ic_dial.png diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_teal_background.png Binary files differindex b2ed8cddb..f94f75935 100644 --- a/res/drawable-xhdpi/fab_teal_background.png +++ b/res/drawable-xhdpi/fab_teal_background.png diff --git a/res/drawable-xhdpi/ic_ab_search.png b/res/drawable-xhdpi/ic_ab_search.png Binary files differindex 718ff4943..71f782701 100644 --- a/res/drawable-xhdpi/ic_ab_search.png +++ b/res/drawable-xhdpi/ic_ab_search.png diff --git a/res/drawable-xhdpi/ic_arrow_back_24dp.png b/res/drawable-xhdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 4f4fbaa2d..000000000 --- a/res/drawable-xhdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_close_dk.png b/res/drawable-xhdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 4f965fe6b..000000000 --- a/res/drawable-xhdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-xxhdpi/fab_ic_call.png b/res/drawable-xxhdpi/fab_ic_call.png Binary files differindex a756b95ad..6866fa430 100644 --- a/res/drawable-xxhdpi/fab_ic_call.png +++ b/res/drawable-xxhdpi/fab_ic_call.png diff --git a/res/drawable-xxhdpi/fab_ic_dial.png b/res/drawable-xxhdpi/fab_ic_dial.png Binary files differindex 8f1f21ee7..5f1cd45fb 100644 --- a/res/drawable-xxhdpi/fab_ic_dial.png +++ b/res/drawable-xxhdpi/fab_ic_dial.png diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_teal_background.png Binary files differindex 6bb4d2010..cc0ba27b6 100644 --- a/res/drawable-xxhdpi/fab_teal_background.png +++ b/res/drawable-xxhdpi/fab_teal_background.png diff --git a/res/drawable-xxhdpi/ic_ab_search.png b/res/drawable-xxhdpi/ic_ab_search.png Binary files differindex 4bb5165c9..142c5457d 100644 --- a/res/drawable-xxhdpi/ic_ab_search.png +++ b/res/drawable-xxhdpi/ic_ab_search.png diff --git a/res/drawable-xxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxhdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 46e90f735..000000000 --- a/res/drawable-xxhdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_close_dk.png b/res/drawable-xxhdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 2472da836..000000000 --- a/res/drawable-xxhdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml deleted file mode 100644 index 68a875ded..000000000 --- a/res/drawable/ic_back_arrow.xml +++ /dev/null @@ -1,20 +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 - --> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_arrow_back_24dp" - android:autoMirrored="true" - android:tint="@color/actionbar_icon_color" />
\ No newline at end of file diff --git a/res/drawable/shadow_fade_left.xml b/res/drawable/shadow_fade_left.xml new file mode 100644 index 000000000..cb87cf536 --- /dev/null +++ b/res/drawable/shadow_fade_left.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" > + <gradient + android:type="linear" + android:startColor="@null" + android:endColor="#1a000000" + android:angle="0"/> +</shape> diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml new file mode 100644 index 000000000..aac0daf3b --- /dev/null +++ b/res/layout-land/dialpad_fragment.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingLinearLayout" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <!-- spacer view --> + <View + android:id="@+id/spacer" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="#00000000" /> + <!-- Dialpad shadow --> + <View + android:layout_width="@dimen/shadow_length" + android:layout_height="match_parent" + android:background="@drawable/shadow_fade_left" /> + <include layout="@layout/dialpad_view" + android:layout_height="match_parent" + android:layout_width="0dp" + android:layout_weight="1" /> + <!-- "Dialpad chooser" UI, shown only when the user brings up the + Dialer while a call is already in progress. + When this UI is visible, the other Dialer elements + (the textfield/button and the dialpad) are hidden. --> + <ListView android:id="@+id/dialpadChooser" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/background_dialer_light" + android:visibility="gone" /> +</view> diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index b2312ada0..01bbecc00 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -28,7 +28,7 @@ <!-- Dialpad shadow --> <View android:layout_width="match_parent" - android:layout_height="10dp" + android:layout_height="@dimen/shadow_length" android:background="@drawable/shadow_fade_up" /> <include layout="@layout/dialpad_view" /> <!-- "Dialpad chooser" UI, shown only when the user brings up the diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index ac31ea3b6..0308d5177 100644 --- a/res/layout/search_edittext.xml +++ b/res/layout/search_edittext.xml @@ -45,7 +45,6 @@ android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left" android:textSize="@dimen/search_collapsed_text_size" android:fontFamily="@string/search_font_family" - android:textColor="@color/searchbox_text_color" android:textColorHint="@color/searchbox_hint_text_color" android:gravity="center_vertical" android:hint="@string/dialer_hint_find_contact" /> @@ -76,45 +75,6 @@ </LinearLayout> - <LinearLayout - android:id="@+id/search_box_expanded" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical" - android:visibility="gone"> - - <ImageButton - android:id="@+id/search_back_button" - android:layout_width="@dimen/search_box_icon_size" - android:layout_height="@dimen/search_box_icon_size" - android:layout_marginLeft="8dp" - android:src="@drawable/ic_back_arrow" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/action_menu_overflow_description" - android:tint="@color/actionbar_background_color" /> - - <EditText - android:id="@+id/search_view" - android:layout_width="0dp" - android:layout_height="@dimen/action_bar_height" - android:layout_weight="1" - android:layout_marginLeft="@dimen/search_box_expanded_text_margin_left" - android:textSize="@dimen/search_expanded_text_size" - android:fontFamily="@string/search_font_family" - android:textColor="@color/searchbox_text_color" - android:inputType="textFilter" /> - - <ImageView - android:id="@+id/search_close_button" - android:layout_height="@dimen/search_box_icon_size" - android:layout_width="@dimen/search_box_icon_size" - android:layout_marginRight="8dp" - android:src="@drawable/ic_close_dk" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_clear_search" /> - - </LinearLayout> + <include layout="@layout/search_bar_expanded" /> -</view>
\ No newline at end of file +</view> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 405524f22..e2b4e1963 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> oproepe."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Stuur teksboodskap aan <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Ongeluisterde stemboodskap"</string> - <string name="description_clear_search" msgid="688023606766232904">"Vee soektog uit"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Begin stemsoektog"</string> <string name="menu_callNumber" msgid="997146291983360266">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Onbekend"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 93b1413fe..7e8934355 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ጥሪዎች።"</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_clear_search" msgid="688023606766232904">"ፍለጋን አጽዳ"</string> <string name="description_start_voice_search" msgid="520539488194946012">"በድምፅ ፍለጋ ይጀምሩ"</string> <string name="menu_callNumber" msgid="997146291983360266">"ደውል<xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"ያልታወቀ"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index e86b11ca5..1dbe5f8c5 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> من المكالمات."</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_clear_search" msgid="688023606766232904">"محو البحث"</string> <string name="description_start_voice_search" msgid="520539488194946012">"بدء البحث الصوتي"</string> <string name="menu_callNumber" msgid="997146291983360266">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"غير معروف"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 3e4ce4efa..a171d55fb 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> обаждания."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Изпращане на SMS до <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Непрослушана гласова поща"</string> - <string name="description_clear_search" msgid="688023606766232904">"Изчистване на търсенето"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Стартиране на гласово търсене"</string> <string name="menu_callNumber" msgid="997146291983360266">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Неизвестен"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 1e72d99c2..09bcbae08 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> trucades"</string> <string name="description_send_text_message" msgid="7803126439934046891">"Envia un missatge de text a <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Missatge de veu no escoltat"</string> - <string name="description_clear_search" msgid="688023606766232904">"Esborra la cerca"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Inicia la cerca per veu"</string> <string name="menu_callNumber" msgid="997146291983360266">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Desconegut"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 09e06e17e..5d5a88fb5 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Počet hovorů: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>"</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_clear_search" msgid="688023606766232904">"Vymazat vyhledávání"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Spustit hlasové vyhledávání"</string> <string name="menu_callNumber" msgid="997146291983360266">"Zavolat na číslo <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Neznámé"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 518ed86f1..b1e34a4f7 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> opkald."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Send sms til <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Uaflyttet besked på telefonsvareren"</string> - <string name="description_clear_search" msgid="688023606766232904">"Ryd søgning"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Start stemmesøgning"</string> <string name="menu_callNumber" msgid="997146291983360266">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Ukendte"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 596b14427..75e85e21c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> Anrufe"</string> <string name="description_send_text_message" msgid="7803126439934046891">"SMS an <xliff:g id="NAME">%1$s</xliff:g> senden"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nicht abgehörte Mailbox-Nachricht"</string> - <string name="description_clear_search" msgid="688023606766232904">"Suche zurücksetzen"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Sprachsuche starten"</string> <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g> wählen"</string> <string name="unknown" msgid="740067747858270469">"Unbekannt"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index e78793686..bd81888c9 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> κλήσεις."</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_clear_search" msgid="688023606766232904">"Διαγραφή αναζητήσεων"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Έναρξη φωνητικής αναζήτησης"</string> <string name="menu_callNumber" msgid="997146291983360266">"Κλήση του αριθμού <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Άγνωστος"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 2bcbd7908..537f211ec 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Send text message to <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Unheard voicemail"</string> - <string name="description_clear_search" msgid="688023606766232904">"Clear search"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Start voice search"</string> <string name="menu_callNumber" msgid="997146291983360266">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Unknown"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 2bcbd7908..537f211ec 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Send text message to <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Unheard voicemail"</string> - <string name="description_clear_search" msgid="688023606766232904">"Clear search"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Start voice search"</string> <string name="menu_callNumber" msgid="997146291983360266">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Unknown"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 7365c4b6e..e37437041 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas"</string> <string name="description_send_text_message" msgid="7803126439934046891">"Enviar mensaje de texto a <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Buzón de voz no escuchado"</string> - <string name="description_clear_search" msgid="688023606766232904">"Borrar la búsqueda"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Iniciar búsqueda por voz"</string> <string name="menu_callNumber" msgid="997146291983360266">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Desconocido"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c1259b6f4..2fab95075 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Enviar mensaje de texto a <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Mensaje de voz sin oír"</string> - <string name="description_clear_search" msgid="688023606766232904">"Borrar la búsqueda"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Iniciar búsqueda por voz"</string> <string name="menu_callNumber" msgid="997146291983360266">"Llamar a <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Desconocidos"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index bc93a6482..00a2caa95 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> kõnet."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Saada tekstsõnum kontaktile <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Kuulamata kõnepostisõnum"</string> - <string name="description_clear_search" msgid="688023606766232904">"Otsingu kustutamine"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Häälotsingu alustamine"</string> <string name="menu_callNumber" msgid="997146291983360266">"Helistage: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Tundmatu"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 5a59b6f84..3cef83512 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> تماس."</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_clear_search" msgid="688023606766232904">"پاک کردن جستجو"</string> <string name="description_start_voice_search" msgid="520539488194946012">"شروع جستجوی صوتی"</string> <string name="menu_callNumber" msgid="997146291983360266">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"ناشناس"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3207f05c0..225752de9 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> puhelua."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Lähetä tekstiviesti: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Kuuntelematon vastaajaviesti"</string> - <string name="description_clear_search" msgid="688023606766232904">"Tyhjennä haku"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Aloita puhehaku"</string> <string name="menu_callNumber" msgid="997146291983360266">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Tuntematon"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 3e0a4f5c3..11064fe57 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels."</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_clear_search" msgid="688023606766232904">"Effacer les termes de recherche"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Démarrer la recherche vocale"</string> <string name="menu_callNumber" msgid="997146291983360266">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Inconnu"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0425ce1d8..6d79bee4b 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels"</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_clear_search" msgid="688023606766232904">"Effacer la recherche"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Démarrer la recherche vocale"</string> <string name="menu_callNumber" msgid="997146291983360266">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Inconnu"</string> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 2e140bb8c..c2c0c4d70 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कॉल."</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_clear_search" msgid="688023606766232904">"खोज साफ़ करें"</string> <string name="description_start_voice_search" msgid="520539488194946012">"बोलकर खोजें शुरु करें"</string> <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string> <string name="unknown" msgid="740067747858270469">"अज्ञात"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 5c2c4e327..63cd451d2 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</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_clear_search" msgid="688023606766232904">"Brisanje pretraživanja"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Pokretanje glasovnog pretraživanja"</string> <string name="menu_callNumber" msgid="997146291983360266">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Nepoznato"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index dfb986ffb..f4f6234e3 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> hívás"</string> <string name="description_send_text_message" msgid="7803126439934046891">"SMS küldése neki: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nem lejátszott hangüzenet"</string> - <string name="description_clear_search" msgid="688023606766232904">"Keresés törlése"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Hangalapú keresés indítása"</string> <string name="menu_callNumber" msgid="997146291983360266">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Ismeretlen"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 23afd393e..7dd308551 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> զանգ:"</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_clear_search" msgid="688023606766232904">"Մաքրել որոնման դաշտը"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Սկսկեք ձայնային որոնումը"</string> <string name="menu_callNumber" msgid="997146291983360266">"Զանգել <xliff:g id="NUMBER">%s</xliff:g>-ին"</string> <string name="unknown" msgid="740067747858270469">"Անհայտ"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 0135e691e..9b3ddad07 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Kirim SMS ke <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Pesan suara yang belum didengar"</string> - <string name="description_clear_search" msgid="688023606766232904">"Hapus penelusuran"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Memulai penelusuran suara"</string> <string name="menu_callNumber" msgid="997146291983360266">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Tidak diketahui"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 88e347327..c3957bc03 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chiamate."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Invia messaggio di testo a <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Messaggio vocale non ascoltato"</string> - <string name="description_clear_search" msgid="688023606766232904">"Cancella ricerca"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Avvia la ricerca vocale"</string> <string name="menu_callNumber" msgid="997146291983360266">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Sconosciuto"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index e11dea57b..9e42c550d 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> שיחות."</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_clear_search" msgid="688023606766232904">"נקה חיפוש"</string> <string name="description_start_voice_search" msgid="520539488194946012">"התחל חיפוש קולי"</string> <string name="menu_callNumber" msgid="997146291983360266">"התקשר אל <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"לא ידוע"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 2215cd340..ad56cab8e 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"通話回数は<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>回。"</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_clear_search" msgid="688023606766232904">"検索をクリア"</string> <string name="description_start_voice_search" msgid="520539488194946012">"音声検索を開始"</string> <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g>に発信"</string> <string name="unknown" msgid="740067747858270469">"通知不可能"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index da91ab19f..8e09b2680 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ზარი."</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_clear_search" msgid="688023606766232904">"ძიების გასუფთავება"</string> <string name="description_start_voice_search" msgid="520539488194946012">"ხმოვანი ძიების დაწყება"</string> <string name="menu_callNumber" msgid="997146291983360266">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string> <string name="unknown" msgid="740067747858270469">"უცნობი"</string> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index acebb5d70..8b3ebd26c 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"ការហៅ <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ។"</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_clear_search" msgid="688023606766232904">"សម្អាតការស្វែងរក"</string> <string name="description_start_voice_search" msgid="520539488194946012">"ចាប់ផ្ដើមស្វែងរកជាសំឡេង"</string> <string name="menu_callNumber" msgid="997146291983360266">"ហៅ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"មិនស្គាល់"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 2b7ca7da9..f065d74b9 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"통화 횟수: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>번"</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_clear_search" msgid="688023606766232904">"검색창 지우기"</string> <string name="description_start_voice_search" msgid="520539488194946012">"음성 검색 시작"</string> <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string> <string name="unknown" msgid="740067747858270469">"알 수 없음"</string> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index ec47874b0..1ba8a65d2 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ການໂທ."</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_clear_search" msgid="688023606766232904">"ລຶບການຊອກຫາ"</string> <string name="description_start_voice_search" msgid="520539488194946012">"ເລີ່ມການຊອກຫາດ້ວຍສຽງ"</string> <string name="menu_callNumber" msgid="997146291983360266">"ໂທຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"ບໍ່ຮູ້ຈັກ"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index ef58e8b56..687ec7e11 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Skambučių: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Siųsti teksto pranešimą <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Neklausytas balso pašto pranešimas"</string> - <string name="description_clear_search" msgid="688023606766232904">"Išvalyti paiešką"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Pradėti paiešką balsu"</string> <string name="menu_callNumber" msgid="997146291983360266">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Nežinomas"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 1228c1ae1..9c0606731 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> zvani."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Sūtīt īsziņu šim: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nenoklausīti balss pasta ziņojumi"</string> - <string name="description_clear_search" msgid="688023606766232904">"Notīrīt meklēšanas lauku"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Sākt meklēšanu ar balsi"</string> <string name="menu_callNumber" msgid="997146291983360266">"Zvaniet: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Nezināms"</string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index a7a6852fa..3da000e08 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> дуудлага."</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_clear_search" msgid="688023606766232904">"Хайлтыг цэвэрлэх"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Дуун хайлтыг эхлүүлэх"</string> <string name="menu_callNumber" msgid="997146291983360266">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string> <string name="unknown" msgid="740067747858270469">"Тодорхойгүй"</string> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 9ac1ded96..a6fdc61c1 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</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_clear_search" msgid="688023606766232904">"Kosongkan carian"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Mulakan carian suara"</string> <string name="menu_callNumber" msgid="997146291983360266">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Tidak diketahui"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index d361a04d6..4ae10fabf 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtaler."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Send tekstmelding til <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Ikke avspilt talepost"</string> - <string name="description_clear_search" msgid="688023606766232904">"Slett søk"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Start talesøk"</string> <string name="menu_callNumber" msgid="997146291983360266">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Ukjent"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index fdd65fd35..86203c083 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> telefoongesprekken."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Sms verzenden naar <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Niet-beluisterde voicemail"</string> - <string name="description_clear_search" msgid="688023606766232904">"Zoekopdracht wissen"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Gesproken zoekopdracht"</string> <string name="menu_callNumber" msgid="997146291983360266">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Onbekend"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index f0850df92..f36a94c25 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Połączenia: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Wyślij SMS do: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nieodsłuchana poczta głosowa"</string> - <string name="description_clear_search" msgid="688023606766232904">"Wyczyść wyszukiwanie"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Wyszukiwanie głosowe"</string> <string name="menu_callNumber" msgid="997146291983360266">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Nieznane"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index edc736f07..377c83a17 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Enviar mensagem de texto para <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Mensagem de correio de voz ainda não ouvida"</string> - <string name="description_clear_search" msgid="688023606766232904">"Limpar pesquisa"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Iniciar pesquisa por voz"</string> <string name="menu_callNumber" msgid="997146291983360266">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Desconhecido"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 4cfd902ad..739aef46c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Enviar mensagem de texto para <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Nova mensagem de voz"</string> - <string name="description_clear_search" msgid="688023606766232904">"Limpar pesquisa"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Iniciar pesquisa por voz"</string> <string name="menu_callNumber" msgid="997146291983360266">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Desconhecido"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 2389cc431..16c1db1e4 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -171,8 +171,6 @@ <skip /> <!-- no translation found for description_call_log_unheard_voicemail (118101684236996786) --> <skip /> - <!-- no translation found for description_clear_search (688023606766232904) --> - <skip /> <!-- no translation found for description_start_voice_search (520539488194946012) --> <skip /> <!-- no translation found for menu_callNumber (997146291983360266) --> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 80aa8489f..481ede99f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (de) apeluri."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Trimiteţi un mesaj text către <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Mesaje vocale neascultate"</string> - <string name="description_clear_search" msgid="688023606766232904">"Ștergeți căutarea"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Începeţi căutarea vocală"</string> <string name="menu_callNumber" msgid="997146291983360266">"Apelaţi <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Necunoscut"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 621ff68ca..a148ea3dc 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Вызовов: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</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_clear_search" msgid="688023606766232904">"Очистить условия поиска"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Начать голосовой поиск"</string> <string name="menu_callNumber" msgid="997146291983360266">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Неизвестно"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 85617652c..4b1069f9e 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Počet volaní: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</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_clear_search" msgid="688023606766232904">"Vymazať vyhľadávanie"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Spustenie hlasového vyhľadávania"</string> <string name="menu_callNumber" msgid="997146291983360266">"Volať <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Neznáme"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 045e5e0d6..593ef3799 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Št. klicev: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Pošlji SMS osebi <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Neodprta glasovna pošta"</string> - <string name="description_clear_search" msgid="688023606766232904">"Počisti iskalno polje"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Začni glasovno iskanje"</string> <string name="menu_callNumber" msgid="997146291983360266">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Neznano"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 8506e9f35..f931dc25a 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> позива."</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_clear_search" msgid="688023606766232904">"Брисање претраге"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Покретање гласовне претраге"</string> <string name="menu_callNumber" msgid="997146291983360266">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Непознато"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index a83b9fd72..5b1646838 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtal."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Skicka SMS till <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Ej hört röstmeddelande"</string> - <string name="description_clear_search" msgid="688023606766232904">"Rensa sökning"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Starta röstsökning"</string> <string name="menu_callNumber" msgid="997146291983360266">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Okänd"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index c1ee83888..c4b0bf9ee 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Simu <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Tuma ujumbe wa maandishi kwa <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Barua sauti ambayo haijasikizwa"</string> - <string name="description_clear_search" msgid="688023606766232904">"Futa utafutaji"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Anza kutafuta kwa kutamka"</string> <string name="menu_callNumber" msgid="997146291983360266">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Haijulikani"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index b390dfa5a..32fa73201 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> สาย"</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_clear_search" msgid="688023606766232904">"ล้างการค้นหา"</string> <string name="description_start_voice_search" msgid="520539488194946012">"เริ่มต้นการค้นหาด้วยเสียง"</string> <string name="menu_callNumber" msgid="997146291983360266">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"ไม่ทราบ"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 7a6c482f9..999414236 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (na) tawag."</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_clear_search" msgid="688023606766232904">"I-clear ang paghahanap"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Simulan ang paghahanap gamit ang boses"</string> <string name="menu_callNumber" msgid="997146291983360266">"Tumawag sa <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Di-kilala"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index d66bd73b8..15a013c3c 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> çağrı."</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_clear_search" msgid="688023606766232904">"Aramayı temizle"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Sesli arama başlat"</string> <string name="menu_callNumber" msgid="997146291983360266">"Çağrı yap: <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Bilinmiyor"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0b6ee7dd7..d65411ad3 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"Викликів: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</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_clear_search" msgid="688023606766232904">"Очистити поле пошуку"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Розпочати голосовий пошук"</string> <string name="menu_callNumber" msgid="997146291983360266">"Телефонувати <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Невідомий"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index d00e7c39b..920bdba62 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> cuộc gọi."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Gửi tin nhắn văn bản tới <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"Thư thoại chưa nghe"</string> - <string name="description_clear_search" msgid="688023606766232904">"Xóa tìm kiếm"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Bắt đầu tìm kiếm bằng giọng nói"</string> <string name="menu_callNumber" msgid="997146291983360266">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Không xác định"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 58f19eba2..0050026b6 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>次通话。"</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_clear_search" msgid="688023606766232904">"清除搜索内容"</string> <string name="description_start_voice_search" msgid="520539488194946012">"开始语音搜索"</string> <string name="menu_callNumber" msgid="997146291983360266">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"未知"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 6bac57114..94fcef20d 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次通話次數。"</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_clear_search" msgid="688023606766232904">"清除搜尋"</string> <string name="description_start_voice_search" msgid="520539488194946012">"開始語音搜尋"</string> <string name="menu_callNumber" msgid="997146291983360266">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"未知"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 33aaeddce..ab9d5067b 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"通話 <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次。"</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_clear_search" msgid="688023606766232904">"清除搜尋"</string> <string name="description_start_voice_search" msgid="520539488194946012">"開始進行語音搜尋"</string> <string name="menu_callNumber" msgid="997146291983360266">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"不明"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 9e8b16c7d..9d7ad7d3b 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -115,7 +115,6 @@ <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> amakholi."</string> <string name="description_send_text_message" msgid="7803126439934046891">"Hambisa umyalezo ku <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"I-imeyli yezwi engazwakalanga"</string> - <string name="description_clear_search" msgid="688023606766232904">"Sula usesho"</string> <string name="description_start_voice_search" msgid="520539488194946012">"Qalisa ukusesha ngezwi"</string> <string name="menu_callNumber" msgid="997146291983360266">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="unknown" msgid="740067747858270469">"Akwaziwa"</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index 42d91189b..f6cae5668 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -50,18 +50,9 @@ <color name="search_shortcut_background_color">#b6b6b6</color> <color name="search_shortcut_icon_color">#f8f8f8</color> - <!-- Dark variant of the action bar color. --> - <color name="actionbar_background_color_dark">#008aa1</color> - <!-- Color of the 1dp divider that separates favorites --> <color name="favorite_contacts_separator_color">#d0d0d0</color> - <!-- Background color of the search box --> - <color name="searchbox_background_color">#ffffff</color> - <!-- Text color of the search box text as entered by user --> - <color name="searchbox_text_color">#000000</color> - <!-- Text color of the search box hint text --> - <color name="searchbox_hint_text_color">#a4a4a4</color> <color name="searchbox_icon_tint">#a4a4a4</color> <!-- Color of the contact name in favorite tiles --> @@ -97,9 +88,6 @@ <!-- Color for answered or outgoing call icons. --> <color name="answered_call">#2aad6f</color> - <!-- Color for icons in the actionbar --> - <color name="actionbar_icon_color">#ffffff</color> - <color name="dialer_dialpad_touch_tint">#1a1dc7db</color> <color name="tab_ripple_color">@color/dialer_accent_color</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4db5ae41b..2869c62f4 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,7 +15,6 @@ ~ limitations under the License --> <resources> - <!-- Drag to remove view (in dp because it is used in conjunction with a statically sized icon @@ -39,11 +38,7 @@ <!-- Match call_button_height to Phone's dimens/in_call_end_button_height --> <dimen name="call_button_height">74dp</dimen> - <!-- Right margin of the floating action button --> - <dimen name="floating_action_button_margin_right">16dp</dimen> - <!-- Bottom margin of the floating action button --> - <dimen name="floating_action_button_margin_bottom">16dp</dimen> - <dimen name="floating_action_button_dialpad_margin_bottom">12dp</dimen> + <dimen name="floating_action_button_dialpad_margin_bottom_offset">4dp</dimen> <!-- Dimensions for speed dial tiles --> <dimen name="contact_tile_divider_width">1dp</dimen> @@ -109,8 +104,6 @@ <dimen name="search_box_left_padding">8dp</dimen> <!-- Search box interior padding - right --> <dimen name="search_box_right_padding">8dp</dimen> - <!-- Padding around the icon in the search box. --> - <dimen name="search_box_icon_margin">4dp</dimen> <dimen name="search_box_search_icon_padding">4dp</dimen> <dimen name="search_box_collapsed_text_margin_left">24dp</dimen> <dimen name="search_box_expanded_text_margin_left">26dp</dimen> @@ -141,4 +134,7 @@ <!-- Size of icon for contacts number shortcuts --> <dimen name="search_shortcut_radius">40dp</dimen> + + <!-- Length of dialpad's shadows in dialer. --> + <dimen name="shadow_length">10dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0cf4e2532..8f083c885 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -460,9 +460,6 @@ --> <string name="description_call_log_unheard_voicemail">Unheard voicemail</string> - <!-- String describing the icon used to clear the search field --> - <string name="description_clear_search">Clear search</string> - <!-- String describing the icon used to start a voice search --> <string name="description_start_voice_search">Start voice search</string> @@ -635,10 +632,6 @@ Do not translate. --> <string name="favorites_menu_all_contacts_font_family">sans-serif</string> - <!-- The font-family to use for the text inside the searchbox. - Do not translate. --> - <string name="search_font_family">sans-serif</string> - <!-- Button text for the "call back" button displayed underneath an entry in the call log. Tapping causes a call to be placed to the caller represented by the call log entry. [CHAR LIMIT=30] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 194bc7dbc..004b7099f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,8 +27,6 @@ <!-- Drawable for the back button --> <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item> <item name="android:windowContentOverlay">@null</item> - <!-- Searchbox Style --> - <item name="android:editTextStyle">@style/DialtactsSearchboxStyle</item> <item name="android:listViewStyle">@style/ListViewStyle</item> <item name="activated_background">@drawable/list_item_activated_background</item> <item name="section_header_background">@drawable/list_title_holo</item> @@ -148,11 +146,6 @@ <item name="android:overScrollMode">always</item> </style> - <style name="DialtactsSearchboxStyle" parent="@android:style/Widget.EditText"> - <item name="android:background">@null</item> - <item name="android:textColorHint">@color/searchbox_text_color</item> - </style> - <style name="DismissButtonStyle"> <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item> <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item> diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index decfe9bf1..098e9882e 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -398,14 +398,15 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware * If both are available, the data on the intent takes precedence. */ private Uri[] getCallLogEntryUris() { - Uri uri = getIntent().getData(); + final Uri uri = getIntent().getData(); if (uri != null) { // If there is a data on the intent, it takes precedence over the extra. return new Uri[]{ uri }; } - long[] ids = getIntent().getLongArrayExtra(EXTRA_CALL_LOG_IDS); - Uri[] uris = new Uri[ids.length]; - for (int index = 0; index < ids.length; ++index) { + final long[] ids = getIntent().getLongArrayExtra(EXTRA_CALL_LOG_IDS); + final int numIds = ids == null ? 0 : ids.length; + final Uri[] uris = new Uri[numIds]; + for (int index = 0; index < numIds; ++index) { uris[index] = ContentUris.withAppendedId(Calls.CONTENT_URI_WITH_VOICEMAIL, ids[index]); } return uris; diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 26c169843..922b38351 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.net.Uri; @@ -47,6 +48,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.ViewTreeObserver; import android.view.View.OnDragListener; import android.view.View.OnTouchListener; import android.view.animation.AccelerateInterpolator; @@ -87,6 +89,7 @@ import com.android.dialer.list.RemoveView; import com.android.dialer.list.SearchFragment; import com.android.dialer.list.SmartDialSearchFragment; import com.android.dialer.widget.ActionBarController; +import com.android.dialer.widget.FloatingActionButtonController; import com.android.dialer.widget.SearchEditTextLayout; import com.android.dialer.widget.SearchEditTextLayout.OnBackButtonClickedListener; import com.android.dialerbind.DatabaseHelperManager; @@ -159,13 +162,30 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private SmartDialSearchFragment mSmartDialSearchFragment; /** + * Animation that slides in. + */ + private Animation mSlideIn; + + /** + * Animation that slides out. + */ + private Animation mSlideOut; + + /** + * Listener for after slide out animation completes on dialer fragment. + */ + AnimationListenerAdapter mSlideOutListener = new AnimationListenerAdapter() { + @Override + public void onAnimationEnd(Animation animation) { + commitDialpadFragmentHide(); + } + }; + + /** * Fragment containing the speed dial list, recents list, and all contacts list. */ private ListsFragment mListsFragment; - private View mFloatingActionButtonContainer; - private ImageButton mFloatingActionButton; - private boolean mInDialpadSearch; private boolean mInRegularSearch; private boolean mClearSearchOnPause; @@ -173,6 +193,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private boolean mShowDialpadOnResume; /** + * Whether or not the device is in landscape orientation. + */ + private boolean mIsLandscape; + + /** * The position of the currently selected tab in the attached {@link ListsFragment}. */ private int mCurrentTabPosition = 0; @@ -209,10 +234,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private DialerDatabaseHelper mDialerDatabaseHelper; private DragDropController mDragDropController; private ActionBarController mActionBarController; + private FloatingActionButtonController mFloatingActionButtonController; private int mActionBarHeight; - private int mFloatingActionButtonMarginBottom; - private int mFloatingActionButtonDialpadMarginBottom; private class OptionsPopupMenu extends PopupMenu { public OptionsPopupMenu(Context context, View anchor) { @@ -326,10 +350,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O final Resources resources = getResources(); mActionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height); - mFloatingActionButtonMarginBottom = - resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_bottom); - mFloatingActionButtonDialpadMarginBottom = resources.getDimensionPixelOffset( - R.dimen.floating_action_button_dialpad_margin_bottom); setContentView(R.layout.dialtacts_activity); getWindow().setBackgroundDrawable(null); @@ -357,6 +377,14 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } }); + boolean mIsLandscape = getResources().getConfiguration().orientation + == Configuration.ORIENTATION_LANDSCAPE; + View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container); + ImageButton floatingActionButton = (ImageButton) findViewById(R.id.floating_action_button); + floatingActionButton.setOnClickListener(this); + mFloatingActionButtonController = new FloatingActionButtonController(this, mIsLandscape, + floatingActionButtonContainer); + ImageButton optionsMenuButton = (ImageButton) mSearchEditTextLayout.findViewById( R.id.dialtacts_options_menu_button); optionsMenuButton.setOnClickListener(this); @@ -377,20 +405,31 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mFirstLaunch = savedInstanceState.getBoolean(KEY_FIRST_LAUNCH); mShowDialpadOnResume = savedInstanceState.getBoolean(KEY_IS_DIALPAD_SHOWN); mActionBarController.restoreInstanceState(savedInstanceState); + mFloatingActionButtonController.restoreInstanceState(savedInstanceState); } + mSlideIn = AnimationUtils.loadAnimation(this, + mIsLandscape ? R.anim.slide_in_right : R.anim.slide_in); + mSlideOut = AnimationUtils.loadAnimation(this, + mIsLandscape ? R.anim.slide_out_right : R.anim.slide_out); + + mSlideOut.setAnimationListener(mSlideOutListener); + parentLayout = (RelativeLayout) findViewById(R.id.dialtacts_mainlayout); parentLayout.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING); parentLayout.setOnDragListener(new LayoutOnDragListener()); + parentLayout.getViewTreeObserver().addOnGlobalLayoutListener( + new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + int screenWidth = parentLayout.getWidth(); + mFloatingActionButtonController.setScreenWidth(screenWidth); + parentLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } + }); setupActivityOverlay(); - mFloatingActionButtonContainer = findViewById(R.id.floating_action_button_container); - ViewUtil.setupFloatingActionButton(mFloatingActionButtonContainer, getResources()); - - mFloatingActionButton = (ImageButton) findViewById(R.id.floating_action_button); - mFloatingActionButton.setOnClickListener(this); - mRemoveViewContainer = findViewById(R.id.remove_view_container); mDialerDatabaseHelper = DatabaseHelperManager.getDatabaseHelper(this); @@ -445,6 +484,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O outState.putBoolean(KEY_FIRST_LAUNCH, mFirstLaunch); outState.putBoolean(KEY_IS_DIALPAD_SHOWN, mIsDialpadShown); mActionBarController.saveInstanceState(outState); + mFloatingActionButtonController.saveInstanceState(outState); } @Override @@ -595,10 +635,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O * Callback from child DialpadFragment when the dialpad is shown. */ public void onDialpadShown() { - updateFloatingActionButton(); + mFloatingActionButtonController.updateByDialpadVisibility(true); if (mDialpadFragment.getAnimate()) { - Animation slideIn = AnimationUtils.loadAnimation(this, R.anim.slide_in); - mDialpadFragment.getView().startAnimation(slideIn); + mDialpadFragment.getView().startAnimation(mSlideIn); } else { mDialpadFragment.setYFraction(0); } @@ -625,16 +664,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mDialpadFragment.setAnimate(animate); updateSearchFragmentPosition(); - updateFloatingActionButton(); + mFloatingActionButtonController.updateByDialpadVisibility(false); if (animate) { - Animation slideOut = AnimationUtils.loadAnimation(this, R.anim.slide_out); - slideOut.setAnimationListener(new AnimationListenerAdapter() { - @Override - public void onAnimationEnd(Animation animation) { - commitDialpadFragmentHide(); - } - }); - mDialpadFragment.getView().startAnimation(slideOut); + mDialpadFragment.getView().startAnimation(mSlideOut); } else { commitDialpadFragmentHide(); } @@ -966,7 +998,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O @Override public void setFloatingActionButtonVisible(boolean visible) { - mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE); + mFloatingActionButtonController.setVisible(visible); } private boolean phoneIsInUse() { @@ -1064,72 +1096,19 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - + mFloatingActionButtonController.onPageScrolled(position, positionOffset); } @Override public void onPageSelected(int position) { mCurrentTabPosition = position; - // If the dialpad is showing, the floating action button should always be middle aligned. - if (!mIsDialpadShown) { - alignFloatingActionButtonByTab(mCurrentTabPosition); - } + mFloatingActionButtonController.updateByTab(position); } @Override public void onPageScrollStateChanged(int state) { } - private void updateFloatingActionButton() { - if (mIsDialpadShown) { - mFloatingActionButton.setImageResource(R.drawable.fab_ic_call); - mFloatingActionButton.setContentDescription( - getResources().getString(R.string.description_dial_button)); - alignFloatingActionButtonMiddle(); - } else { - mFloatingActionButton.setImageResource(R.drawable.fab_ic_dial); - mFloatingActionButton.setContentDescription( - getResources().getString(R.string.action_menu_dialpad_button)); - alignFloatingActionButtonByTab(mCurrentTabPosition); - } - } - - private void alignFloatingActionButtonByTab(int position) { - if (position == ListsFragment.TAB_INDEX_SPEED_DIAL) { - alignFloatingActionButtonMiddle(); - } else { - alignFloatingActionButtonRight(); - } - } - - private void alignFloatingActionButtonRight() { - final RelativeLayout.LayoutParams params = - (RelativeLayout.LayoutParams) mFloatingActionButtonContainer.getLayoutParams(); - params.removeRule(RelativeLayout.CENTER_HORIZONTAL); - params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); - updateFloatingActionButtonMargin(params); - mFloatingActionButtonContainer.setLayoutParams(params); - } - - private void alignFloatingActionButtonMiddle() { - final RelativeLayout.LayoutParams params = - (RelativeLayout.LayoutParams) mFloatingActionButtonContainer.getLayoutParams(); - params.removeRule(RelativeLayout.ALIGN_PARENT_RIGHT); - params.addRule(RelativeLayout.CENTER_HORIZONTAL); - updateFloatingActionButtonMargin(params); - mFloatingActionButtonContainer.setLayoutParams(params); - } - - private void updateFloatingActionButtonMargin(RelativeLayout.LayoutParams params) { - params.setMarginsRelative( - params.getMarginStart(), - params.topMargin, - params.getMarginEnd(), - mIsDialpadShown ? - mFloatingActionButtonDialpadMarginBottom : - mFloatingActionButtonMarginBottom); - } - private TelephonyManager getTelephonyManager() { return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); } diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index ab599725e..2604bf05d 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -28,13 +28,13 @@ import android.text.style.StyleSpan; import android.view.View; import android.widget.TextView; -import com.android.contacts.common.test.NeededForTesting; +import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.PhoneNumberHelper; import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.ContactInfo; import com.android.dialer.calllog.PhoneNumberDisplayHelper; import com.android.dialer.calllog.PhoneNumberUtilsWrapper; -import com.google.android.collect.Lists; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java index 762b8ff35..ade720f41 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViews.java +++ b/src/com/android/dialer/calllog/CallLogListItemViews.java @@ -22,7 +22,7 @@ import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.contacts.common.test.NeededForTesting; +import com.android.contacts.common.testing.NeededForTesting; import com.android.dialer.PhoneCallDetailsViews; import com.android.dialer.R; diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java index 125ba6f29..7c8afeed7 100644 --- a/src/com/android/dialer/calllog/CallTypeIconsView.java +++ b/src/com/android/dialer/calllog/CallTypeIconsView.java @@ -27,7 +27,7 @@ import android.provider.CallLog.Calls; import android.util.AttributeSet; import android.view.View; -import com.android.contacts.common.test.NeededForTesting; +import com.android.contacts.common.testing.NeededForTesting; import com.android.dialer.R; import com.google.common.collect.Lists; diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index 9e2b8d089..d9dc735d7 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -94,11 +94,6 @@ public class SearchFragment extends PhoneNumberPickerFragment { mHideDialpadDuration = res.getInteger(R.integer.dialpad_slide_out_duration); final View parentView = getView(); - parentView.setPaddingRelative( - parentView.getPaddingStart(), - mActionBarHeight, - parentView.getPaddingEnd(), - parentView.getPaddingBottom()); final ListView listView = getListView(); @@ -175,19 +170,26 @@ public class SearchFragment extends PhoneNumberPickerFragment { */ public void updatePosition(boolean animate) { // Use negative shadow height instead of 0 to account for the 9-patch's shadow. - int translationValue = mActivity.isDialpadShown() ? -mActionBarHeight : -mShadowHeight; - + int startTranslationValue = + mActivity.isDialpadShown() ? mActionBarHeight - mShadowHeight: -mShadowHeight; + int endTranslationValue = 0; + // Prevents ListView from being translated down after a rotation when the ActionBar is up. + if (animate || mActivity.isActionBarShowing()) { + endTranslationValue = + mActivity.isDialpadShown() ? 0 : mActionBarHeight -mShadowHeight; + } if (animate) { Interpolator interpolator = mActivity.isDialpadShown() ? AnimUtils.EASE_IN : AnimUtils.EASE_OUT ; int duration = mActivity.isDialpadShown() ? mShowDialpadDuration : mHideDialpadDuration; + getView().setTranslationY(startTranslationValue); getView().animate() - .translationY(translationValue) + .translationY(endTranslationValue) .setInterpolator(interpolator) .setDuration(duration); } else { - getView().setTranslationY(translationValue); + getView().setTranslationY(endTranslationValue); } // There is padding which should only be applied when the dialpad is not shown. diff --git a/src/com/android/dialer/util/AsyncTaskExecutors.java b/src/com/android/dialer/util/AsyncTaskExecutors.java index 322a435e3..a59af3e41 100644 --- a/src/com/android/dialer/util/AsyncTaskExecutors.java +++ b/src/com/android/dialer/util/AsyncTaskExecutors.java @@ -19,7 +19,7 @@ package com.android.dialer.util; import android.os.AsyncTask; import android.os.Looper; -import com.android.contacts.common.test.NeededForTesting; +import com.android.contacts.common.testing.NeededForTesting; import com.google.common.base.Preconditions; import java.util.concurrent.Executor; diff --git a/src/com/android/dialer/util/ExpirableCache.java b/src/com/android/dialer/util/ExpirableCache.java index 94ea6aa90..00ebd1607 100644 --- a/src/com/android/dialer/util/ExpirableCache.java +++ b/src/com/android/dialer/util/ExpirableCache.java @@ -18,7 +18,7 @@ package com.android.dialer.util; import android.util.LruCache; -import com.android.contacts.common.test.NeededForTesting; +import com.android.contacts.common.testing.NeededForTesting; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/com/android/dialer/widget/FloatingActionButtonController.java b/src/com/android/dialer/widget/FloatingActionButtonController.java new file mode 100644 index 000000000..3f59153ef --- /dev/null +++ b/src/com/android/dialer/widget/FloatingActionButtonController.java @@ -0,0 +1,212 @@ +/* + * 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.widget; + +import android.app.Activity; +import android.content.res.Resources; +import android.os.Bundle; +import android.view.animation.AnimationUtils; +import android.view.animation.Interpolator; +import android.view.View; +import android.widget.ImageButton; + +import com.android.contacts.common.util.ViewUtil; +import com.android.dialer.R; +import com.android.dialer.list.ListsFragment; + +/** + * Controls the movement and appearance of the FAB. + */ +public class FloatingActionButtonController { + private static final String KEY_IS_DIALPAD_VISIBLE = "key_is_dialpad_visible"; + private static final String KEY_CURRENT_TAB_POSITION = "key_current_tab_position"; + private static final int ANIMATION_DURATION = 250; + + private int mScreenWidth; + + private int mCurrentTabPosition; + + private ImageButton mFloatingActionButton; + private View mFloatingActionButtonContainer; + + private boolean mIsLandscape; + private boolean mIsDialpadVisible; + private boolean mAnimateFloatingActionButton; + + private String mDescriptionDialButtonStr; + private String mActionMenuDialpadButtonStr; + + /** + * Interpolator for FAB animations. + */ + private Interpolator mFabInterpolator; + + /** + * Additional offset for FAB to be lowered when dialpad is open. + */ + private int mFloatingActionButtonDialpadMarginBottomOffset; + + public FloatingActionButtonController(Activity activity, boolean isLandscape, + View container) { + Resources resources = activity.getResources(); + mIsLandscape = isLandscape; + mFabInterpolator = AnimationUtils.loadInterpolator(activity, + android.R.interpolator.fast_out_slow_in); + mFloatingActionButtonDialpadMarginBottomOffset = resources.getDimensionPixelOffset( + R.dimen.floating_action_button_dialpad_margin_bottom_offset); + mFloatingActionButton = (ImageButton) activity. + findViewById(R.id.floating_action_button); + mDescriptionDialButtonStr = resources.getString(R.string.description_dial_button); + mActionMenuDialpadButtonStr = resources.getString(R.string.action_menu_dialpad_button); + mFloatingActionButtonContainer = container; + ViewUtil.setupFloatingActionButton(mFloatingActionButtonContainer, resources); + } + + /** + * Passes the screen width into the class. Necessary for translation calculations. + * + * @param screenWidth the width of the screen + */ + public void setScreenWidth(int screenWidth) { + mScreenWidth = screenWidth; + updateByDialpadVisibility(mIsDialpadVisible); + } + + public void setVisible(boolean visible) { + mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE); + } + + /** + * Updates the FAB location (middle to right position) as the PageView scrolls. + * + * @param position tab position to align for + * @param positionOffset a fraction used to calculate position of the FAB during page scroll + */ + public void onPageScrolled(int position, float positionOffset) { + // As the page is scrolling, if we're on the first tab, update the FAB position so it + // moves along with it. + if (position == ListsFragment.TAB_INDEX_SPEED_DIAL) { + mFloatingActionButtonContainer.setTranslationX( + (int) (positionOffset * (mScreenWidth / 2f + - mFloatingActionButton.getWidth()))); + mFloatingActionButtonContainer.setTranslationY(0); + } + } + + /** + * Updates the FAB location given a tab position. + * + * @param position tab position to align for + */ + public void updateByTab(int position) { + // If the screen width hasn't been set yet, don't do anything. + if (mScreenWidth == 0 || mIsDialpadVisible) return; + alignFloatingActionButtonByTab(position, false); + mAnimateFloatingActionButton = true; + } + + /** + * Updates the FAB location to the proper location given whether or not the dialer is open. + * + * @param dialpadVisible whether or not the dialpad is currently open + */ + public void updateByDialpadVisibility(boolean dialpadVisible) { + // If the screen width hasn't been set yet, don't do anything. + if (mScreenWidth == 0) return; + mIsDialpadVisible = dialpadVisible; + + moveFloatingActionButton(mAnimateFloatingActionButton); + mAnimateFloatingActionButton = true; + } + + /** + * Moves the FAB to the best known location given what the class currently knows. + * + * @param animate whether or not to smoothly animate the button + */ + private void moveFloatingActionButton(boolean animate) { + if (mIsDialpadVisible) { + mFloatingActionButton.setImageResource(R.drawable.fab_ic_call); + mFloatingActionButton.setContentDescription(mDescriptionDialButtonStr); + alignFloatingActionButton(animate); + } else { + mFloatingActionButton.setImageResource(R.drawable.fab_ic_dial); + mFloatingActionButton.setContentDescription(mActionMenuDialpadButtonStr); + alignFloatingActionButtonByTab(mCurrentTabPosition, mAnimateFloatingActionButton); + } + } + + /** + * Aligns the FAB to the position for the indicated tab. + * + * @param position tab position to align for + * @param animate whether or not to smoothly animate the button + */ + private void alignFloatingActionButtonByTab(int position, boolean animate) { + mCurrentTabPosition = position; + alignFloatingActionButton(animate); + } + + /** + * Aligns the FAB to the correct position. + * + * @param animate whether or not to smoothly animate the button + */ + private void alignFloatingActionButton(boolean animate) { + int translationX = calculateTranslationX(); + int translationY = mIsDialpadVisible ? mFloatingActionButtonDialpadMarginBottomOffset : 0; + if (animate) { + mFloatingActionButtonContainer.animate() + .translationX(translationX) + .translationY(translationY) + .setInterpolator(mFabInterpolator) + .setDuration(ANIMATION_DURATION).start(); + } else { + mFloatingActionButtonContainer.setTranslationX(translationX); + mFloatingActionButtonContainer.setTranslationY(translationY); + } + } + + /** + * Calculates the translationX distance for the FAB. + */ + private int calculateTranslationX() { + if (mIsDialpadVisible) { + return mIsLandscape ? mScreenWidth / 4 : 0; + } + if (mCurrentTabPosition == ListsFragment.TAB_INDEX_SPEED_DIAL) { + return 0; + } + return mScreenWidth / 2 - mFloatingActionButton.getWidth(); + } + + /** + * Saves the current state of the floating action button into a provided {@link Bundle} + */ + public void saveInstanceState(Bundle outState) { + outState.putBoolean(KEY_IS_DIALPAD_VISIBLE, mIsDialpadVisible); + outState.putInt(KEY_CURRENT_TAB_POSITION, mCurrentTabPosition); + } + + /** + * Restores the floating action button state from a provided {@link Bundle} + */ + public void restoreInstanceState(Bundle inState) { + mIsDialpadVisible = inState.getBoolean(KEY_IS_DIALPAD_VISIBLE); + mCurrentTabPosition = inState.getInt(KEY_CURRENT_TAB_POSITION); + } +} diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java index e17194e21..d216ebf97 100644 --- a/src/com/android/dialer/widget/OverlappingPaneLayout.java +++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java @@ -908,6 +908,9 @@ public class OverlappingPaneLayout extends ViewGroup { @Override public void onViewReleased(View releasedChild, float xvel, float yvel) { + if (releasedChild == null) { + return; + } final LayoutParams lp = (LayoutParams) releasedChild.getLayoutParams(); int top = getPaddingTop() + lp.topMargin; diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index 30fd0e2a7..679335e57 100644 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -112,8 +112,6 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { setPhoneCallDetailsWithNumber("14125551212", Calls.PRESENTATION_ALLOWED, "1-412-555-1212"); assertTrue(mViews.callLocationAndDate.getText().toString().contains("Yesterday")); - assertTrue(mViews.callLocationAndDate.getText().toString().contains( - "<font color='#33b5e5'><b>Yesterday</b></font>")); } /** Asserts that a char sequence is actually a Spanned corresponding to the expected HTML. */ diff --git a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java index 8225d1319..f3679d4ed 100644 --- a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java @@ -68,7 +68,7 @@ public class CallLogAdapterTest extends AndroidTestCase { mCursor = new MatrixCursor(CallLogQuery._PROJECTION); mCursor.moveToFirst(); // The views into which to store the data. - mView = new View(getContext()); + mView = new CallLogListItemView(getContext()); mView.setTag(CallLogListItemViews.createForTest(getContext())); } diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index 2c0fe0e23..964d8a299 100644 --- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java @@ -91,11 +91,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme private Random mRnd; - // References to the icons bitmaps used to build the list are stored in a - // map mIcons. The keys to retrieve the icons are: - // Calls.INCOMING_TYPE, Calls.OUTGOING_TYPE and Calls.MISSED_TYPE. - private HashMap<Integer, Bitmap> mCallTypeIcons; - // An item in the call list. All the methods performing checks use it. private CallLogListItemViews mItem; // The list of views representing the data in the DB. View are in @@ -133,7 +128,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme mAdapter.stopRequestProcessing(); mParentView = new FrameLayout(mActivity); mCursor = new MatrixCursor(CallLogQuery._PROJECTION); - buildIconMap(); } /** @@ -412,17 +406,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme return d.getBitmap(); } - /** - * Fetch all the icons we need in tests from the contacts app and store them in a map. - */ - private void buildIconMap() { - mCallTypeIcons = new HashMap<Integer, Bitmap>(3); - - mCallTypeIcons.put(Calls.INCOMING_TYPE, getBitmap("ic_call_incoming_holo_dark")); - mCallTypeIcons.put(Calls.MISSED_TYPE, getBitmap("ic_call_missed_holo_dark")); - mCallTypeIcons.put(Calls.OUTGOING_TYPE, getBitmap("ic_call_outgoing_holo_dark")); - } - // // HELPERS to build/update the call entries (views) from the DB. // diff --git a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java index 558be265b..9cb842e56 100644 --- a/tests/src/com/android/dialer/database/SmartDialPrefixTest.java +++ b/tests/src/com/android/dialer/database/SmartDialPrefixTest.java @@ -21,6 +21,8 @@ import android.database.sqlite.SQLiteDatabase; import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.Suppress; import android.test.AndroidTestCase; +import android.text.TextUtils; +import android.util.Log; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; @@ -37,7 +39,7 @@ import java.util.ArrayList; /** * To run this test, use the command: - * adb shell am instrument -w -e class com.android.dialer.dialpad.SmartDialPrefixTest / + * adb shell am instrument -w -e class com.android.dialer.database.SmartDialPrefixTest / * com.android.dialer.tests/android.test.InstrumentationTestRunner */ @SmallTest @@ -145,6 +147,12 @@ public class SmartDialPrefixTest extends AndroidTestCase { assertNotNull(contactCursor); assertNotNull(nameCursor); + if (TextUtils.isEmpty(number)) { + // Add a dummy number, otherwise DialerDatabaseHelper simply ignores the entire + // row if the number is empty + number = "0"; + } + contactCursor.addRow(new Object[]{id, "", "", number, contactId, lookupKey, displayName, photoId, lastTimeUsed, timesUsed, starred, isSuperPrimary, inVisibleGroup, isPrimary}); @@ -292,7 +300,8 @@ public class SmartDialPrefixTest extends AndroidTestCase { // 6543 doesn't match assertFalse(getLooseMatchesFromDb("6543").contains(martinjuniorharry)); - assertEquals(7, mTestHelper.countPrefixTableRows(db)); + // 7 actual rows, + 1 for the dummy number we added + assertEquals(8, mTestHelper.countPrefixTableRows(db)); } public void testPutForInitialMatchesForLongTokenNames() { |
