merge in klp-release (no-op)
diff --git a/res/drawable-hdpi/ic_lockscreen_text_activated.png b/res/drawable-hdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index 22cf07c..0000000 --- a/res/drawable-hdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_text_normal.png b/res/drawable-hdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index db6c05d..0000000 --- a/res/drawable-hdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-hdpi/ic_text_holo_dark.png b/res/drawable-hdpi/ic_text_holo_dark.png new file mode 100644 index 0000000..6d21e42 --- /dev/null +++ b/res/drawable-hdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index 63afb5e..0000000 --- a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index 7443030..0000000 --- a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png similarity index 73% rename from res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png rename to res/drawable-ldrtl-hdpi/ic_text_holo_dark.png index 8d4cb28..667e961 100644 --- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png +++ b/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index 8e9c3b6..0000000 --- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png similarity index 73% copy from res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png copy to res/drawable-ldrtl-mdpi/ic_text_holo_dark.png index 8d4cb28..4429d02 100644 --- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png +++ b/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index d292a7f..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index 8318590..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png similarity index 73% copy from res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png copy to res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png index 8d4cb28..2a28bab 100644 --- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png +++ b/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_activated.png b/res/drawable-mdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index e3e4fc1..0000000 --- a/res/drawable-mdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_normal.png b/res/drawable-mdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index 4a2a54b..0000000 --- a/res/drawable-mdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-mdpi/ic_text_holo_dark.png b/res/drawable-mdpi/ic_text_holo_dark.png new file mode 100644 index 0000000..80b95ee --- /dev/null +++ b/res/drawable-mdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_activated.png b/res/drawable-xhdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index 41ea18a..0000000 --- a/res/drawable-xhdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_normal.png b/res/drawable-xhdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index 15e4779..0000000 --- a/res/drawable-xhdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/ic_text_holo_dark.png b/res/drawable-xhdpi/ic_text_holo_dark.png new file mode 100644 index 0000000..e80a042 --- /dev/null +++ b/res/drawable-xhdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_lockscreen_text_activated.png b/res/drawable-xxhdpi/ic_lockscreen_text_activated.png deleted file mode 100644 index a4e0048..0000000 --- a/res/drawable-xxhdpi/ic_lockscreen_text_activated.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xxhdpi/ic_lockscreen_text_normal.png b/res/drawable-xxhdpi/ic_lockscreen_text_normal.png deleted file mode 100644 index 20ff309..0000000 --- a/res/drawable-xxhdpi/ic_lockscreen_text_normal.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xxhdpi/ic_text_holo_dark.png b/res/drawable-xxhdpi/ic_text_holo_dark.png new file mode 100644 index 0000000..b73e8b0 --- /dev/null +++ b/res/drawable-xxhdpi/ic_text_holo_dark.png Binary files differ
diff --git a/res/drawable/ic_lockscreen_text_activated_layer.xml b/res/drawable/ic_lockscreen_text_activated_layer.xml index 95141e5..489201f 100644 --- a/res/drawable/ic_lockscreen_text_activated_layer.xml +++ b/res/drawable/ic_lockscreen_text_activated_layer.xml
@@ -27,5 +27,5 @@ android:right="@dimen/incoming_call_widget_asset_margin" android:bottom="@dimen/incoming_call_widget_asset_margin" android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_text_activated" /> + android:drawable="@drawable/ic_text_holo_dark" /> </layer-list>
diff --git a/res/drawable/ic_lockscreen_text_normal_layer.xml b/res/drawable/ic_lockscreen_text_normal_layer.xml index 42fd51d..a591484 100644 --- a/res/drawable/ic_lockscreen_text_normal_layer.xml +++ b/res/drawable/ic_lockscreen_text_normal_layer.xml
@@ -28,5 +28,5 @@ android:right="@dimen/incoming_call_widget_asset_margin" android:bottom="@dimen/incoming_call_widget_asset_margin" android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_text_normal" /> + android:drawable="@drawable/ic_text_holo_dark" /> </layer-list>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9a98d93..473a5d5 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml
@@ -93,7 +93,7 @@ <string name="sum_cfu_enabled" msgid="2450052502198827927">"Reenviar todas las llamadas a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string> <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"El número no está disponible"</string> <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desactivado"</string> - <string name="labelCFB" msgid="218938523102207587">"Reenviar si está ocup."</string> + <string name="labelCFB" msgid="218938523102207587">"Reenviar cuando está ocupado"</string> <string name="messageCFB" msgid="3711089705936187129">"Número cuando está ocupado"</string> <string name="sum_cfb_enabled" msgid="5984198104833116690">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string> <string name="sum_cfb_disabled" msgid="227440009979537651">"Desactivado"</string> @@ -309,7 +309,7 @@ </string-array> <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string> <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string> - <string name="fdn" msgid="7878832555095183202">"Números de marc. fijos"</string> + <string name="fdn" msgid="7878832555095183202">"Números de marcación fijos"</string> <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de NMF"</string> <string name="fdn_activation" msgid="2156479741307463576">"Activación de NMF"</string> <string name="fdn_enabled" msgid="5238109009915521240">"Los números de marcación fija están activados"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 4f1c9dd..43de17d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml
@@ -588,7 +588,7 @@ <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nevaru runāt. Vai piezvanīsi vēlāk?"</string> <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Rakstīt savu…"</string> <string name="custom_message_cancel" msgid="7516406059429609296">"Atcelt"</string> - <string name="custom_message_send" msgid="5795754217085747742">"Nosūtīt"</string> + <string name="custom_message_send" msgid="5795754217085747742">"Sūtīt"</string> <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Ātrās atbildes"</string> <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Ātro atbilžu rediģēšana"</string> <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
