Merge "Additional captioning fonts"
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml
index 44563e4..0963ee9 100644
--- a/res/layout/captioning_preview.xml
+++ b/res/layout/captioning_preview.xml
@@ -31,13 +31,19 @@
android:scaleType="centerCrop"
android:src="@drawable/caption_background" />
- <com.android.internal.widget.SubtitleView
- android:id="@+id/preview_text"
- android:layout_width="wrap_content"
+ <FrameLayout
+ android:id="@+id/preview_window"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
- android:layout_margin="16dp"
- android:text="@string/captioning_preview_text" />
+ android:padding="16dp" >
+
+ <com.android.internal.widget.SubtitleView
+ android:id="@+id/preview_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/captioning_preview_text" />
+ </FrameLayout>
</FrameLayout>
<FrameLayout
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 09d81f7..07a086c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2067,8 +2067,8 @@
<string name="start_nfc_pairing" msgid="5363319136364735698">"Bind met \'n merker saam"</string>
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC-saambind-aktiwiteit"</string>
<string name="pairing_button_title" msgid="7411638037556429744">"Bind nou saam"</string>
- <string name="status_no_ring_detected" msgid="838954925249421062">"Stel die merker plat op \'n tafel en sit die foon bo-op"</string>
- <string name="status_device_paired" msgid="4916932520416516526">"Merker en foon suksesvol saamgebind, jy\'s klaar!"</string>
+ <string name="status_no_ring_detected" msgid="838954925249421062">"Sit die merker plat op \'n tafel en sit die foon bo-op"</string>
+ <string name="status_device_paired" msgid="4916932520416516526">"Merker en foon suksesvol saamgebind. Jy\'s klaar!"</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"Die merker wat voorsien is, kan nie gebruik word om jou foon te ontsluit nie"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"Kon nie met jou merker saambind nie, probeer asseblief weer"</string>
<string name="enable_nfc" msgid="5234514241098808766">"NFC is nie geaktiveer nie en word vereis vir NFC-ontsluit. Skakel NFC asseblief aan."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index cc5a57f..b525ad9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2067,7 +2067,7 @@
<string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronitza amb una etiqueta"</string>
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
<string name="pairing_button_title" msgid="7411638037556429744">"Sincronitza ara"</string>
- <string name="status_no_ring_detected" msgid="838954925249421062">"Posa l\'etiqueta plana en una taula i col·loca el telèfon al damunt."</string>
+ <string name="status_no_ring_detected" msgid="838954925249421062">"Posa l\'etiqueta plana en una taula i col·loca el telèfon a sobre."</string>
<string name="status_device_paired" msgid="4916932520416516526">"L\'etiqueta i el telèfon s\'han sincronitzat correctament. Llestos."</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"L\'etiqueta que has proporcionat no es pot utilitzar per desbloquejar el telèfon."</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"S\'ha produït un error amb la sincronització de l\'etiqueta. Torna-ho a provar."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5538cc6..9dd4c01 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2074,7 +2074,7 @@
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
<string name="pairing_button_title" msgid="7411638037556429744">"今すぐペア設定を行う"</string>
<string name="status_no_ring_detected" msgid="838954925249421062">"タグをテーブルの上に水平に配置し、端末を上部に置いてください"</string>
- <string name="status_device_paired" msgid="4916932520416516526">"タグと端末のペア設定が完了しました！"</string>
+ <string name="status_device_paired" msgid="4916932520416516526">"タグと端末のペア設定が完了しました。"</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"このタグは端末のロック解除には使用できません"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"タグをペアに設定できませんでした。もう一度お試しください。"</string>
<string name="enable_nfc" msgid="5234514241098808766">"NFCは無効になっていますが、NFCロック解除に必要です。NFCをONにしてください。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index b49d5ef..34eee45 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2067,7 +2067,7 @@
<string name="start_nfc_pairing" msgid="5363319136364735698">"თეგთან დაწყვილება"</string>
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
<string name="pairing_button_title" msgid="7411638037556429744">"ახლა დაწყვილება"</string>
- <string name="status_no_ring_detected" msgid="838954925249421062">"დააყენეთ თეგი ბრტყლად მადიგაზე და მოათავსეთ ტელეფონო მასზე"</string>
+ <string name="status_no_ring_detected" msgid="838954925249421062">"დააყენეთ თეგი ბრტყლად მაგიდაზე და მოათავსეთ ტელეფონი მასზე"</string>
<string name="status_device_paired" msgid="4916932520416516526">"თეგი და ტელეფონი წარმატებით დაწყვილდა. პროცესი დასრულებულია!"</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"მოწოდებული თეგით თქვენი ტელეფონის განბლოკვა ვერ ხერხდება"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"თქვენი თეგით დაწყვილება ვერ განხორციელდა. გთხოვთ, სცადოთ ისევ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c63ccd5..f3a1f95 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -969,7 +969,7 @@
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Flyttbar trådløs sone"</string>
<string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tilknytning"</string>
<string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tilknytning"</string>
- <string name="tether_settings_title_all" msgid="8356136101061143841">"Tilknytn. og trådløs sone"</string>
+ <string name="tether_settings_title_all" msgid="8356136101061143841">"Tilknytning og trådløs sone"</string>
<string name="usb_title" msgid="7483344855356312510">"USB"</string>
<string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tilknytning"</string>
<string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-tilkoblet, velg for å knytte til"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fca41bd..1a7f04e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2061,7 +2061,7 @@
<string name="user_image_take_photo" msgid="1280274310152803669">"Zrób zdjęcie"</string>
<string name="user_image_choose_photo" msgid="7940990613897477057">"Wybierz zdjęcie z galerii"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
- <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ustawienia blokady ekranu komunikacji NFC"</string>
+ <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ustawienia wyłączania blokady ekranu przez NFC"</string>
<string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Sparowane zawieszki"</string>
<string name="nfc_unlock_enabled" msgid="7306199149460932989">"Włączona"</string>
<string name="start_nfc_pairing" msgid="5363319136364735698">"Sparuj z tagiem"</string>
@@ -2071,6 +2071,6 @@
<string name="status_device_paired" msgid="4916932520416516526">"Zawieszka i telefon zostały sparowane. Gotowe."</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"Tej zawieszki nie można użyć do odblokowania telefonu"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"Parowanie z zawieszką nie udało się. Spróbuj ponownie"</string>
- <string name="enable_nfc" msgid="5234514241098808766">"Komunikacja NFC nie jest włączona, ale jest wymagana do odblokowania NFC. Włącz ją."</string>
+ <string name="enable_nfc" msgid="5234514241098808766">"Komunikacja NFC nie jest włączona, a jest wymagana do obsługi funkcji Odblokowanie przez NFC. Włącz ją."</string>
<string name="ok" msgid="3651563352754792958">"Ustawienia komunikacji NFC"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 88d0636..0141d95 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2063,7 +2063,7 @@
<string name="user_image_take_photo" msgid="1280274310152803669">"Сделать снимок"</string>
<string name="user_image_choose_photo" msgid="7940990613897477057">"Выбрать из Галереи"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
- <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки блокировки NFC-экрана"</string>
+ <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки блокировки экрана для связи малого радиуса действия"</string>
<string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Подключенные метки"</string>
<string name="nfc_unlock_enabled" msgid="7306199149460932989">"Включено"</string>
<string name="start_nfc_pairing" msgid="5363319136364735698">"Подключение NFC-метки"</string>
@@ -2074,5 +2074,5 @@
<string name="status_error_invalid_device" msgid="5045003971535647259">"Этой меткой нельзя разблокировать ваш телефон"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"Произошла ошибка. Повторите попытку."</string>
<string name="enable_nfc" msgid="5234514241098808766">"Включите связь малого радиуса действия."</string>
- <string name="ok" msgid="3651563352754792958">"Настройки NFC"</string>
+ <string name="ok" msgid="3651563352754792958">"Настройки связи малого радиуса действия"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 38146c6..e8e71b9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2062,15 +2062,15 @@
<string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotografiu z Galérie"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
<string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavenia zámky obrazovky NFC"</string>
- <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované prívesky"</string>
+ <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované štítky"</string>
<string name="nfc_unlock_enabled" msgid="7306199149460932989">"Povolené"</string>
<string name="start_nfc_pairing" msgid="5363319136364735698">"Spárovať so značkou"</string>
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
<string name="pairing_button_title" msgid="7411638037556429744">"Spárovať"</string>
- <string name="status_no_ring_detected" msgid="838954925249421062">"Prívesok položte vodorovne na stôl a potom naň umiestnite telefón"</string>
- <string name="status_device_paired" msgid="4916932520416516526">"Prívesok a telefón boli úspešne spárované. Hotovo!"</string>
- <string name="status_error_invalid_device" msgid="5045003971535647259">"Poskytnutý prívesok nie je možné použiť na odomknutie vášho telefónu"</string>
- <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárovanie s príveskom zlyhalo. Skúste to znova."</string>
+ <string name="status_no_ring_detected" msgid="838954925249421062">"Štítok položte vodorovne na stôl a potom naň umiestnite telefón"</string>
+ <string name="status_device_paired" msgid="4916932520416516526">"Štítok a telefón boli úspešne spárované. Hotovo!"</string>
+ <string name="status_error_invalid_device" msgid="5045003971535647259">"Poskytnutý štítok nie je možné použiť na odomknutie vášho telefónu"</string>
+ <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárovanie so štítkom zlyhalo. Skúste to znova."</string>
<string name="enable_nfc" msgid="5234514241098808766">"Nie je povolená technológia NFC, ktorú funkcia Odomknutie NFC vyžaduje. Zapnite technológiu NFC."</string>
<string name="ok" msgid="3651563352754792958">"Nastavenia NFC"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 76da702..cc8c65b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1683,10 +1683,10 @@
<string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
<string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
<string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
- <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
- <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri mpya la chelezo limewekwa"</string>
+ <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili ubadilishe au uondoe nenosiri la hifadhi rudufu kamili za eneo kazi"</string>
+ <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri jipya la hifadhi rudufu limewekwa"</string>
<string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nenosiri jipya na uthibitisho havioani"</string>
- <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Imeshindwa kuweka nenosiri la chelezo"</string>
+ <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Imeshindwa kuweka nenosiri la hifadhi rudufu"</string>
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
<string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ungependa kuacha kuhifadhi nakala za manenosiri, alamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute nakala zote kwenye seva za Google?"</string>
<string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
@@ -1952,10 +1952,10 @@
<string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lemaza mfumo wa cheti cha CA?"</string>
<string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Ondoa cheti cha CA cha mtumiaji kabisa?"</string>
<string name="spellcheckers_settings_title" msgid="399981228588011501">"Kikagua tahajia"</string>
- <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako kamili la sasa la chelezo hapa"</string>
- <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri mpya kwa chelezo zote kamili"</string>
+ <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako la sasa la hifadhi rudufu kamili hapa"</string>
+ <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri jipya la hifadhi rudufu kamili hapa"</string>
<string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Andika upya nenosiri yako kamili ya kuhifadhi hapa"</string>
- <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri la chelezo"</string>
+ <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri mbadala"</string>
<string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
<string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
<string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"sasisho za ziada za mfumo"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9e1eadf..2926ca7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2061,7 +2061,7 @@
<string name="user_image_take_photo" msgid="1280274310152803669">"ถ่ายภาพ"</string>
<string name="user_image_choose_photo" msgid="7940990613897477057">"เลือกรูปภาพจากแกลเลอรี"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
- <string name="lock_settings_nfc_title" msgid="33998875572836425">"การตั้งค่าล็อกหน้าจอ NFC"</string>
+ <string name="lock_settings_nfc_title" msgid="33998875572836425">"การตั้งค่าล็อกหน้าจอด้วย NFC"</string>
<string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ป้ายที่จับคู่"</string>
<string name="nfc_unlock_enabled" msgid="7306199149460932989">"เปิดอยู่"</string>
<string name="start_nfc_pairing" msgid="5363319136364735698">"จับคู่กับแท็ก"</string>
@@ -2069,8 +2069,8 @@
<string name="pairing_button_title" msgid="7411638037556429744">"จับคู่เลย"</string>
<string name="status_no_ring_detected" msgid="838954925249421062">"วางป้ายราบไปกับโต๊ะ และวางโทรศัพท์ไว้ข้างบน"</string>
<string name="status_device_paired" msgid="4916932520416516526">"จับคู่ป้ายและโทรศัพท์สำเร็จแล้ว ทุกอย่างเรียบร้อย!"</string>
- <string name="status_error_invalid_device" msgid="5045003971535647259">"ป้ายที่ให้มาไม่สามารถใช้เพื่อปลดล็อกโทรศัพท์ของคุณ"</string>
+ <string name="status_error_invalid_device" msgid="5045003971535647259">"ป้ายที่ระบุไม่สามารถใช้ปลดล็อกโทรศัพท์ของคุณ"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"การจับคู่กับป้ายของคุณล้มเหลว โปรดลองอีกครั้ง"</string>
- <string name="enable_nfc" msgid="5234514241098808766">"ไม่ได้เปิด NFC อยู่ แต่ต้องใช้สำหรับการปลดล็อก NFC โปรดเปิด NFC"</string>
+ <string name="enable_nfc" msgid="5234514241098808766">"NFC ไม่ได้เปิดอยู่ แต่จำเป็นสำหรับการปลดล็อกด้วย NFC โปรดเปิด NFC"</string>
<string name="ok" msgid="3651563352754792958">"การตั้งค่า NFC"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7f1bda8..8f3d861 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2069,7 +2069,7 @@
<string name="pairing_button_title" msgid="7411638037556429744">"立即配对"</string>
<string name="status_no_ring_detected" msgid="838954925249421062">"请将标签平放在桌子上，然后将手机放在标签上"</string>
<string name="status_device_paired" msgid="4916932520416516526">"标签和手机已成功配对，大功告成了！"</string>
- <string name="status_error_invalid_device" msgid="5045003971535647259">"无法使用所提供的标签为您的手机解锁"</string>
+ <string name="status_error_invalid_device" msgid="5045003971535647259">"无法使用相应标签为您的手机解锁"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"与您的标签配对失败，请重试"</string>
<string name="enable_nfc" msgid="5234514241098808766">"NFC解锁功能需要使用NFC，但NFC尚未启用。请启用NFC。"</string>
<string name="ok" msgid="3651563352754792958">"NFC设置"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index cc6dfd4..f5d90f7 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2075,6 +2075,6 @@
<string name="status_device_paired" msgid="4916932520416516526">"標籤和手機已成功配對，操作完成！"</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用所提供的標籤為您的手機解鎖"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"無法與您的標籤配對，請再試一次"</string>
- <string name="enable_nfc" msgid="5234514241098808766">"「NFC 解鎖」功能需要使用 NFC 功能，而 NFC 尚未啟用。請啟用 NFC。"</string>
+ <string name="enable_nfc" msgid="5234514241098808766">"「NFC 解鎖」功能需要使用 NFC 功能，但 NFC 尚未啟用。請啟用 NFC。"</string>
<string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 622138d..d0551fb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2073,7 +2073,7 @@
<string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
<string name="status_no_ring_detected" msgid="838954925249421062">"請將標記平放在桌上，然後將手機放在標記上"</string>
<string name="status_device_paired" msgid="4916932520416516526">"標記和手機已成功配對，大功告成！"</string>
- <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用您所提供的標記為您的手機解鎖"</string>
+ <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用您提供的標記為您的手機解鎖"</string>
<string name="status_error_pairing_failed" msgid="8260473909085202868">"與您的標記配對失敗，請再試一次"</string>
<string name="enable_nfc" msgid="5234514241098808766">"NFC 解鎖功能需要使用 NFC，但 NFC 尚未啟用。請開啟 NFC。"</string>
<string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5852de8..6afceee 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -753,6 +753,8 @@
<item>None</item>
<item>Outline</item>
<item>Drop shadow</item>
+ <item>Raised</item>
+ <item>Depressed</item>
</string-array>
<!-- Values for captioning character edge type preference. -->
@@ -760,6 +762,8 @@
<item>0</item>
<item>1</item>
<item>2</item>
+ <item>3</item>
+ <item>4</item>
</integer-array>
<!-- Titles for captioning color preference. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 08fe28f..22e542b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3379,6 +3379,10 @@
<string name="captioning_background_color">Background color</string>
<!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
<string name="captioning_background_opacity">Background opacity</string>
+ <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+ <string name="captioning_window_color">Caption window color</string>
+ <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+ <string name="captioning_window_opacity">Caption window opacity</string>
<!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
<string name="captioning_foreground_color">Text color</string>
<!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
@@ -3616,13 +3620,13 @@
<!-- Label for Phone usage time -->
<string name="usage_type_phone" product="default">Phone</string>
<!-- Label for mobile network data sent [CHAR LIMIT=32] -->
- <string name="usage_type_data_send">Mobile data sent</string>
+ <string name="usage_type_data_send">Mobile packets sent</string>
<!-- Label for mobile network data received [CHAR LIMIT=32] -->
- <string name="usage_type_data_recv">Mobile data received</string>
+ <string name="usage_type_data_recv">Mobile packets received</string>
<!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
- <string name="usage_type_data_wifi_send">Wi\u2011Fi data sent</string>
+ <string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string>
<!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
- <string name="usage_type_data_wifi_recv">Wi\u2011Fi data received</string>
+ <string name="usage_type_data_wifi_recv">Wi\u2011Fi packets received</string>
<!-- Label for Audio usage time -->
<string name="usage_type_audio">Audio</string>
<!-- Label for Video usage time -->
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index d14d352..ae5b75d 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -82,6 +82,15 @@
android:key="captioning_background_opacity"
android:persistent="false"
android:title="@string/captioning_background_opacity" />
+ <com.android.settings.accessibility.ColorPreference
+ android:key="captioning_window_color"
+ android:persistent="false"
+ android:title="@string/captioning_window_color" />
+ <com.android.settings.accessibility.ColorPreference
+ android:dependency="captioning_window_color"
+ android:key="captioning_window_opacity"
+ android:persistent="false"
+ android:title="@string/captioning_window_opacity" />
</PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 8a08d90..324c595 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -54,6 +54,8 @@
private static final String PREF_BACKGROUND_OPACITY = "captioning_background_opacity";
private static final String PREF_FOREGROUND_COLOR = "captioning_foreground_color";
private static final String PREF_FOREGROUND_OPACITY = "captioning_foreground_opacity";
+ private static final String PREF_WINDOW_COLOR = "captioning_window_color";
+ private static final String PREF_WINDOW_OPACITY = "captioning_window_opacity";
private static final String PREF_EDGE_COLOR = "captioning_edge_color";
private static final String PREF_EDGE_TYPE = "captioning_edge_type";
private static final String PREF_FONT_SIZE = "captioning_font_size";
@@ -66,6 +68,7 @@
private CaptioningManager mCaptioningManager;
private SubtitleView mPreviewText;
+ private View mPreviewWindow;
// Standard options.
private LocalePreference mLocale;
@@ -80,6 +83,8 @@
private ColorPreference mEdgeColor;
private ColorPreference mBackgroundColor;
private ColorPreference mBackgroundOpacity;
+ private ColorPreference mWindowColor;
+ private ColorPreference mWindowOpacity;
private PreferenceCategory mCustom;
private boolean mShowingCustom;
@@ -120,6 +125,7 @@
super.onViewCreated(view, savedInstanceState);
mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
+ mPreviewWindow = view.findViewById(R.id.preview_window);
installActionBarToggleSwitch();
refreshPreviewText();
@@ -145,6 +151,9 @@
} else {
preview.setText(R.string.captioning_preview_text);
}
+
+ final CaptionStyle style = mCaptioningManager.getUserStyle();
+ mPreviewWindow.setBackgroundColor(style.windowColor);
}
}
@@ -246,6 +255,14 @@
mBackgroundOpacity.setTitles(opacityTitles);
mBackgroundOpacity.setValues(opacityValues);
+ mWindowColor = (ColorPreference) mCustom.findPreference(PREF_WINDOW_COLOR);
+ mWindowColor.setTitles(bgColorTitles);
+ mWindowColor.setValues(bgColorValues);
+
+ mWindowOpacity = (ColorPreference) mCustom.findPreference(PREF_WINDOW_OPACITY);
+ mWindowOpacity.setTitles(opacityTitles);
+ mWindowOpacity.setValues(opacityValues);
+
mEdgeType = (EdgeTypePreference) mCustom.findPreference(PREF_EDGE_TYPE);
mTypeface = (ListPreference) mCustom.findPreference(PREF_TYPEFACE);
}
@@ -257,6 +274,8 @@
mEdgeColor.setOnValueChangedListener(this);
mBackgroundColor.setOnValueChangedListener(this);
mBackgroundOpacity.setOnValueChangedListener(this);
+ mWindowColor.setOnValueChangedListener(this);
+ mWindowOpacity.setOnValueChangedListener(this);
mEdgeType.setOnValueChangedListener(this);
mTypeface.setOnPreferenceChangeListener(this);
@@ -278,6 +297,7 @@
parseColorOpacity(mForegroundColor, mForegroundOpacity, attrs.foregroundColor);
parseColorOpacity(mBackgroundColor, mBackgroundOpacity, attrs.backgroundColor);
+ parseColorOpacity(mWindowColor, mWindowOpacity, attrs.windowColor);
final String rawTypeface = attrs.mRawTypeface;
mTypeface.setValue(rawTypeface == null ? "" : rawTypeface);
@@ -334,6 +354,10 @@
final int merged = mergeColorOpacity(mBackgroundColor, mBackgroundOpacity);
Settings.Secure.putInt(
cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR, merged);
+ } else if (mWindowColor == preference || mWindowOpacity == preference) {
+ final int merged = mergeColorOpacity(mWindowColor, mWindowOpacity);
+ Settings.Secure.putInt(
+ cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_WINDOW_COLOR, merged);
} else if (mEdgeColor == preference) {
Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_EDGE_COLOR, value);
} else if (mPreset == preference) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index d687136..a86f15f 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -143,7 +143,10 @@
if (timeout > 0) {
BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
+ } else {
+ BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
}
+
} else {
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 55a0457..dfed5c4 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -361,7 +361,7 @@
final HistoryItem rec = new HistoryItem();
while (stats.getNextHistoryLocked(rec)) {
pos++;
- if (rec.cmd == HistoryItem.CMD_UPDATE) {
+ if (rec.isDeltaData()) {
if (first) {
first = false;
mHistStart = rec.time;
@@ -523,7 +523,7 @@
if (mStats.startIteratingHistoryLocked()) {
final HistoryItem rec = new HistoryItem();
while (mStats.getNextHistoryLocked(rec) && i < N) {
- if (rec.cmd == BatteryStats.HistoryItem.CMD_UPDATE) {
+ if (rec.isDeltaData()) {
x = (int)(((rec.time-timeStart)*w)/timeChange);
y = mLevelTop + levelh - ((rec.batteryLevel-batLow)*(levelh-1))/batChange;
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index fcc8f69..d1f885c 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -53,6 +53,10 @@
long wifiRunningTime;
long cpuFgTime;
long wakeLockTime;
+ long mobileRxPackets;
+ long mobileTxPackets;
+ long wifiRxPackets;
+ long wifiTxPackets;
long mobileRxBytes;
long mobileTxBytes;
long wifiRxBytes;
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
index 0191692..8ae9409 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
@@ -16,10 +16,10 @@
package com.android.settings.fuelgauge;
-import static android.os.BatteryStats.NETWORK_MOBILE_RX_BYTES;
-import static android.os.BatteryStats.NETWORK_MOBILE_TX_BYTES;
-import static android.os.BatteryStats.NETWORK_WIFI_RX_BYTES;
-import static android.os.BatteryStats.NETWORK_WIFI_TX_BYTES;
+import static android.os.BatteryStats.NETWORK_MOBILE_RX_DATA;
+import static android.os.BatteryStats.NETWORK_MOBILE_TX_DATA;
+import static android.os.BatteryStats.NETWORK_WIFI_RX_DATA;
+import static android.os.BatteryStats.NETWORK_WIFI_TX_DATA;
import android.app.Activity;
import android.content.Context;
@@ -222,10 +222,10 @@
sipper.wakeLockTime,
sipper.gpsTime,
sipper.wifiRunningTime,
- sipper.mobileRxBytes,
- sipper.mobileTxBytes,
- sipper.wifiRxBytes,
- sipper.wifiTxBytes,
+ sipper.mobileRxPackets,
+ sipper.mobileTxPackets,
+ sipper.wifiRxPackets,
+ sipper.wifiTxPackets,
0,
0
};
@@ -275,10 +275,10 @@
sipper.cpuTime,
sipper.cpuFgTime,
sipper.wakeLockTime,
- sipper.mobileRxBytes,
- sipper.mobileTxBytes,
- sipper.wifiRxBytes,
- sipper.wifiTxBytes,
+ sipper.mobileRxPackets,
+ sipper.mobileTxPackets,
+ sipper.wifiRxPackets,
+ sipper.wifiTxPackets,
};
} break;
case BLUETOOTH:
@@ -298,10 +298,10 @@
sipper.cpuTime,
sipper.cpuFgTime,
sipper.wakeLockTime,
- sipper.mobileRxBytes,
- sipper.mobileTxBytes,
- sipper.wifiRxBytes,
- sipper.wifiTxBytes,
+ sipper.mobileRxPackets,
+ sipper.mobileTxPackets,
+ sipper.wifiRxPackets,
+ sipper.wifiTxPackets,
};
} break;
default:
@@ -371,8 +371,8 @@
for (int p = 0; p < speedSteps; p++) {
powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
}
- final double mobilePowerPerByte = getMobilePowerPerByte();
- final double wifiPowerPerByte = getWifiPowerPerByte();
+ final double mobilePowerPerPacket = getMobilePowerPerPacket();
+ final double wifiPowerPerPacket = getWifiPowerPerPacket();
long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
long appWakelockTime = 0;
BatterySipper osApp = null;
@@ -463,16 +463,20 @@
if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
// Add cost of mobile traffic
- final long mobileRx = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
- final long mobileTx = u.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
- p = (mobileRx + mobileTx) * mobilePowerPerByte;
+ final long mobileRx = u.getNetworkActivityPackets(NETWORK_MOBILE_RX_DATA, mStatsType);
+ final long mobileTx = u.getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, mStatsType);
+ final long mobileRxB = u.getNetworkActivityBytes(NETWORK_MOBILE_RX_DATA, mStatsType);
+ final long mobileTxB = u.getNetworkActivityBytes(NETWORK_MOBILE_TX_DATA, mStatsType);
+ p = (mobileRx + mobileTx) * mobilePowerPerPacket;
power += p;
if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
// Add cost of wifi traffic
- final long wifiRx = u.getNetworkActivityCount(NETWORK_WIFI_RX_BYTES, mStatsType);
- final long wifiTx = u.getNetworkActivityCount(NETWORK_WIFI_TX_BYTES, mStatsType);
- p = (wifiRx + wifiTx) * wifiPowerPerByte;
+ final long wifiRx = u.getNetworkActivityPackets(NETWORK_WIFI_RX_DATA, mStatsType);
+ final long wifiTx = u.getNetworkActivityPackets(NETWORK_WIFI_TX_DATA, mStatsType);
+ final long wifiRxB = u.getNetworkActivityBytes(NETWORK_WIFI_RX_DATA, mStatsType);
+ final long wifiTxB = u.getNetworkActivityBytes(NETWORK_WIFI_TX_DATA, mStatsType);
+ p = (wifiRx + wifiTx) * wifiPowerPerPacket;
power += p;
if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
@@ -545,10 +549,14 @@
app.wifiRunningTime = wifiRunningTimeMs;
app.cpuFgTime = cpuFgTime;
app.wakeLockTime = wakelockTime;
- app.mobileRxBytes = mobileRx;
- app.mobileTxBytes = mobileTx;
- app.wifiRxBytes = wifiRx;
- app.wifiTxBytes = wifiTx;
+ app.mobileRxPackets = mobileRx;
+ app.mobileTxPackets = mobileTx;
+ app.wifiRxPackets = wifiRx;
+ app.wifiTxPackets = wifiTx;
+ app.mobileRxBytes = mobileRxB;
+ app.mobileTxBytes = mobileTxB;
+ app.wifiRxBytes = wifiRxB;
+ app.wifiTxBytes = wifiTxB;
if (u.getUid() == Process.WIFI_UID) {
mWifiSippers.add(app);
} else if (u.getUid() == Process.BLUETOOTH_UID) {
@@ -670,6 +678,10 @@
bs.wifiRunningTime += wbs.wifiRunningTime;
bs.cpuFgTime += wbs.cpuFgTime;
bs.wakeLockTime += wbs.wakeLockTime;
+ bs.mobileRxPackets += wbs.mobileRxPackets;
+ bs.mobileTxPackets += wbs.mobileTxPackets;
+ bs.wifiRxPackets += wbs.wifiRxPackets;
+ bs.wifiTxPackets += wbs.wifiTxPackets;
bs.mobileRxBytes += wbs.mobileRxBytes;
bs.mobileTxBytes += wbs.mobileTxBytes;
bs.wifiRxBytes += wbs.wifiRxBytes;
@@ -743,33 +755,33 @@
}
/**
- * Return estimated power (in mAs) of sending a byte with the mobile radio.
+ * Return estimated power (in mAs) of sending or receiving a packet with the mobile radio.
*/
- private double getMobilePowerPerByte() {
+ private double getMobilePowerPerPacket() {
final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
/ 3600;
- final long mobileRx = mStats.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
- final long mobileTx = mStats.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+ final long mobileRx = mStats.getNetworkActivityPackets(NETWORK_MOBILE_RX_DATA, mStatsType);
+ final long mobileTx = mStats.getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, mStatsType);
final long mobileData = mobileRx + mobileTx;
final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
- final long mobileBps = radioDataUptimeMs != 0
- ? mobileData * 8 * 1000 / radioDataUptimeMs
- : MOBILE_BPS;
+ final double mobilePps = radioDataUptimeMs != 0
+ ? mobileData / (double)radioDataUptimeMs
+ : (((double)MOBILE_BPS) / 8 / 2048);
- return MOBILE_POWER / (mobileBps / 8);
+ return MOBILE_POWER / mobilePps;
}
/**
* Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
*/
- private double getWifiPowerPerByte() {
+ private double getWifiPowerPerPacket() {
final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
/ 3600;
- return WIFI_POWER / (WIFI_BPS / 8);
+ return WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048);
}
private void processMiscUsage() {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 45e4516..8d316cf 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -322,8 +322,8 @@
case R.string.usage_type_data_send:
case R.string.usage_type_data_wifi_recv:
case R.string.usage_type_data_wifi_send:
- final long bytes = (long) (mValues[i]);
- value = Formatter.formatFileSize(getActivity(), bytes);
+ final long packets = (long) (mValues[i]);
+ value = Long.toString(packets);
break;
case R.string.usage_type_no_coverage:
final int percentage = (int) Math.floor(mValues[i]);