Merge "Update AOSP dialer from 2.3.07 to 2.3.08" into ub-contactsdialer-a-dev
diff --git a/res/layout/blocked_number_footer.xml b/res/layout/blocked_number_footer.xml
index cdb3ead..17425c8 100644
--- a/res/layout/blocked_number_footer.xml
+++ b/res/layout/blocked_number_footer.xml
@@ -14,27 +14,24 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginBottom="8dp"
- android:padding="16dp"
- android:background="@android:color/white"
- android:focusable="true">
-
- <TextView android:id="@+id/blocked_number_footer_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/blocked_number_secondary_text_color"
- android:textSize="@dimen/blocked_number_primary_text_size"
- android:text="@string/block_number_footer_message_vvm" />
+ android:orientation="vertical"
+ android:padding="@dimen/blocked_number_container_padding"
+ android:background="@android:color/white"
+ android:focusable="true">
+ <TextView android:id="@+id/blocked_number_footer_textview"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/blocked_number_secondary_text_color"
+ android:textSize="@dimen/blocked_number_settings_description_text_size"
+ android:text="@string/block_number_footer_message_vvm"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml
index 685c4ef..0af9429 100644
--- a/res/layout/blocked_number_header.xml
+++ b/res/layout/blocked_number_header.xml
@@ -17,31 +17,34 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:focusable="false">
+ android:focusable="false"
+ android:orientation="vertical">
- <LinearLayout android:id="@+id/blocked_numbers_disabled_for_emergency"
+ <LinearLayout
+ android:id="@+id/blocked_numbers_disabled_for_emergency"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginBottom="8dp"
- android:padding="16dp"
+ android:paddingTop="27dp"
+ android:paddingBottom="29dp"
+ android:paddingStart="@dimen/blocked_number_container_padding"
+ android:paddingEnd="44dp"
+ android:background="@color/blocked_number_disabled_emergency_background_color"
android:focusable="true"
+ android:orientation="vertical"
android:visibility="gone">
<TextView
+ style="@style/BlockedNumbersDescriptionTextStyle"
+ android:textStyle="bold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/blocked_numbers_disabled_emergency_header_label"
- android:textStyle="bold"
- android:textColor="@color/blocked_number_disabled_emergency_header_color"
- style="@style/BlockedNumbersDescriptionTextStyle" />
+ android:text="@string/blocked_numbers_disabled_emergency_header_label"/>
<TextView
+ style="@style/BlockedNumbersDescriptionTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/blocked_numbers_disabled_emergency_desc"
- style="@style/BlockedNumbersDescriptionTextStyle" />
+ android:text="@string/blocked_numbers_disabled_emergency_desc"/>
</LinearLayout>
@@ -53,94 +56,104 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
android:background="@android:color/white"
- android:focusable="true">
+ android:focusable="true"
+ android:orientation="vertical">
- <TextView android:id="@+id/textView"
+ <TextView
+ android:id="@+id/textView"
+ style="@android:style/TextAppearance.Material.Subhead"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="48dp"
+ android:paddingStart="@dimen/blocked_number_container_padding"
+ android:gravity="center_vertical"
android:text="@string/block_list"
- android:textColor="@color/blocked_number_header_color"
- android:padding="@dimen/blocked_number_container_padding"
- style="@android:style/TextAppearance.Material.Subhead" />
+ android:textColor="@color/blocked_number_header_color"/>
- <RelativeLayout android:id="@+id/import_settings"
+ <RelativeLayout
+ android:id="@+id/import_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
- <TextView android:id="@+id/import_description"
+ <TextView
+ android:id="@+id/import_description"
+ style="@style/BlockedNumbersDescriptionTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/blocked_call_settings_import_description"
- android:textSize="@dimen/blocked_number_settings_description_text_size"
+ android:paddingTop="11dp"
+ android:paddingBottom="27dp"
android:paddingStart="@dimen/blocked_number_container_padding"
android:paddingEnd="@dimen/blocked_number_container_padding"
- style="@style/BlockedNumbersDescriptionTextStyle" />
+ android:text="@string/blocked_call_settings_import_description"
+ android:textColor="@color/secondary_text_color"
+ android:textSize="@dimen/blocked_number_settings_description_text_size"/>
- <Button android:id="@+id/import_button"
+ <Button
+ android:id="@+id/import_button"
+ style="@style/DialerFlatButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/import_description"
- android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/blocked_number_container_padding"
- android:text="@string/blocked_call_settings_import_button"
- style="@style/DialerFlatButtonStyle" />
+ android:layout_alignParentEnd="true"
+ android:layout_below="@id/import_description"
+ android:text="@string/blocked_call_settings_import_button"/>
- <Button android:id="@+id/view_numbers_button"
+ <Button
+ android:id="@+id/view_numbers_button"
+ style="@style/DialerFlatButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
android:layout_below="@id/import_description"
- android:layout_toLeftOf="@id/import_button"
- android:text="@string/blocked_call_settings_view_numbers_button"
- style="@style/DialerFlatButtonStyle" />
+ android:layout_toStartOf="@id/import_button"
+ android:text="@string/blocked_call_settings_view_numbers_button"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
+ android:layout_marginTop="8dp"
android:layout_below="@id/import_button"
- android:background="@color/divider_line_color"
- android:layout_marginTop="8dp" />
+ android:background="@color/divider_line_color"/>
</RelativeLayout>
<LinearLayout
- android:id="@+id/add_number_linear_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/blocked_number_horizontal_margin"
- android:paddingTop="@dimen/blocked_number_top_margin"
- android:paddingBottom="@dimen/blocked_number_bottom_margin"
- android:baselineAligned="false"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:focusable="true"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@string/addBlockedNumber">
+ android:id="@+id/add_number_linear_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/blocked_number_add_top_margin"
+ android:paddingBottom="@dimen/blocked_number_add_bottom_margin"
+ android:paddingStart="@dimen/blocked_number_horizontal_margin"
+ android:background="?android:attr/selectableItemBackground"
+ android:baselineAligned="false"
+ android:clickable="true"
+ android:contentDescription="@string/addBlockedNumber"
+ android:focusable="true"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
<ImageView
- android:id="@+id/add_number_icon"
- android:layout_width="@dimen/contact_photo_size"
- android:layout_height="@dimen/contact_photo_size"
- android:importantForAccessibility="no" />
+ android:id="@+id/add_number_icon"
+ android:layout_width="@dimen/contact_photo_size"
+ android:layout_height="@dimen/contact_photo_size"
+ android:importantForAccessibility="no"/>
<LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:gravity="center_vertical"
- android:layout_marginStart="@dimen/blocked_number_horizontal_margin">
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="@dimen/blocked_number_horizontal_margin"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
- <TextView android:id="@+id/add_number_textview"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/blocked_number_primary_text_color"
- android:textSize="@dimen/blocked_number_primary_text_size"
- android:includeFontPadding="false"
- android:layout_marginBottom="5dp"
- android:text="@string/addBlockedNumber" />
+ <TextView
+ android:id="@+id/add_number_textview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:includeFontPadding="false"
+ android:text="@string/addBlockedNumber"
+ android:textColor="@color/blocked_number_primary_text_color"
+ android:textSize="@dimen/blocked_number_primary_text_size"/>
</LinearLayout>
</LinearLayout>
@@ -150,7 +163,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="72dp"
- android:background="@color/divider_line_color" />
+ android:background="@color/divider_line_color"/>
</LinearLayout>
diff --git a/res/layout/blocked_number_item.xml b/res/layout/blocked_number_item.xml
index 82e2207..a4997f2 100644
--- a/res/layout/blocked_number_item.xml
+++ b/res/layout/blocked_number_item.xml
@@ -19,26 +19,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/blocked_number_horizontal_margin"
- android:paddingTop="@dimen/blocked_number_top_margin"
- android:paddingBottom="@dimen/blocked_number_bottom_margin"
android:baselineAligned="false"
- android:gravity="center_vertical"
android:orientation="horizontal"
android:focusable="true"
+ android:gravity="center_vertical"
android:background="@android:color/white">
<QuickContactBadge
android:id="@+id/quick_contact_photo"
android:layout_width="@dimen/contact_photo_size"
android:layout_height="@dimen/contact_photo_size"
- android:focusable="true" />
-
+ android:focusable="true"
+ android:layout_marginTop="@dimen/blocked_number_top_margin"
+ android:layout_marginBottom="@dimen/blocked_number_bottom_margin"/>
<LinearLayout
android:layout_width="0dp"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
- android:gravity="center_vertical"
android:layout_marginStart="@dimen/blocked_number_horizontal_margin">
<TextView
@@ -48,16 +47,14 @@
android:textColor="@color/blocked_number_primary_text_color"
android:textSize="@dimen/blocked_number_primary_text_size"
android:includeFontPadding="false"
- android:layout_marginBottom="5dp"
- android:singleLine="true" />
+ android:singleLine="true"/>
<TextView
android:id="@+id/caller_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/blocked_number_secondary_text_color"
- android:textSize="@dimen/blocked_number_secondary_text_size"
- android:layout_marginBottom="1dp"
+ android:textSize="@dimen/blocked_number_settings_description_text_size"
android:singleLine="true" />
</LinearLayout>
@@ -65,7 +62,7 @@
android:id="@+id/delete_button"
android:layout_width="@dimen/blocked_number_delete_icon_size"
android:layout_height="@dimen/blocked_number_delete_icon_size"
- android:layout_marginEnd="16dp"
+ android:layout_marginEnd="24dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_remove"
android:scaleType="center"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index bc9662e..7a1d38f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -145,8 +145,8 @@
<string name="call_log_missed_title" msgid="4541142293870638971">"Perdudes"</string>
<string name="call_log_voicemail_title" msgid="940422274047025948">"Missatge de veu"</string>
<string name="block_number_confirmation_title" msgid="6862219558186931304">"Vols bloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
- <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"Es bloquejaran les properes trucades d\'aquest número i els missatges de veu se suprimiran automàticament."</string>
- <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Es bloquejaran les properes trucades d\'aquest número. És possible que continuïs rebent els missatges de veu."</string>
+ <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"Es bloquejaran les futures trucades d\'aquest número i els missatges de veu se suprimiran automàticament."</string>
+ <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Es bloquejaran les futures trucades d\'aquest número. És possible que continuïs rebent els missatges de veu."</string>
<string name="block_number_ok" msgid="770551992296781873">"BLOQUEJA"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"Vols desbloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
<string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Les trucades d\'aquest número deixaran d\'estar bloquejades."</string>
@@ -228,8 +228,8 @@
<string name="send_to_voicemail_import_failed" msgid="5547202002133560069">"Error en la importació"</string>
<string name="description_blocked_number_list_delete" msgid="3240093199107796792">"Desbloqueja el número"</string>
<string name="addBlockedNumber" msgid="6064812257482886526">"Afegeix el número"</string>
- <string name="block_number_footer_message_vvm" msgid="223620564509592329">"En afegir un número es bloquejaran totes les properes trucades i els missatges de veu se suprimiran automàticament."</string>
- <string name="block_number_footer_message_no_vvm" msgid="5106836115211978689">"En afegir un número es bloquejaran totes les properes trucades. És possible que continuïs rebent els missatges de veu."</string>
+ <string name="block_number_footer_message_vvm" msgid="223620564509592329">"En afegir un número es bloquejaran totes les futures trucades i els missatges de veu se suprimiran automàticament."</string>
+ <string name="block_number_footer_message_no_vvm" msgid="5106836115211978689">"En afegir un número es bloquejaran totes les futures trucades. És possible que continuïs rebent els missatges de veu."</string>
<string name="block_list" msgid="7760188925338078011">"Números bloquejats"</string>
<string name="invalidNumber" msgid="619058581062192851">"<xliff:g id="NUMBER">%1$s</xliff:g> no és vàlid."</string>
<string name="alreadyBlocked" msgid="282340105563646876">"<xliff:g id="NUMBER">%1$s</xliff:g> ja està bloquejat."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7610d38..91930f3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -149,7 +149,7 @@
<string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Zukünftige Anrufe von dieser Nummer werden blockiert. Sie erhalten jedoch möglicherweise weiterhin Mailbox-Nachrichten."</string>
<string name="block_number_ok" msgid="770551992296781873">"BLOCKIEREN"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"Blockierung von <xliff:g id="NUMBER">%1$s</xliff:g> aufheben?"</string>
- <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Diese Nummer wird nicht mehr blockiert und kann Sie anrufen."</string>
+ <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Anrufe von dieser Nummer werden nicht mehr blockiert."</string>
<string name="unblock_number_ok" msgid="6449899182699684786">"BLOCKIERUNG AUFHEBEN"</string>
<string name="tab_speed_dial" msgid="7552166276545648893">"Schnellauswahl"</string>
<string name="tab_history" msgid="2563144697322434940">"Anrufliste"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index da28d4c..b1064da 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="applicationLabel" msgid="7762561155467201526">"Telefonoa"</string>
<string name="launcherActivityLabel" msgid="1129729740601172692">"Deitu"</string>
- <string name="launcherDialpadActivityLabel" msgid="3959809805046059167">"Telefonoaren markatzeko teklatua"</string>
+ <string name="launcherDialpadActivityLabel" msgid="3959809805046059167">"Telefonoaren markagailua"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefonoa"</string>
<string name="callHistoryIconLabel" msgid="3734413397291301223">"Deien historia"</string>
<string name="action_report_number" msgid="4635403959812186162">"Jakinarazi zenbakia okerra dela"</string>
@@ -145,8 +145,8 @@
<string name="call_log_missed_title" msgid="4541142293870638971">"Galduak"</string>
<string name="call_log_voicemail_title" msgid="940422274047025948">"Erantzungailuko deiak"</string>
<string name="block_number_confirmation_title" msgid="6862219558186931304">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatu nahi duzu?"</string>
- <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"Aurrerantzean zenbaki honetatik egiten diren deiak blokeatu egingo dira, eta erantzungailuko mezuak automatikoki ezabatuko dira."</string>
- <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Aurrerantzean zenbaki honetatik egiten diren deiak blokeatu egingo dira. Hala ere, baliteke erantzungailuko mezuak jasotzen jarraitzea."</string>
+ <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"Aurrerantzean zenbaki honetatik egiten diren deiak blokeatu egingo dira, eta ahots-mezuak automatikoki ezabatuko dira."</string>
+ <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Aurrerantzean zenbaki honetatik egiten diren deiak blokeatu egingo dira. Hala ere, baliteke ahots-mezuak jasotzen jarraitzea."</string>
<string name="block_number_ok" msgid="770551992296781873">"BLOKEATU"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"<xliff:g id="NUMBER">%1$s</xliff:g> desblokeatu nahi duzu?"</string>
<string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Aurrerantzean, zenbakia ez da blokeatuta egongo eta zuri deitzeko gai izango da."</string>
@@ -228,8 +228,8 @@
<string name="send_to_voicemail_import_failed" msgid="5547202002133560069">"Ezin izan da inportatu"</string>
<string name="description_blocked_number_list_delete" msgid="3240093199107796792">"Desblokeatu zenbakia"</string>
<string name="addBlockedNumber" msgid="6064812257482886526">"Gehitu zenbakia"</string>
- <string name="block_number_footer_message_vvm" msgid="223620564509592329">"Zenbakia gehitzen baduzu, aurrerantzean hartatik egiten diren deiak blokeatu egingo dira eta erantzungailuko mezuak automatikoki ezabatuko dira."</string>
- <string name="block_number_footer_message_no_vvm" msgid="5106836115211978689">"Zenbakia gehitzen baduzu, aurrerantzean hartatik egiten diren deiak blokeatu egingo dira. Hala ere, baliteke erantzungailuko mezuak jasotzen jarraitzea."</string>
+ <string name="block_number_footer_message_vvm" msgid="223620564509592329">"Zenbakia gehitzen baduzu, aurrerantzean hartatik egiten diren deiak blokeatu egingo dira eta ahots-mezuak automatikoki ezabatuko dira."</string>
+ <string name="block_number_footer_message_no_vvm" msgid="5106836115211978689">"Zenbakia gehitzen baduzu, aurrerantzean hartatik egiten diren deiak blokeatu egingo dira. Hala ere, baliteke ahots-mezuak jasotzen jarraitzea."</string>
<string name="block_list" msgid="7760188925338078011">"Blokeatutako zenbakiak"</string>
<string name="invalidNumber" msgid="619058581062192851">"<xliff:g id="NUMBER">%1$s</xliff:g> zenbakiak ez du balio."</string>
<string name="alreadyBlocked" msgid="282340105563646876">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatuta dago dagoeneko."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index fe16fbf..e8db828 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -228,7 +228,7 @@
<string name="send_to_voicemail_import_failed" msgid="5547202002133560069">"Échec de l\'importation"</string>
<string name="description_blocked_number_list_delete" msgid="3240093199107796792">"Débloquer le numéro"</string>
<string name="addBlockedNumber" msgid="6064812257482886526">"Ajouter un numéro"</string>
- <string name="block_number_footer_message_vvm" msgid="223620564509592329">"L\'ajout d\'un numéro permet de bloquer tous les prochains appels, et les messages vocaux sont automatiquement supprimés."</string>
+ <string name="block_number_footer_message_vvm" msgid="223620564509592329">"L\'ajout d\'un numéro permet de bloquer tous les prochains appels, et les messages vocaux seront automatiquement supprimés."</string>
<string name="block_number_footer_message_no_vvm" msgid="5106836115211978689">"L\'ajout d\'un numéro permet de bloquer tous les prochains appels. Vous continuerez peut-être de recevoir les messages vocaux."</string>
<string name="block_list" msgid="7760188925338078011">"Numéros bloqués"</string>
<string name="invalidNumber" msgid="619058581062192851">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> n\'est pas valide."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 50f374f..b60c43e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -149,7 +149,7 @@
<string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Այս համարից զանգերը կարգելափակվեն: Սակայն դուք կկարողանաք ստանալ ձայնային փոստի հաղորդագրություններ:"</string>
<string name="block_number_ok" msgid="770551992296781873">"ԱՐԳԵԼԱՓԱԿԵԼ"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"Արգելաբացե՞լ <xliff:g id="NUMBER">%1$s</xliff:g> համարը:"</string>
- <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Այս համարի զանգերն այլևս չեն արգելափակվի:"</string>
+ <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Այս համարից զանգերն այլևս չեն արգելափակվի:"</string>
<string name="unblock_number_ok" msgid="6449899182699684786">"ԱՐԳԵԼԱԲԱՑԵԼ"</string>
<string name="tab_speed_dial" msgid="7552166276545648893">"Արագ համարարկում"</string>
<string name="tab_history" msgid="2563144697322434940">"Զանգերի պատմությունը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0e6be43..074d824 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -149,7 +149,7 @@
<string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"Panggilan telepon di masa mendatang dari nomor ini akan diblokir. Pesan suara mungkin masih masuk."</string>
<string name="block_number_ok" msgid="770551992296781873">"BLOKIR"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"Bebaskan <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
- <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Nomor ini tidak akan diblokir lagi untuk menelepon Anda."</string>
+ <string name="unblock_number_confirmation_message" msgid="8521058345002166692">"Nomor ini tidak akan diblokir lagi dan dapat menelepon Anda."</string>
<string name="unblock_number_ok" msgid="6449899182699684786">"BEBASKAN"</string>
<string name="tab_speed_dial" msgid="7552166276545648893">"Panggilan cepat"</string>
<string name="tab_history" msgid="2563144697322434940">"Riwayat Panggilan"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 69a6049..ef6d69c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -145,8 +145,8 @@
<string name="call_log_missed_title" msgid="4541142293870638971">"தவறியவை"</string>
<string name="call_log_voicemail_title" msgid="940422274047025948">"குரலஞ்சல்"</string>
<string name="block_number_confirmation_title" msgid="6862219558186931304">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐத் தடுக்கவா?"</string>
- <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"இனி முதல் இந்த எண்ணின் அழைப்புகள் தடுக்கப்படுவதுடன், இதிலிருந்து வரும் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்."</string>
- <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"இனி முதல் இந்த எண்ணின் அழைப்புகள் தடுக்கப்படும். எனினும் இந்த எண்ணிலிருந்து உங்களுக்கு குரலஞ்சல் அனுப்ப முடியும்."</string>
+ <string name="block_number_confirmation_message_vvm" msgid="6648042022642582310">"இதன் பின்னர் இந்த எண்ணின் அழைப்புகள் தடுக்கப்படுவதுடன், இதிலிருந்து வரும் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்."</string>
+ <string name="block_number_confirmation_message_no_vvm" msgid="4396733241860410081">"இதன் பின்னர், இந்த எண்ணின் அழைப்புகள் தடுக்கப்படும். எனினும் இந்த எண்ணிலிருந்து உங்களுக்கு குரலஞ்சல் அனுப்ப முடியும்."</string>
<string name="block_number_ok" msgid="770551992296781873">"தடு"</string>
<string name="unblock_number_confirmation_title" msgid="252824779504084354">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐ அனுமதிக்கவா?"</string>
<string name="unblock_number_confirmation_message" msgid="8521058345002166692">"இனி உங்களை அழைக்க இந்த எண் அனுமதிக்கப்படும்."</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e927f74..75d05ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -121,20 +121,20 @@
<color name="floating_action_button_touch_tint">#80ffffff</color>
<color name="call_log_action_divider">#eeeeee</color>
- <color name="divider_line_color">#c7c7c7</color>
+ <color name="divider_line_color">#D8D8D8</color>
<!-- Colors for blocked numbers list -->
<color name="blocked_contact_background">#afafaf</color>
<color name="blocked_number_primary_text_color">@color/dialtacts_primary_text_color</color>
<color name="blocked_number_secondary_text_color">@color/dialtacts_secondary_text_color</color>
<color name="blocked_number_icon_tint">#616161</color>
- <color name="blocked_number_background">#E0E0E0</color>
+ <color name="blocked_number_background">#FFFFFF</color>
<color name="blocked_number_accent_color">#42A5F5</color>
<color name="blocked_number_block_color">#F44336</color>
<color name="blocked_number_header_color">@color/dialer_theme_color</color>
<color name="blocked_number_disabled_emergency_header_color">#616161</color>
+ <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
<color name="add_blocked_number_icon_color">#bdbdbd</color>
-
<!-- Grey 700 -->
<color name="call_detail_footer_text_color">#616161</color>
<color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 18f33d5..4865280 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -160,11 +160,14 @@
<dimen name="blocked_number_horizontal_margin">16dp</dimen>
<dimen name="blocked_number_top_margin">16dp</dimen>
<dimen name="blocked_number_bottom_margin">16dp</dimen>
+ <dimen name="blocked_number_add_top_margin">8dp</dimen>
+ <dimen name="blocked_number_add_bottom_margin">8dp</dimen>
<dimen name="blocked_number_primary_text_size">16sp</dimen>
<dimen name="blocked_number_secondary_text_size">12sp</dimen>
<dimen name="blocked_number_delete_icon_size">32dp</dimen>
<dimen name="blocked_number_search_text_size">14sp</dimen>
- <dimen name="blocked_number_settings_description_text_size">16sp</dimen>
+ <dimen name="blocked_number_settings_description_text_size">14sp</dimen>
+ <dimen name="blocked_number_header_height">48dp</dimen>
<dimen name="call_type_icon_size">12dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d79d9d..2838e68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -526,13 +526,13 @@
<!-- Confirmation dialog message for blocking a number with visual voicemail active.
[CHAR LIMIT=NONE] -->
<string name="block_number_confirmation_message_vvm">
- Future calls from this number will be blocked and voicemails will be automatically deleted.
+ Calls from this number will be blocked and voicemails will be automatically deleted.
</string>
<!-- Confirmation dialog message for blocking a number with no visual voicemail.
[CHAR LIMIT=NONE] -->
<string name="block_number_confirmation_message_no_vvm">
- Future calls from this number will be blocked. Voicemails may still reach you.
+ Calls from this number will be blocked, but the caller may still be able to leave you voicemails.
</string>
<!-- Block number alert dialog button [CHAR LIMIT=32] -->
@@ -898,13 +898,13 @@
<!-- Footer message of number blocking screen with visual voicemail active.
[CHAR LIMIT=NONE] -->
<string name="block_number_footer_message_vvm">
- Adding a number blocks all future calls and voicemails will be automatically deleted.
+ Calls from these numbers will be blocked and voicemails will be automatically deleted.
</string>
<!-- Footer message of number blocking screen with no visual voicemail.
[CHAR LIMIT=NONE] -->
<string name="block_number_footer_message_no_vvm">
- Adding a number blocks all future calls. Voicemails may still reach you.
+ Calls from these numbers will be blocked, but they may still be able to leave you voicemails.
</string>
<!-- Heading for the block list in the "Spam and blocked cal)ls" settings. [CHAR LIMIT=64] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d160d..8c27265 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -319,7 +319,7 @@
</style>
<style name="BlockedNumbersDescriptionTextStyle">
- <item name="android:lineSpacingMultiplier">1.2</item>
+ <item name="android:lineSpacingMultiplier">1.43</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:textSize">@dimen/blocked_number_settings_description_text_size</item>
diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index cb4c1e4..63fbe29 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -28,11 +28,12 @@
import android.support.v7.widget.RecyclerView;
import android.telecom.PhoneAccountHandle;
import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.MenuItem;
import android.view.View;
-import android.view.ViewGroup;
import android.view.ViewStub;
import android.widget.ImageView;
import android.widget.QuickContactBadge;
@@ -278,7 +279,8 @@
if (callType == CallLog.Calls.VOICEMAIL_TYPE) {
menu.setHeaderTitle(mContext.getResources().getText(R.string.voicemail));
} else {
- menu.setHeaderTitle(PhoneNumberUtils.createTtsSpannable(number));
+ menu.setHeaderTitle(PhoneNumberUtils.createTtsSpannable(
+ BidiFormatter.getInstance().unicodeWrap(number, TextDirectionHeuristics.LTR)));
}
menu.add(ContextMenu.NONE, R.id.context_menu_copy_to_clipboard, ContextMenu.NONE,
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index e760750..2da6840 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -198,23 +198,26 @@
return null;
}
- Uri uri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey);
+ final Uri uri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey);
- Cursor cursor = context.getContentResolver().query(uri,
- PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION, null, null, null);
-
- if (cursor == null) {
- return null;
- }
-
+ Cursor cursor = null;
try {
- if (!cursor.moveToFirst()) {
- return null;
+ cursor = context.getContentResolver().query(uri,
+ PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION, null, null, null);
+
+ if (cursor != null && cursor.moveToFirst()) {
+ return cursor.getString(PhoneQuery.NAME_ALTERNATIVE);
}
- return cursor.getString(PhoneQuery.NAME_ALTERNATIVE);
+ } catch (IllegalArgumentException e) {
+ // Thrown for work profile queries. For those, we don't support
+ // alternative display names.
} finally {
- cursor.close();
+ if (cursor != null) {
+ cursor.close();
+ }
}
+
+ return null;
}
/**